From 294ee036693a69a47672cb16b88e08e35a38d868 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jul 26 2020 12:16:29 +0000 Subject: 2.35 --- diff --git a/binutils-2.29-filename-in-error-messages.patch b/binutils-2.29-filename-in-error-messages.patch index d8ce241..60750a1 100644 --- a/binutils-2.29-filename-in-error-messages.patch +++ b/binutils-2.29-filename-in-error-messages.patch @@ -1,6 +1,6 @@ ---- binutils.orig/binutils/readelf.c 2018-01-22 15:48:10.450701702 +0000 -+++ binutils-2.30.0/binutils/readelf.c 2018-01-22 15:55:26.739588657 +0000 -@@ -19019,75 +19019,85 @@ process_file (char * file_name) +--- binutils.orig/binutils/readelf.c 2020-07-24 14:55:25.163647522 +0100 ++++ binutils-2.35/binutils/readelf.c 2020-07-24 15:02:39.613851369 +0100 +@@ -20729,79 +20729,92 @@ process_file (char * file_name) Filedata * filedata = NULL; struct stat statbuf; char armag[SARMAG]; @@ -61,64 +61,63 @@ if (fread (armag, SARMAG, 1, filedata->handle) != 1) { - error (_("%s: Failed to read file's magic number\n"), file_name); -- fclose (filedata->handle); ++ error (_("Failed to read file's magic number\n")); + fclose (filedata->handle); - free (filedata); - return FALSE; -- } -- -- filedata->file_size = (bfd_size_type) statbuf.st_size; -- -- if (memcmp (armag, ARMAG, SARMAG) == 0) -- { ++ goto done; + } + + filedata->file_size = (bfd_size_type) statbuf.st_size; + + if (memcmp (armag, ARMAG, SARMAG) == 0) + { - if (! process_archive (filedata, FALSE)) - ret = FALSE; -- } -- else if (memcmp (armag, ARMAGT, SARMAG) == 0) -- { ++ if (process_archive (filedata, FALSE)) ++ ret = TRUE; + } + else if (memcmp (armag, ARMAGT, SARMAG) == 0) + { - if ( ! process_archive (filedata, TRUE)) - ret = FALSE; -+ error (_("Failed to read file's magic number\n")); ++ if (process_archive (filedata, TRUE)) ++ ret = TRUE; } else { -- if (do_archive_index) + if (do_archive_index && !check_all) - error (_("File %s is not an archive so its index cannot be displayed.\n"), - file_name); -+ filedata->file_size = (bfd_size_type) statbuf.st_size; ++ error (_("Not an archive so its index cannot be displayed.\n")); + + rewind (filedata->handle); + filedata->archive_file_size = filedata->archive_file_offset = 0; -- rewind (filedata->handle); -- archive_file_size = archive_file_offset = 0; -- - if (! process_object (filedata)) - ret = FALSE; -+ if (memcmp (armag, ARMAG, SARMAG) == 0) -+ { -+ if (process_archive (filedata, FALSE)) -+ ret = TRUE; -+ } -+ else if (memcmp (armag, ARMAGT, SARMAG) == 0) -+ { -+ if (process_archive (filedata, TRUE)) -+ ret = TRUE; -+ } -+ else -+ { -+ if (do_archive_index) -+ error (_("Not an archive so its index cannot be displayed.\n")); -+ -+ rewind (filedata->handle); -+ archive_file_size = archive_file_offset = 0; -+ -+ if (process_object (filedata)) -+ ret = TRUE; -+ } ++ if (process_object (filedata)) ++ ret = TRUE; } - fclose (filedata->handle); +- fclose (filedata->handle); +- free (filedata->section_headers); +- free (filedata->program_headers); +- free (filedata->string_table); +- free (filedata->dump.dump_sects); +- free (filedata); + done: - free (filedata); ++ if (filedata) ++ { ++ fclose (filedata->handle); ++ free (filedata->section_headers); ++ free (filedata->program_headers); ++ free (filedata->string_table); ++ free (filedata->dump.dump_sects); ++ free (filedata); ++ } + free (program_name); + program_name = saved_program_name; - return ret; - } + free (ba_cache.strtab); + ba_cache.strtab = NULL; diff --git a/binutils-2.29-revert-PLT-elision.patch b/binutils-2.29-revert-PLT-elision.patch index c5478f0..746a551 100644 --- a/binutils-2.29-revert-PLT-elision.patch +++ b/binutils-2.29-revert-PLT-elision.patch @@ -79,17 +79,6 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd binutils-2.29.1/l +#... [ ]*[a-f0-9]+: 90 nop #pass -diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd ---- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd 2017-11-15 13:32:39.412064336 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd 2017-11-15 15:06:35.148842897 +0000 -@@ -1,7 +1,3 @@ - #... --Disassembly of section .plt.got: -- --[a-f0-9]+ <[_a-z]+@plt>: - [ ]*[a-f0-9]+: f3 0f 1e fa endbr64 --[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmpq \*0x20....\(%rip\) # ...... <[_a-z]+> - #pass diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd --- binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd 2017-11-15 13:32:39.407064397 +0000 +++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd 2017-11-15 15:06:17.244054423 +0000 @@ -264,3 +253,13 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/tes 0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133 DW_CFA_nop DW_CFA_nop +--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd 2020-07-24 14:55:25.370646189 +0100 ++++ binutils-2.35/ld/testsuite/ld-x86-64/plt-main-ibt.dd 2020-07-24 15:06:58.124189348 +0100 +@@ -1,7 +1,3 @@ + #... +-Disassembly of section .plt.got: +- +-[a-f0-9]+ <[_a-z]+@plt>: + [ ]*[a-f0-9]+: f3 0f 1e fa endbr64 +-[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmpq \*0x20....\(%rip\) # ...... <.*> + #pass diff --git a/binutils-alignment-of-decompressed-sections.patch b/binutils-alignment-of-decompressed-sections.patch deleted file mode 100644 index b115cbb..0000000 --- a/binutils-alignment-of-decompressed-sections.patch +++ /dev/null @@ -1,447 +0,0 @@ -diff -rup binutils.orig/bfd/bfd.c binutils-2.31.1/bfd/bfd.c ---- binutils.orig/bfd/bfd.c 2019-02-18 11:53:32.155652114 +0000 -+++ binutils-2.31.1/bfd/bfd.c 2019-02-18 12:03:21.591459682 +0000 -@@ -2332,6 +2332,8 @@ bfd_update_compression_header (bfd *abfd - bfd_put_32 (abfd, sec->size, &echdr->ch_size); - bfd_put_32 (abfd, 1 << sec->alignment_power, - &echdr->ch_addralign); -+ /* bfd_log2 (alignof (Elf32_Chdr)). */ -+ bfd_set_section_alignment (abfd, sec, 2); - } - else - { -@@ -2342,6 +2344,8 @@ bfd_update_compression_header (bfd *abfd - bfd_put_64 (abfd, sec->size, &echdr->ch_size); - bfd_put_64 (abfd, 1 << sec->alignment_power, - &echdr->ch_addralign); -+ /* bfd_log2 (alignof (Elf64_Chdr)). */ -+ bfd_set_section_alignment (abfd, sec, 3); - } - } - else -@@ -2354,6 +2358,8 @@ bfd_update_compression_header (bfd *abfd - order. */ - memcpy (contents, "ZLIB", 4); - bfd_putb64 (sec->size, contents + 4); -+ /* No way to keep the original alignment, just use 1 always. */ -+ bfd_set_section_alignment (abfd, sec, 0); - } - } - } -@@ -2368,12 +2374,15 @@ bfd_update_compression_header (bfd *abfd - SYNOPSIS - bfd_boolean bfd_check_compression_header - (bfd *abfd, bfd_byte *contents, asection *sec, -- bfd_size_type *uncompressed_size); -+ bfd_size_type *uncompressed_size, -+ unsigned int *uncompressed_alignment_power); -+ - - DESCRIPTION - Check the compression header at CONTENTS of SEC in ABFD and -- store the uncompressed size in UNCOMPRESSED_SIZE if the -- compression header is valid. -+ store the uncompressed size in UNCOMPRESSED_SIZE and the -+ uncompressed data alignment in UNCOMPRESSED_ALIGNMENT_POWER -+ if the compression header is valid. - - RETURNS - Return TRUE if the compression header is valid. -@@ -2382,7 +2391,8 @@ RETURNS - bfd_boolean - bfd_check_compression_header (bfd *abfd, bfd_byte *contents, - asection *sec, -- bfd_size_type *uncompressed_size) -+ bfd_size_type *uncompressed_size, -+ unsigned int *uncompressed_alignment_power) - { - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour - && (elf_section_flags (sec) & SHF_COMPRESSED) != 0) -@@ -2404,9 +2414,10 @@ bfd_check_compression_header (bfd *abfd, - chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign); - } - if (chdr.ch_type == ELFCOMPRESS_ZLIB -- && chdr.ch_addralign == 1U << sec->alignment_power) -+ && chdr.ch_addralign == (1U << bfd_log2 (chdr.ch_addralign))) - { - *uncompressed_size = chdr.ch_size; -+ *uncompressed_alignment_power = bfd_log2 (chdr.ch_addralign); - return TRUE; - } - } -diff -rup binutils.orig/bfd/bfd-in2.h binutils-2.31.1/bfd/bfd-in2.h ---- binutils.orig/bfd/bfd-in2.h 2019-02-18 11:53:32.156652107 +0000 -+++ binutils-2.31.1/bfd/bfd-in2.h 2019-02-18 12:00:23.849723903 +0000 -@@ -7274,7 +7274,8 @@ void bfd_update_compression_header - - bfd_boolean bfd_check_compression_header - (bfd *abfd, bfd_byte *contents, asection *sec, -- bfd_size_type *uncompressed_size); -+ bfd_size_type *uncompressed_size, -+ unsigned int *uncompressed_alignment_power); - - int bfd_get_compression_header_size (bfd *abfd, asection *sec); - -@@ -7850,7 +7851,8 @@ void bfd_cache_section_contents - bfd_boolean bfd_is_section_compressed_with_header - (bfd *abfd, asection *section, - int *compression_header_size_p, -- bfd_size_type *uncompressed_size_p); -+ bfd_size_type *uncompressed_size_p, -+ unsigned int *uncompressed_alignment_power_p); - - bfd_boolean bfd_is_section_compressed - (bfd *abfd, asection *section); -diff -rup binutils.orig/bfd/compress.c binutils-2.31.1/bfd/compress.c ---- binutils.orig/bfd/compress.c 2019-02-18 11:53:32.153652128 +0000 -+++ binutils-2.31.1/bfd/compress.c 2019-02-18 12:11:44.899886376 +0000 -@@ -84,11 +84,13 @@ bfd_compress_section_contents (bfd *abfd - int zlib_size = 0; - int orig_compression_header_size; - bfd_size_type orig_uncompressed_size; -+ unsigned int orig_uncompressed_alignment_pow; - int header_size = bfd_get_compression_header_size (abfd, NULL); - bfd_boolean compressed - = bfd_is_section_compressed_with_header (abfd, sec, - &orig_compression_header_size, -- &orig_uncompressed_size); -+ &orig_uncompressed_size, -+ &orig_uncompressed_alignment_pow); - - /* Either ELF compression header or the 12-byte, "ZLIB" + 8-byte size, - overhead in .zdebug* section. */ -@@ -153,6 +155,8 @@ bfd_compress_section_contents (bfd *abfd - return 0; - } - free (uncompressed_buffer); -+ bfd_set_section_alignment (abfd, sec, -+ orig_uncompressed_alignment_pow); - sec->contents = buffer; - sec->compress_status = COMPRESS_SECTION_DONE; - return orig_uncompressed_size; -@@ -364,20 +368,25 @@ SYNOPSIS - bfd_boolean bfd_is_section_compressed_with_header - (bfd *abfd, asection *section, - int *compression_header_size_p, -- bfd_size_type *uncompressed_size_p); -+ bfd_size_type *uncompressed_size_p, -+ unsigned int *uncompressed_alignment_power_p); -+ - - DESCRIPTION - Return @code{TRUE} if @var{section} is compressed. Compression -- header size is returned in @var{compression_header_size_p} and -- uncompressed size is returned in @var{uncompressed_size_p}. If -- compression is unsupported, compression header size is returned -- with -1 and uncompressed size is returned with 0. -+ header size is returned in @var{compression_header_size_p}, -+ uncompressed size is returned in @var{uncompressed_size_p} -+ and the uncompressed data alignement power is returned in -+ @var{uncompressed_align_pow_p}. If compression is -+ unsupported, compression header size is returned with -1 -+ and uncompressed size is returned with 0. - */ - - bfd_boolean - bfd_is_section_compressed_with_header (bfd *abfd, sec_ptr sec, - int *compression_header_size_p, -- bfd_size_type *uncompressed_size_p) -+ bfd_size_type *uncompressed_size_p, -+ unsigned int *uncompressed_align_pow_p) - { - bfd_byte header[MAX_COMPRESSION_HEADER_SIZE]; - int compression_header_size; -@@ -385,6 +394,8 @@ bfd_is_section_compressed_with_header (b - unsigned int saved = sec->compress_status; - bfd_boolean compressed; - -+ *uncompressed_align_pow_p = 0; -+ - compression_header_size = bfd_get_compression_header_size (abfd, sec); - if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE) - abort (); -@@ -412,7 +423,8 @@ bfd_is_section_compressed_with_header (b - if (compression_header_size != 0) - { - if (!bfd_check_compression_header (abfd, header, sec, -- uncompressed_size_p)) -+ uncompressed_size_p, -+ uncompressed_align_pow_p)) - compression_header_size = -1; - } - /* Check for the pathalogical case of a debug string section that -@@ -449,9 +461,11 @@ bfd_is_section_compressed (bfd *abfd, se - { - int compression_header_size; - bfd_size_type uncompressed_size; -+ unsigned int uncompressed_align_power; - return (bfd_is_section_compressed_with_header (abfd, sec, - &compression_header_size, -- &uncompressed_size) -+ &uncompressed_size, -+ &uncompressed_align_power) - && compression_header_size >= 0 - && uncompressed_size > 0); - } -@@ -480,6 +494,7 @@ bfd_init_section_decompress_status (bfd - int compression_header_size; - int header_size; - bfd_size_type uncompressed_size; -+ unsigned int uncompressed_alignment_power = 0; - - compression_header_size = bfd_get_compression_header_size (abfd, sec); - if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE) -@@ -508,7 +523,8 @@ bfd_init_section_decompress_status (bfd - uncompressed_size = bfd_getb64 (header + 4); - } - else if (!bfd_check_compression_header (abfd, header, sec, -- &uncompressed_size)) -+ &uncompressed_size, -+ &uncompressed_alignment_power)) - { - bfd_set_error (bfd_error_wrong_format); - return FALSE; -@@ -516,6 +532,7 @@ bfd_init_section_decompress_status (bfd - - sec->compressed_size = sec->size; - sec->size = uncompressed_size; -+ bfd_set_section_alignment (abfd, sec, uncompressed_alignment_power); - sec->compress_status = DECOMPRESS_SECTION_SIZED; - - return TRUE; -diff -rup binutils.orig/bfd/elf.c binutils-2.31.1/bfd/elf.c ---- binutils.orig/bfd/elf.c 2019-02-18 11:53:32.161652071 +0000 -+++ binutils-2.31.1/bfd/elf.c 2019-02-18 12:08:52.135108638 +0000 -@@ -1177,10 +1177,12 @@ _bfd_elf_make_section_from_shdr (bfd *ab - enum { nothing, compress, decompress } action = nothing; - int compression_header_size; - bfd_size_type uncompressed_size; -+ unsigned int uncompressed_align_power; - bfd_boolean compressed - = bfd_is_section_compressed_with_header (abfd, newsect, - &compression_header_size, -- &uncompressed_size); -+ &uncompressed_size, -+ &uncompressed_align_power); - - if (compressed) - { -diff -rup binutils.orig/binutils/readelf.c binutils-2.31.1/binutils/readelf.c ---- binutils.orig/binutils/readelf.c 2019-02-18 11:53:32.947646480 +0000 -+++ binutils-2.31.1/binutils/readelf.c 2019-02-18 12:10:13.142535034 +0000 -@@ -13366,12 +13366,6 @@ dump_section_as_strings (Elf_Internal_Sh - printable_section_name (filedata, section), chdr.ch_type); - return FALSE; - } -- else if (chdr.ch_addralign != section->sh_addralign) -- { -- warn (_("compressed section '%s' is corrupted\n"), -- printable_section_name (filedata, section)); -- return FALSE; -- } - uncompressed_size = chdr.ch_size; - start += compression_header_size; - new_size -= compression_header_size; -@@ -13513,12 +13507,6 @@ dump_section_as_bytes (Elf_Internal_Shdr - printable_section_name (filedata, section), chdr.ch_type); - return FALSE; - } -- else if (chdr.ch_addralign != section->sh_addralign) -- { -- warn (_("compressed section '%s' is corrupted\n"), -- printable_section_name (filedata, section)); -- return FALSE; -- } - uncompressed_size = chdr.ch_size; - start += compression_header_size; - new_size -= compression_header_size; -@@ -13688,12 +13676,6 @@ load_specific_debug_section (enum dwarf_ - section->name, chdr.ch_type); - return FALSE; - } -- else if (chdr.ch_addralign != sec->sh_addralign) -- { -- warn (_("compressed section '%s' is corrupted\n"), -- section->name); -- return FALSE; -- } - uncompressed_size = chdr.ch_size; - start += compression_header_size; - size -= compression_header_size; -diff -rup binutils.orig/binutils/testsuite/binutils-all/dw2-3.rS binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rS ---- binutils.orig/binutils/testsuite/binutils-all/dw2-3.rS 2019-02-18 11:53:32.908646758 +0000 -+++ binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rS 2019-02-18 12:10:40.884338917 +0000 -@@ -1,3 +1,3 @@ - #... -- +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +1 -+ +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +(4|8) - #pass -diff -rup binutils.orig/binutils/testsuite/binutils-all/dw2-3.rt binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rt ---- binutils.orig/binutils/testsuite/binutils-all/dw2-3.rt 2019-02-18 11:53:32.905646779 +0000 -+++ binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rt 2019-02-18 12:11:13.476108521 +0000 -@@ -1,6 +1,6 @@ - #... - +\[[ 0-9]+\] .debug_info -- +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +1 -+ +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +(4|8) - +\[0+800\]: COMPRESSED - +ZLIB, 0+9d, 1 - #pass -diff -rup binutils.orig/gold/merge.cc binutils-2.31.1/gold/merge.cc ---- binutils.orig/gold/merge.cc 2019-02-18 11:53:32.210651723 +0000 -+++ binutils-2.31.1/gold/merge.cc 2019-02-18 12:12:59.027362334 +0000 -@@ -440,9 +440,11 @@ Output_merge_string::do_add_i - { - section_size_type sec_len; - bool is_new; -+ uint64_t addralign = this->addralign(); - const unsigned char* pdata = object->decompressed_section_contents(shndx, - &sec_len, -- &is_new); -+ &is_new, -+ &addralign); - - const Char_type* p = reinterpret_cast(pdata); - const Char_type* pend = p + sec_len / sizeof(Char_type); -@@ -494,7 +496,7 @@ Output_merge_string::do_add_i - // aligned, so each string within the section must retain the same - // modulo. - uintptr_t init_align_modulo = (reinterpret_cast(pdata) -- & (this->addralign() - 1)); -+ & (addralign - 1)); - bool has_misaligned_strings = false; - - while (p < pend) -@@ -503,7 +505,7 @@ Output_merge_string::do_add_i - - // Within merge input section each string must be aligned. - if (len != 0 -- && ((reinterpret_cast(p) & (this->addralign() - 1)) -+ && ((reinterpret_cast(p) & (addralign - 1)) - != init_align_modulo)) - has_misaligned_strings = true; - -diff -rup binutils.orig/gold/object.cc binutils-2.31.1/gold/object.cc ---- binutils.orig/gold/object.cc 2019-02-18 11:53:32.208651737 +0000 -+++ binutils-2.31.1/gold/object.cc 2019-02-18 12:16:35.938828914 +0000 -@@ -751,11 +751,13 @@ build_compressed_section_map( - const unsigned char* contents = - obj->section_contents(i, &len, false); - uint64_t uncompressed_size; -+ Compressed_section_info info; - if (is_zcompressed) - { - // Skip over the ".zdebug" prefix. - name += 7; - uncompressed_size = get_uncompressed_size(contents, len); -+ info.addralign = shdr.get_sh_addralign(); - } - else - { -@@ -763,8 +765,8 @@ build_compressed_section_map( - name += 6; - elfcpp::Chdr chdr(contents); - uncompressed_size = chdr.get_ch_size(); -+ info.addralign = chdr.get_ch_addralign(); - } -- Compressed_section_info info; - info.size = convert_to_section_size_type(uncompressed_size); - info.flag = shdr.get_sh_flags(); - info.contents = NULL; -@@ -3060,7 +3062,8 @@ const unsigned char* - Object::decompressed_section_contents( - unsigned int shndx, - section_size_type* plen, -- bool* is_new) -+ bool* is_new, -+ uint64_t* palign) - { - section_size_type buffer_size; - const unsigned char* buffer = this->do_section_contents(shndx, &buffer_size, -@@ -3087,6 +3090,8 @@ Object::decompressed_section_contents( - { - *plen = uncompressed_size; - *is_new = false; -+ if (palign != NULL) -+ *palign = p->second.addralign; - return p->second.contents; - } - -@@ -3108,6 +3113,8 @@ Object::decompressed_section_contents( - // once in this pass. - *plen = uncompressed_size; - *is_new = true; -+ if (palign != NULL) -+ *palign = p->second.addralign; - return uncompressed_data; - } - -diff -rup binutils.orig/gold/object.h binutils-2.31.1/gold/object.h ---- binutils.orig/gold/object.h 2019-02-18 11:53:32.210651723 +0000 -+++ binutils-2.31.1/gold/object.h 2019-02-18 12:17:50.625300926 +0000 -@@ -373,6 +373,7 @@ struct Compressed_section_info - { - section_size_type size; - elfcpp::Elf_Xword flag; -+ uint64_t addralign; - const unsigned char* contents; - }; - typedef std::map Compressed_section_map; -@@ -808,7 +809,8 @@ class Object - - bool - section_is_compressed(unsigned int shndx, -- section_size_type* uncompressed_size) const -+ section_size_type* uncompressed_size, -+ elfcpp::Elf_Xword* palign = NULL) const - { - if (this->compressed_sections_ == NULL) - return false; -@@ -818,6 +820,8 @@ class Object - { - if (uncompressed_size != NULL) - *uncompressed_size = p->second.size; -+ if (palign != NULL) -+ *palign = p->second.addralign; - return true; - } - return false; -@@ -828,7 +832,7 @@ class Object - // by the caller. - const unsigned char* - decompressed_section_contents(unsigned int shndx, section_size_type* plen, -- bool* is_cached); -+ bool* is_cached, uint64_t* palign = NULL); - - // Discard any buffers of decompressed sections. This is done - // at the end of the Add_symbols task. -diff -rup binutils.orig/gold/output.cc binutils-2.31.1/gold/output.cc ---- binutils.orig/gold/output.cc 2019-02-18 11:53:32.209651729 +0000 -+++ binutils-2.31.1/gold/output.cc 2019-02-18 12:18:39.729953797 +0000 -@@ -2448,7 +2448,14 @@ Output_section::add_input_section(Layout - unsigned int reloc_shndx, - bool have_sections_script) - { -+ section_size_type input_section_size = shdr.get_sh_size(); -+ section_size_type uncompressed_size; - elfcpp::Elf_Xword addralign = shdr.get_sh_addralign(); -+ -+ if (object->section_is_compressed(shndx, &uncompressed_size, -+ &addralign)) -+ input_section_size = uncompressed_size; -+ - if ((addralign & (addralign - 1)) != 0) - { - object->error(_("invalid alignment %lu for section \"%s\""), -@@ -2498,11 +2505,6 @@ Output_section::add_input_section(Layout - } - } - -- section_size_type input_section_size = shdr.get_sh_size(); -- section_size_type uncompressed_size; -- if (object->section_is_compressed(shndx, &uncompressed_size)) -- input_section_size = uncompressed_size; -- - off_t offset_in_section; - - if (this->has_fixed_layout()) diff --git a/binutils-fix-testsuite-failures.patch b/binutils-fix-testsuite-failures.patch index 57d61c4..c2b19a5 100644 --- a/binutils-fix-testsuite-failures.patch +++ b/binutils-fix-testsuite-failures.patch @@ -223,35 +223,6 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp binutils-2.32/ld/test proc srec_off { l } { if [string match "S1*" $l] { return 8 -diff -rup binutils-2.32.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp ---- binutils-2.32.orig/ld/testsuite/ld-x86-64/x86-64.exp 2019-02-15 13:33:22.030626874 +0000 -+++ binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp 2019-02-15 13:57:34.295106041 +0000 -@@ -1275,25 +1275,6 @@ if { [isnative] && [which $CC] != 0 } { - "$NOPIE_CFLAGS" \ - ] \ - ] -- } else { -- run_cc_link_tests [list \ -- [list \ -- "Build pr22001-1b" \ -- "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ -- "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ -- { pr22001-1c.c } \ -- {{error_output "pr22001-1b.err"}} \ -- "pr22001-1b" \ -- ] \ -- [list \ -- "Build pr21997-1b" \ -- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \ -- "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ -- { pr21997-1c.c } \ -- {{error_output "pr21997-1b.err"}} \ -- "pr21997-1b" \ -- ] \ -- ] - } - - run_ld_link_exec_tests [list \ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d --- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d 2019-02-15 14:10:59.038709514 +0000 +++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d 2019-02-15 14:13:53.532300721 +0000 @@ -326,3 +297,34 @@ diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY #... hook called: cleanup. +diff -rup binutils.orig/ld/testsuite/ld-elfvers/vers24.rd binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd +--- binutils.orig/ld/testsuite/ld-elfvers/vers24.rd 2018-09-05 09:45:44.013108697 +0100 ++++ binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd 2018-09-05 12:06:17.287425232 +0100 +@@ -7,9 +7,9 @@ Symbol table '.dynsym' contains [0-9]+ e + # And ensure the dynamic symbol table contains at least x@VERS.0 + # and foo@@VERS.0 symbols + #... +- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0 ++ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.* + #... +- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0 ++ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.* + #... + Symbol table '.symtab' contains [0-9]+ entries: + #pass +diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/testsuite/ld-plugin/plugin.exp +--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp 2018-09-05 09:45:44.023108605 +0100 ++++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp 2018-09-05 11:18:53.997202105 +0100 +@@ -118,6 +118,12 @@ if { $can_compile && !$failed_compile } + } + } + ++# I do not know why, but the underscore prefix test is going ++# wrong on ppc64le targets. So override it here. ++if { [istarget powerpc*-*-linux*] || [istarget x86_64*-*-linux*] } { ++ set _ "" ++} ++ + set testobjfiles "tmpdir/main.o tmpdir/func.o tmpdir/text.o" + set testobjfiles_notext "tmpdir/main.o tmpdir/func.o" + set testsrcfiles "tmpdir/main.o $srcdir/$subdir/func.c tmpdir/text.o" diff --git a/binutils-gcc-10-fixes.patch b/binutils-gcc-10-fixes.patch new file mode 100644 index 0000000..4233279 --- /dev/null +++ b/binutils-gcc-10-fixes.patch @@ -0,0 +1,180 @@ +diff -rup binutils.orig/gold/gdb-index.cc binutils-2.34.0/gold/gdb-index.cc +--- binutils.orig/gold/gdb-index.cc 2020-07-24 09:12:29.241306445 +0100 ++++ binutils-2.34.0/gold/gdb-index.cc 2020-07-24 09:15:48.332095898 +0100 +@@ -817,7 +817,7 @@ Gdb_index_info_reader::get_qualified_nam + void + Gdb_index_info_reader::record_cu_ranges(Dwarf_die* die) + { +- unsigned int shndx; ++ unsigned int shndx = 0; + unsigned int shndx2; + + off_t ranges_offset = die->ref_attribute(elfcpp::DW_AT_ranges, &shndx); +diff -rup binutils.orig/gold/layout.cc binutils-2.34.0/gold/layout.cc +--- binutils.orig/gold/layout.cc 2020-07-24 09:12:29.243306433 +0100 ++++ binutils-2.34.0/gold/layout.cc 2020-07-24 09:15:11.464320064 +0100 +@@ -1986,7 +1986,7 @@ Layout::attach_allocated_section_to_segm + seg_flags |= os->extra_segment_flags(); + + // Check for --section-start. +- uint64_t addr; ++ uint64_t addr = 0; + bool is_address_set = parameters->options().section_start(os->name(), &addr); + + // In general the only thing we really care about for PT_LOAD +diff -rup binutils.orig/binutils/dlltool.c binutils-2.34.0/binutils/dlltool.c +--- binutils.orig/binutils/dlltool.c 2020-07-24 09:12:28.974308069 +0100 ++++ binutils-2.34.0/binutils/dlltool.c 2020-07-24 12:09:37.527121295 +0100 +@@ -1305,7 +1305,7 @@ run (const char *what, char *args) + int pid, wait_status; + int i; + const char **argv; +- char *errmsg_fmt, *errmsg_arg; ++ char *errmsg_fmt = "", *errmsg_arg = ""; + char *temp_base = choose_temp_base (); + + inform (_("run: %s %s"), what, args); +diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c +--- binutils.orig/gas/config/tc-arm.c 2020-07-24 09:12:32.368287432 +0100 ++++ binutils-2.34.0/gas/config/tc-arm.c 2020-07-24 12:14:19.842360634 +0100 +@@ -28416,9 +28416,12 @@ md_apply_fix (fixS * fixP, + perform relaxation. */ + if (value == -2) + { +- newval = md_chars_to_number (buf, THUMB_SIZE); +- newval = 0xbf00; /* NOP encoding T1 */ +- md_number_to_chars (buf, newval, THUMB_SIZE); ++ if (fixP->fx_done || !seg->use_rela_p) ++ { ++ newval = md_chars_to_number (buf, THUMB_SIZE); ++ newval = 0xbf00; /* NOP encoding T1 */ ++ md_number_to_chars (buf, newval, THUMB_SIZE); ++ } + } + else + { +@@ -28631,17 +28634,14 @@ md_apply_fix (fixS * fixP, + case BFD_RELOC_ARM_GOTFUNCDESC: + case BFD_RELOC_ARM_GOTOFFFUNCDESC: + case BFD_RELOC_ARM_FUNCDESC: +- if (arm_fdpic) +- { +- if (fixP->fx_done || !seg->use_rela_p) +- md_number_to_chars (buf, 0, 4); +- } +- else ++ if (!arm_fdpic) + { + as_bad_where (fixP->fx_file, fixP->fx_line, + _("Relocation supported only in FDPIC mode")); +- } +- break; ++ break; ++ } ++ value = 0; ++ /* Fall through. */ + #endif + + case BFD_RELOC_RVA: +diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c +--- binutils.orig/gas/config/tc-arm.c 2020-07-24 12:16:02.099719884 +0100 ++++ binutils-2.34.0/gas/config/tc-arm.c 2020-07-24 12:34:17.690858328 +0100 +@@ -28641,7 +28641,7 @@ md_apply_fix (fixS * fixP, + break; + } + value = 0; +- /* Fall through. */ ++ goto fred; + #endif + + case BFD_RELOC_RVA: +@@ -28653,6 +28653,7 @@ md_apply_fix (fixS * fixP, + #ifdef TE_PE + case BFD_RELOC_32_SECREL: + #endif ++ fred: + if (fixP->fx_done || !seg->use_rela_p) + #ifdef TE_WINCE + /* For WinCE we only do this for pcrel fixups. */ +diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c +--- binutils.orig/gas/config/tc-arm.c 2020-07-24 13:28:26.926553452 +0100 ++++ binutils-2.34.0/gas/config/tc-arm.c 2020-07-24 13:31:57.835215763 +0100 +@@ -28416,12 +28416,8 @@ md_apply_fix (fixS * fixP, + perform relaxation. */ + if (value == -2) + { +- if (fixP->fx_done || !seg->use_rela_p) +- { +- newval = md_chars_to_number (buf, THUMB_SIZE); +- newval = 0xbf00; /* NOP encoding T1 */ +- md_number_to_chars (buf, newval, THUMB_SIZE); +- } ++ newval = 0xbf00; /* NOP encoding T1 */ ++ goto jim; + } + else + { +@@ -28432,6 +28428,7 @@ md_apply_fix (fixS * fixP, + { + newval = md_chars_to_number (buf, THUMB_SIZE); + newval |= ((value & 0x3e) << 2) | ((value & 0x40) << 3); ++ jim: + md_number_to_chars (buf, newval, THUMB_SIZE); + } + } +diff -rup binutils.orig/binutils/mclex.c binutils-2.34.0/binutils/mclex.c +--- binutils.orig/binutils/mclex.c 2020-07-24 13:28:26.297557441 +0100 ++++ binutils-2.34.0/binutils/mclex.c 2020-07-24 14:46:53.587940149 +0100 +@@ -207,7 +207,7 @@ enum_severity (int e) + static void + mc_add_keyword_ascii (const char *sz, int rid, const char *grp, rc_uint_type nv, const char *sv) + { +- unichar *usz, *usv = NULL; ++ unichar *usz = NULL, *usv = NULL; + rc_uint_type usz_len; + + unicode_from_codepage (&usz_len, &usz, sz, CP_ACP); +diff -rup binutils.orig/binutils/windmc.c binutils-2.34.0/binutils/windmc.c +--- binutils.orig/binutils/windmc.c 2020-07-24 13:28:26.279557556 +0100 ++++ binutils-2.34.0/binutils/windmc.c 2020-07-24 14:48:05.460477478 +0100 +@@ -338,7 +338,7 @@ mc_add_node_lang (mc_node *root, const m + static char * + convert_unicode_to_ACP (const unichar *usz) + { +- char *s; ++ char *s = NULL; + rc_uint_type l; + + if (! usz) +@@ -607,10 +607,10 @@ mc_generate_bin_item (mc_node_lang *n, r + else + { + rc_uint_type txt_len, l; +- char *cvt_txt; ++ char *cvt_txt = NULL; + + codepage_from_unicode( &l, n->message, &cvt_txt, n->lang->lang_info.wincp); +- if (! cvt_txt) ++ if (cvt_txt == NULL) + fatal ("Failed to convert message to language codepage.\n"); + txt_len = strlen (cvt_txt); + if (mcset_automatic_null_termination && txt_len > 0) +@@ -1107,7 +1107,7 @@ main (int argc, char **argv) + + /* Load the input file and do code page transformations to UTF16. */ + { +- unichar *u; ++ unichar *u = NULL; + rc_uint_type ul; + char *buff; + bfd_size_type flen; +--- binutils.orig/binutils/srconv.c 2020-07-24 15:37:25.847459208 +0100 ++++ binutils-2.34.0/binutils/srconv.c 2020-07-24 15:39:12.853773423 +0100 +@@ -316,6 +316,7 @@ wr_hd (struct coff_ofile *p) + struct IT_hd hd; + + hd.spare1 = 0; ++ hd.spare2 = 0; + if (bfd_get_file_flags (abfd) & EXEC_P) + hd.mt = MTYPE_ABS_LM; + else diff --git a/binutils-gold-ignore-discarded-note-relocs.patch b/binutils-gold-ignore-discarded-note-relocs.patch deleted file mode 100644 index b354fa4..0000000 --- a/binutils-gold-ignore-discarded-note-relocs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- binutils.orig/gold/target-reloc.h 2018-07-12 11:37:24.894494658 +0100 -+++ binutils-2.30.90/gold/target-reloc.h 2018-07-12 15:38:50.049083904 +0100 -@@ -136,6 +136,7 @@ class Default_comdat_behavior - if (Layout::is_debug_info_section(name)) - return CB_PRETEND; - if (strcmp(name, ".eh_frame") == 0 -+ || strncmp(name, ".gnu.build.attributes", 21) == 0 // FIXME: We should really be checking the section type for ST_NOTE... - || strcmp(name, ".gcc_except_table") == 0) - return CB_IGNORE; - return CB_ERROR; diff --git a/binutils-gold-warn-unsupported.patch b/binutils-gold-warn-unsupported.patch new file mode 100644 index 0000000..8e00aa3 --- /dev/null +++ b/binutils-gold-warn-unsupported.patch @@ -0,0 +1,66 @@ +Only in binutils-2.34/gold: autom4te.cache +diff -rup binutils.orig/gold/configure binutils-2.34/gold/configure +--- binutils.orig/gold/configure 2020-04-20 12:35:13.048297305 +0100 ++++ binutils-2.34/gold/configure 2020-04-20 14:02:06.743725696 +0100 +@@ -5180,7 +5180,8 @@ for targ in $target $canon_targets; do + . ${srcdir}/configure.tgt + + if test "$targ_obj" = "UNKNOWN"; then +- as_fn_error $? "\"unsupported target $targ\"" "$LINENO" 5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"unsupported target $targ\"" >&5 ++$as_echo "$as_me: WARNING: \"unsupported target $targ\"" >&2;} + else + targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)" + if test "$targ_extra_obj" != ""; then +diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac +--- binutils.orig/gold/configure.ac 2020-04-20 12:35:13.050297291 +0100 ++++ binutils-2.34/gold/configure.ac 2020-04-20 14:01:46.435868770 +0100 +@@ -181,7 +181,7 @@ for targ in $target $canon_targets; do + . ${srcdir}/configure.tgt + + if test "$targ_obj" = "UNKNOWN"; then +- AC_MSG_ERROR("unsupported target $targ") ++ AC_MSG_WARN("unsupported target $targ") + else + targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)" + if test "$targ_extra_obj" != ""; then +--- binutils.orig/ld/configure.tgt 2020-04-20 12:35:12.465301359 +0100 ++++ binutils-2.34/ld/configure.tgt 2020-04-20 14:17:52.123066333 +0100 +@@ -220,7 +220,7 @@ bfin-*-linux-uclibc*) targ_emul=elf32bfi + targ_extra_emuls="elf32bfin" + targ_extra_libpath=$targ_extra_emuls + ;; +-bpf-*-*) targ_emul=elf64bpf ++bpf-* | bpf-*-*) targ_emul=elf64bpf + ;; + cr16-*-elf*) targ_emul=elf32cr16 + ;; +@@ -1026,7 +1026,7 @@ z8k-*-coff) targ_emul=z8002 + targ_extra_ofiles= + ;; + *) +- echo 2>&1 "*** ld does not support target ${targ}" ++ echo 2>&1 "*** ld does not support target '${targ}' NO REALLY" + echo 2>&1 "*** see ld/configure.tgt for supported targets" + exit 1 + +--- binutils.orig/bfd/config.bfd 2020-04-20 12:35:13.038297375 +0100 ++++ binutils-2.34/bfd/config.bfd 2020-04-20 14:25:26.452869193 +0100 +@@ -473,7 +473,7 @@ case "${targ}" in + ;; + + #ifdef BFD64 +- bpf-*-none) ++ bpf-*-none | bpf-*) + targ_defvec=bpf_elf64_le_vec + targ_selvecs=bpf_elf64_be_vec + targ_underscore=yes +@@ -1427,7 +1427,7 @@ case "${targ}" in + ;; + + *) +- echo 1>&2 "*** BFD does not support target ${targ}." ++ echo 1>&2 "*** BFD does not support target '${targ}'. Honest." + echo 1>&2 "*** Look in bfd/config.bfd for supported targets." + exit 1 + ;; diff --git a/binutils-nm-lto-plugin.patch b/binutils-nm-lto-plugin.patch deleted file mode 100644 index 02ba3ab..0000000 --- a/binutils-nm-lto-plugin.patch +++ /dev/null @@ -1,858 +0,0 @@ -diff --git a/bfd/config.in b/bfd/config.in -index be572969fc..e1dc0f0c44 100644 ---- a/bfd/config.in -+++ b/bfd/config.in -@@ -18,6 +18,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Suffix used for executables, if any. */ -+#undef EXECUTABLE_SUFFIX -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_ALLOCA_H - -@@ -95,6 +98,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_DLFCN_H - -+/* Does the platform use an executable suffix? */ -+#undef HAVE_EXECUTABLE_SUFFIX -+ - /* Define to 1 if you have the `fcntl' function. */ - #undef HAVE_FCNTL - -diff --git a/bfd/configure b/bfd/configure -index bc576b7894..7c0708e2f8 100755 ---- a/bfd/configure -+++ b/bfd/configure -@@ -12813,6 +12813,16 @@ fi - - - -+if test -n "$EXEEXT"; then -+ -+$as_echo "#define HAVE_EXECUTABLE_SUFFIX 1" >>confdefs.h -+ -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define EXECUTABLE_SUFFIX "${EXEEXT}" -+_ACEOF -+ - - host64=false - target64=false -diff --git a/bfd/configure.ac b/bfd/configure.ac -index c5bfbd5d12..af4d4b8c13 100644 ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -157,6 +157,12 @@ AM_MAINTAINER_MODE - AM_CONDITIONAL(GENINSRC_NEVER, false) - AM_INSTALL_LIBBFD - AC_EXEEXT -+if test -n "$EXEEXT"; then -+ AC_DEFINE(HAVE_EXECUTABLE_SUFFIX, 1, -+ [Does the platform use an executable suffix?]) -+fi -+AC_DEFINE_UNQUOTED(EXECUTABLE_SUFFIX, "${EXEEXT}", -+ [Suffix used for executables, if any.]) - - host64=false - target64=false -diff --git a/bfd/plugin.c b/bfd/plugin.c -index 537ab60311..47c3439042 100644 ---- a/bfd/plugin.c -+++ b/bfd/plugin.c -@@ -69,7 +69,6 @@ dlerror (void) - - #endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) */ - --#define bfd_plugin_close_and_cleanup _bfd_generic_close_and_cleanup - #define bfd_plugin_bfd_free_cached_info _bfd_generic_bfd_free_cached_info - #define bfd_plugin_new_section_hook _bfd_generic_new_section_hook - #define bfd_plugin_get_section_contents _bfd_generic_get_section_contents -@@ -124,13 +123,312 @@ message (int level ATTRIBUTE_UNUSED, - return LDPS_OK; - } - -+struct plugin_list_entry -+{ -+ /* These must be initialized for each IR object with LTO wrapper. */ -+ void *handle; -+ ld_plugin_claim_file_handler claim_file; -+ ld_plugin_all_symbols_read_handler all_symbols_read; -+ ld_plugin_all_symbols_read_handler cleanup_handler; -+ char *resolution_file; -+ char *resolution_option; -+ bfd *real_bfd; -+ long real_nsyms; -+ asymbol **real_syms; -+ int lto_nsyms; -+ const struct ld_plugin_symbol *lto_syms; -+ -+ struct plugin_list_entry *next; -+ -+ /* These can be reused for all IR objects. */ -+ const char *plugin_name; -+ char *gcc; -+ char *lto_wrapper; -+ char *gcc_env; -+ bfd_boolean initialized; -+}; -+ -+/* Use GCC LTO wrapper to covert LTO IR object to the real object. */ -+ -+static bfd_boolean -+get_lto_wrapper (struct plugin_list_entry *plugin) -+{ -+ struct stat st; -+ const char *real_name; -+ const char *base_name; -+ size_t length; -+ const char *target_start = NULL; -+ const char *target_end = NULL; -+ size_t target_length = 0; -+ char *gcc_name; -+ char *wrapper_name; -+ char *p; -+ char dir_seperator = '\0'; -+ char *resolution_file; -+ -+ if (plugin->initialized) -+ { -+ if (plugin->lto_wrapper) -+ { -+ resolution_file = make_temp_file (".res"); -+ if (resolution_file) -+ { -+ plugin->resolution_file = resolution_file; -+ plugin->resolution_option = concat ("-fresolution=", -+ resolution_file, NULL); -+ return TRUE; -+ } -+ else -+ { -+ /* Something is wrong. Give up. */ -+ free (plugin->gcc); -+ free (plugin->lto_wrapper); -+ free (plugin->gcc_env); -+ plugin->gcc = NULL; -+ plugin->gcc_env = NULL; -+ plugin->lto_wrapper = NULL; -+ } -+ } -+ -+ return FALSE; -+ } -+ -+ plugin->initialized = TRUE; -+ -+ /* Check for PREFIX/libexec/gcc/TARGET/VERSION/liblto_plugin.so. */ -+ real_name = lrealpath (plugin->plugin_name); -+ base_name = lbasename (real_name); -+ -+ /* The directory length in plugin pathname. */ -+ length = base_name - real_name; -+ -+ /* Skip if there is no PREFIX. */ -+ if (!length) -+ return FALSE; -+ -+ p = (char *) real_name + length - 1; -+ if (IS_DIR_SEPARATOR (*p)) -+ { -+ int level = 0; -+ for (; p != real_name; p--) -+ if (IS_DIR_SEPARATOR (*p)) -+ { -+ level++; -+ if (level == 2) -+ target_end = p; -+ else if (level == 3) -+ { -+ target_start = p + 1; -+ target_length = target_end - target_start; -+ } -+ else if (level == 5) -+ { -+ dir_seperator = *p; -+ break; -+ } -+ } -+ } -+ -+ /* Skip if there is no TARGET nor PREFIX. */ -+ if (!target_length || !dir_seperator) -+ return FALSE; -+ -+#ifdef HAVE_EXECUTABLE_SUFFIX -+# define GCC_EXECUTABLE "gcc" EXECUTABLE_SUFFIX -+# define LTO_WRAPPER_EXECUTABLE "lto-wrapper" EXECUTABLE_SUFFIX -+#else -+# define GCC_EXECUTABLE "gcc" -+# define LTO_WRAPPER_EXECUTABLE "lto-wrapper" -+#endif -+ gcc_name = bfd_malloc (length + target_length -+ + sizeof (GCC_EXECUTABLE)); -+ if (gcc_name == NULL) -+ return FALSE; -+ memcpy (gcc_name, real_name, length); -+ -+ /* Get PREFIX/bin/. */ -+ p += gcc_name - real_name; -+ memcpy (p + 1, "bin", 3); -+ p[4] = dir_seperator; -+ -+ /* Try PREFIX/bin/TARGET-gcc first. */ -+ memcpy (p + 5, target_start, target_length); -+ p[5 + target_length] = '-'; -+ memcpy (p + 5 + target_length + 1, GCC_EXECUTABLE, -+ sizeof (GCC_EXECUTABLE)); -+ if (stat (gcc_name, &st) != 0 || !S_ISREG (st.st_mode)) -+ { -+ /* Then try PREFIX/bin/gcc. */ -+ memcpy (p + 5, GCC_EXECUTABLE, sizeof (GCC_EXECUTABLE)); -+ if (stat (gcc_name, &st) != 0 || !S_ISREG (st.st_mode)) -+ { -+ free (gcc_name); -+ return FALSE; -+ } -+ } -+ -+ /* lto-wrapper should be in the same directory with LTO plugin. */ -+ wrapper_name = bfd_malloc (length + sizeof (LTO_WRAPPER_EXECUTABLE)); -+ if (wrapper_name == NULL) -+ { -+ free (gcc_name); -+ return FALSE; -+ } -+ memcpy (wrapper_name, real_name, length); -+ memcpy (wrapper_name + length, LTO_WRAPPER_EXECUTABLE, -+ sizeof (LTO_WRAPPER_EXECUTABLE)); -+ if (stat (wrapper_name, &st) == 0 && S_ISREG (st.st_mode)) -+ { -+ resolution_file = make_temp_file (".res"); -+ if (resolution_file) -+ { -+ plugin->gcc = gcc_name; -+ plugin->lto_wrapper = wrapper_name; -+ plugin->gcc_env = concat ("COLLECT_GCC=", gcc_name, NULL); -+ plugin->resolution_file = resolution_file; -+ plugin->resolution_option = concat ("-fresolution=", -+ resolution_file, NULL); -+ return TRUE; -+ } -+ } -+ -+ free (gcc_name); -+ free (wrapper_name); -+ return FALSE; -+} -+ -+/* Set environment variables for GCC LTO wrapper to covert LTO IR -+ object to the real object. */ -+ -+static int -+setup_lto_wrapper_env (struct plugin_list_entry *plugin) -+{ -+ return (putenv (plugin->gcc_env) -+ || putenv ("COLLECT_GCC_OPTIONS=")); -+} -+ -+static struct plugin_list_entry *plugin_list = NULL; -+static struct plugin_list_entry *current_plugin = NULL; -+ - /* Register a claim-file handler. */ --static ld_plugin_claim_file_handler claim_file = NULL; - - static enum ld_plugin_status - register_claim_file (ld_plugin_claim_file_handler handler) - { -- claim_file = handler; -+ current_plugin->claim_file = handler; -+ return LDPS_OK; -+} -+ -+/* Register an all-symbols-read handler. */ -+ -+static enum ld_plugin_status -+register_all_symbols_read (ld_plugin_all_symbols_read_handler handler) -+{ -+ current_plugin->all_symbols_read = handler; -+ return LDPS_OK; -+} -+ -+/* Register a cleanup handler. */ -+ -+static enum ld_plugin_status -+register_cleanup (ld_plugin_all_symbols_read_handler handler) -+{ -+ current_plugin->cleanup_handler = handler; -+ return LDPS_OK; -+} -+ -+/* Get the symbol resolution info for a plugin-claimed input file. */ -+ -+static enum ld_plugin_status -+get_symbols (const void *handle ATTRIBUTE_UNUSED, int nsyms, -+ struct ld_plugin_symbol *syms) -+{ -+ if (syms) -+ { -+ int n; -+ for (n = 0; n < nsyms; n++) -+ { -+ switch (syms[n].def) -+ { -+ default: -+ BFD_ASSERT (0); -+ break; -+ case LDPK_UNDEF: -+ case LDPK_WEAKUNDEF: -+ syms[n].resolution = LDPR_UNDEF; -+ break; -+ case LDPK_DEF: -+ case LDPK_WEAKDEF: -+ case LDPK_COMMON: -+ /* Tell plugin that LTO symbol has references from regular -+ object code. */ -+ syms[n].resolution = LDPR_PREVAILING_DEF; -+ break; -+ } -+ } -+ } -+ -+ return LDPS_OK; -+} -+ -+/* Add a new (real) input file generated by a plugin. */ -+ -+static enum ld_plugin_status -+add_input_file (const char *pathname) -+{ -+ /* Get symbols from the real LTO object. */ -+ char **matching; -+ long real_symsize; -+ long real_nsyms; -+ asymbol **real_syms; -+ int lto_nsyms; -+ bfd_boolean lto_symbol_found = FALSE; -+ const struct ld_plugin_symbol *lto_syms; -+ bfd *rbfd; -+ int i, j; -+ -+ rbfd = bfd_openr (pathname, NULL); -+ if (!bfd_check_format_matches (rbfd, bfd_object, &matching)) -+ BFD_ASSERT (0); -+ -+ real_symsize = bfd_get_symtab_upper_bound (rbfd); -+ if (real_symsize < 0) -+ BFD_ASSERT (0); -+ -+ real_syms = (asymbol **) bfd_malloc (real_symsize); -+ if (real_syms) -+ { -+ real_nsyms = bfd_canonicalize_symtab (rbfd, real_syms); -+ if (real_nsyms < 0) -+ BFD_ASSERT (0); -+ -+ /* NB: LTO plugin may generate more than one real object from one -+ LTO IR object. We use the one which contains LTO symbols. */ -+ lto_syms = current_plugin->lto_syms; -+ lto_nsyms = current_plugin->lto_nsyms; -+ for (i = 0; i < lto_nsyms; i++) -+ for (j = 0; j < real_nsyms; j++) -+ if (real_syms[j]->name -+ && strcmp (lto_syms[i].name, real_syms[j]->name) == 0) -+ { -+ lto_symbol_found = TRUE; -+ break; -+ } -+ } -+ -+ if (lto_symbol_found) -+ { -+ current_plugin->real_nsyms = real_nsyms; -+ current_plugin->real_syms = real_syms; -+ /* NB: We can't close RBFD which own the real symbol info. */ -+ current_plugin->real_bfd = rbfd; -+ } -+ else -+ { -+ bfd_close (rbfd); -+ free (real_syms); -+ } -+ - return LDPS_OK; - } - -@@ -143,13 +441,52 @@ add_symbols (void * handle, - struct plugin_data_struct *plugin_data = - bfd_alloc (abfd, sizeof (plugin_data_struct)); - -- plugin_data->nsyms = nsyms; -- plugin_data->syms = syms; -+ if (plugin_data) -+ { -+ struct ld_plugin_symbol *sym_info; -+ char *strtab; -+ size_t sym_info_size, name_length; -+ int i; -+ -+ memset (plugin_data, 0, sizeof (*plugin_data)); -+ -+ abfd->tdata.plugin_data = plugin_data; -+ -+ /* NB: LTO symbols are owned by LTO plugin. Create a copy so -+ that we can use it in bfd_plugin_canonicalize_symtab. */ -+ sym_info_size = nsyms * sizeof (*syms); -+ -+ /* Allocate a string table */ -+ for (i = 0; i < nsyms; i++) -+ sym_info_size += strlen (syms[i].name) + 1; -+ -+ sym_info = bfd_alloc (abfd, sym_info_size); -+ if (sym_info) -+ { -+ /* Copy symbol table. */ -+ memcpy (sym_info, syms, nsyms * sizeof (*syms)); -+ -+ /* Copy symbol names in symbol table. */ -+ strtab = (char *) (sym_info + nsyms); -+ for (i = 0; i < nsyms; i++) -+ { -+ name_length = strlen (syms[i].name); -+ memcpy (strtab, syms[i].name, name_length + 1); -+ sym_info[i].name = strtab; -+ strtab += name_length + 1; -+ } -+ -+ plugin_data->nsyms = nsyms; -+ plugin_data->syms = sym_info; -+ -+ current_plugin->lto_nsyms = nsyms; -+ current_plugin->lto_syms = sym_info; -+ } -+ } - - if (nsyms != 0) - abfd->flags |= HAS_SYMS; - -- abfd->tdata.plugin_data = plugin_data; - return LDPS_OK; - } - -@@ -212,34 +549,72 @@ try_claim (bfd *abfd) - struct ld_plugin_input_file file; - - file.handle = abfd; -- if (!bfd_plugin_open_input (abfd, &file)) -- return 0; -- if (claim_file) -- claim_file (&file, &claimed); -- close (file.fd); -- return claimed; --} -+ if (bfd_plugin_open_input (abfd, &file) -+ && current_plugin->claim_file) -+ { -+ current_plugin->claim_file (&file, &claimed); -+ if (claimed) -+ { -+ if (current_plugin->all_symbols_read) -+ { -+ struct plugin_data_struct *plugin_data -+ = abfd->tdata.plugin_data; -+ if (plugin_data) -+ { -+ /* Get real symbols from LTO wrapper. */ -+ current_plugin->all_symbols_read (); - --struct plugin_list_entry --{ -- void * handle; -- ld_plugin_claim_file_handler claim_file; -- struct plugin_list_entry * next; --}; -+ /* Copy real symbols to plugin_data. */ -+ plugin_data->real_bfd = current_plugin->real_bfd; -+ plugin_data->real_nsyms = current_plugin->real_nsyms; -+ plugin_data->real_syms = current_plugin->real_syms; -+ -+ /* Clean up LTO plugin. */ -+ if (current_plugin->cleanup_handler) -+ current_plugin->cleanup_handler (); -+ } -+ } -+ } -+ -+ close (file.fd); -+ } -+ -+ if (current_plugin->lto_wrapper) -+ { -+ /* Clean up for LTO wrapper. NB: Resolution file and option -+ have been created regardless if an IR object is claimed or -+ not. */ -+ unlink (current_plugin->resolution_file); -+ free (current_plugin->resolution_option); -+ } - --static struct plugin_list_entry * plugin_list = NULL; -+ return claimed; -+} - - static int --try_load_plugin (const char *pname, bfd *abfd, int *has_plugin_p) -+try_load_plugin (const char *pname, -+ struct plugin_list_entry *plugin_list_iter, -+ bfd *abfd, bfd_boolean build_list_p) - { - void *plugin_handle = NULL; -- struct ld_plugin_tv tv[4]; -+ struct ld_plugin_tv tv[12]; - int i; - ld_plugin_onload onload; - enum ld_plugin_status status; -- struct plugin_list_entry *plugin_list_iter; - -- *has_plugin_p = 0; -+ /* NB: Each object is independent. Reuse the previous plugin from -+ the last run will lead to wrong result. */ -+ if (current_plugin) -+ { -+ if (current_plugin->handle) -+ dlclose (current_plugin->handle); -+ memset (current_plugin, 0, -+ offsetof (struct plugin_list_entry, next)); -+ current_plugin = NULL; -+ } -+ -+ if (plugin_list_iter) -+ pname = plugin_list_iter->plugin_name; - - plugin_handle = dlopen (pname, RTLD_NOW); - if (!plugin_handle) -@@ -248,28 +623,30 @@ try_load_plugin (const char *pname, bfd *abfd, int *has_plugin_p) - return 0; - } - -- for (plugin_list_iter = plugin_list; -- plugin_list_iter; -- plugin_list_iter = plugin_list_iter->next) -+ if (plugin_list_iter == NULL) - { -- if (plugin_handle == plugin_list_iter->handle) -+ size_t length_plugin_name = strlen (pname) + 1; -+ char *plugin_name = bfd_malloc (length_plugin_name); -+ if (plugin_name == NULL) -+ return 0; -+ plugin_list_iter = bfd_malloc (sizeof *plugin_list_iter); -+ if (plugin_list_iter == NULL) - { -- dlclose (plugin_handle); -- if (!plugin_list_iter->claim_file) -- return 0; -- -- register_claim_file (plugin_list_iter->claim_file); -- goto have_claim_file; -+ free (plugin_name); -+ return 0; - } -+ /* Make a copy of PNAME since PNAME from load_plugin () will be -+ freed. */ -+ memcpy (plugin_name, pname, length_plugin_name); -+ memset (plugin_list_iter, 0, sizeof (*plugin_list_iter)); -+ plugin_list_iter->plugin_name = plugin_name; -+ plugin_list_iter->next = plugin_list; -+ plugin_list = plugin_list_iter; - } - -- plugin_list_iter = bfd_malloc (sizeof *plugin_list_iter); -- if (plugin_list_iter == NULL) -- return 0; - plugin_list_iter->handle = plugin_handle; -- plugin_list_iter->claim_file = NULL; -- plugin_list_iter->next = plugin_list; -- plugin_list = plugin_list_iter; -+ if (build_list_p) -+ return 0; - - onload = dlsym (plugin_handle, "onload"); - if (!onload) -@@ -287,23 +664,60 @@ try_load_plugin (const char *pname, bfd *abfd, int *has_plugin_p) - tv[i].tv_tag = LDPT_ADD_SYMBOLS; - tv[i].tv_u.tv_add_symbols = add_symbols; - -+ if (get_lto_wrapper (plugin_list_iter)) -+ { -+ ++i; -+ tv[i].tv_tag = LDPT_REGISTER_ALL_SYMBOLS_READ_HOOK; -+ tv[i].tv_u.tv_register_all_symbols_read = register_all_symbols_read; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_REGISTER_CLEANUP_HOOK; -+ tv[i].tv_u.tv_register_cleanup = register_cleanup; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_GET_SYMBOLS; -+ tv[i].tv_u.tv_get_symbols = get_symbols; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_GET_SYMBOLS_V2; -+ tv[i].tv_u.tv_get_symbols = get_symbols; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_OPTION; -+ tv[i].tv_u.tv_string = plugin_list_iter->lto_wrapper; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_OPTION; -+ tv[i].tv_u.tv_string = plugin_list_iter->resolution_option; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_LINKER_OUTPUT; -+ tv[i].tv_u.tv_val = LDPO_EXEC; -+ -+ ++i; -+ tv[i].tv_tag = LDPT_ADD_INPUT_FILE; -+ tv[i].tv_u.tv_add_input_file = add_input_file; -+ } -+ - ++i; - tv[i].tv_tag = LDPT_NULL; - tv[i].tv_u.tv_val = 0; - -+ current_plugin = plugin_list_iter; -+ -+ /* LTO plugin will call handler hooks to set up plugin handlers. */ - status = (*onload)(tv); - - if (status != LDPS_OK) - return 0; - -- plugin_list_iter->claim_file = claim_file; -- --have_claim_file: -- *has_plugin_p = 1; -+ if (current_plugin->lto_wrapper -+ && setup_lto_wrapper_env (current_plugin)) -+ return 0; - - abfd->plugin_format = bfd_plugin_no; - -- if (!claim_file) -+ if (!current_plugin->claim_file) - return 0; - - if (!try_claim (abfd)) -@@ -314,8 +728,7 @@ have_claim_file: - } - - /* There may be plugin libraries in lib/bfd-plugins. */ -- --static int has_plugin = -1; -+static int has_plugin_list = -1; - - static const bfd_target *(*ld_plugin_object_p) (bfd *); - -@@ -325,7 +738,6 @@ void - bfd_plugin_set_plugin (const char *p) - { - plugin_name = p; -- has_plugin = p != NULL; - } - - /* Return TRUE if a plugin library is used. */ -@@ -333,7 +745,7 @@ bfd_plugin_set_plugin (const char *p) - bfd_boolean - bfd_plugin_specified_p (void) - { -- return has_plugin > 0; -+ return plugin_list != NULL; - } - - /* Return TRUE if ABFD can be claimed by linker LTO plugin. */ -@@ -364,8 +776,8 @@ register_ld_plugin_object_p (const bfd_target *(*object_p) (bfd *)) - ld_plugin_object_p = object_p; - } - --static int --load_plugin (bfd *abfd) -+static void -+build_plugin_list (bfd *abfd) - { - /* The intent was to search ${libdir}/bfd-plugins for plugins, but - unfortunately the original implementation wasn't precisely that -@@ -374,17 +786,10 @@ load_plugin (bfd *abfd) - static const char *path[] - = { LIBDIR "/bfd-plugins", BINDIR "/../lib/bfd-plugins" }; - struct stat last_st; -- int found = 0; - unsigned int i; - -- if (!has_plugin) -- return found; -- -- if (plugin_name) -- return try_load_plugin (plugin_name, abfd, &has_plugin); -- -- if (plugin_program_name == NULL) -- return found; -+ if (has_plugin_list >= 0) -+ return; - - /* Try not to search the same dir twice, by looking at st_dev and - st_ino for the dir. If we are on a file system that always sets -@@ -419,26 +824,38 @@ load_plugin (bfd *abfd) - - full_name = concat (plugin_dir, "/", ent->d_name, NULL); - if (stat (full_name, &st) == 0 && S_ISREG (st.st_mode)) -- { -- int valid_plugin; -- -- found = try_load_plugin (full_name, abfd, &valid_plugin); -- if (has_plugin <= 0) -- has_plugin = valid_plugin; -- } -+ try_load_plugin (full_name, NULL, abfd, TRUE); - free (full_name); -- if (found) -- break; - } - closedir (d); - } - free (plugin_dir); - } -- if (found) -- break; - } - -- return found; -+ has_plugin_list = plugin_list != NULL; -+} -+ -+static int -+load_plugin (bfd *abfd) -+{ -+ struct plugin_list_entry *plugin_list_iter; -+ -+ if (plugin_name) -+ return try_load_plugin (plugin_name, plugin_list, abfd, FALSE); -+ -+ if (plugin_program_name == NULL) -+ return 0; -+ -+ build_plugin_list (abfd); -+ -+ for (plugin_list_iter = plugin_list; -+ plugin_list_iter; -+ plugin_list_iter = plugin_list_iter->next) -+ if (try_load_plugin (NULL, plugin_list_iter, abfd, FALSE)) -+ return 1; -+ -+ return 0; - } - - -@@ -562,7 +979,15 @@ bfd_plugin_canonicalize_symtab (bfd *abfd, - SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS); - static asection fake_common_section - = BFD_FAKE_SECTION (fake_common_section, NULL, "plug", 0, SEC_IS_COMMON); -- int i; -+ int i, j; -+ long real_nsyms; -+ asymbol **real_syms; -+ -+ real_syms = plugin_data->real_syms; -+ if (real_syms) -+ real_nsyms = plugin_data->real_nsyms; -+ else -+ real_nsyms = 0; - - for (i = 0; i < nsyms; i++) - { -@@ -587,6 +1012,15 @@ bfd_plugin_canonicalize_symtab (bfd *abfd, - case LDPK_DEF: - case LDPK_WEAKDEF: - s->section = &fake_section; -+ if (real_nsyms) -+ /* Use real LTO symbols if possible. */ -+ for (j = 0; j < real_nsyms; j++) -+ if (real_syms[j]->name -+ && strcmp (syms[i].name, real_syms[j]->name) == 0) -+ { -+ s->section = real_syms[j]->section; -+ break; -+ } - break; - default: - BFD_ASSERT (0); -@@ -635,6 +1069,24 @@ bfd_plugin_sizeof_headers (bfd *a ATTRIBUTE_UNUSED, - return 0; - } - -+static bfd_boolean -+bfd_plugin_close_and_cleanup (bfd *abfd) -+{ -+ struct plugin_data_struct *plugin_data; -+ -+ if (abfd->format != bfd_archive -+ && (plugin_data = abfd->tdata.plugin_data)) -+ { -+ if (plugin_data->real_bfd) -+ bfd_close (plugin_data->real_bfd); -+ -+ if (plugin_data->real_syms) -+ free (plugin_data->real_syms); -+ } -+ -+ return _bfd_generic_close_and_cleanup (abfd); -+} -+ - const bfd_target plugin_vec = - { - "plugin", /* Name. */ -diff --git a/bfd/plugin.h b/bfd/plugin.h -index 098bf08455..05c3573933 100644 ---- a/bfd/plugin.h -+++ b/bfd/plugin.h -@@ -33,6 +33,9 @@ typedef struct plugin_data_struct - { - int nsyms; - const struct ld_plugin_symbol *syms; -+ bfd *real_bfd; -+ long real_nsyms; -+ asymbol **real_syms; - } - plugin_data_struct; - -diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp -index 9b03b7b397..1b44b0da3f 100644 ---- a/ld/testsuite/ld-plugin/lto.exp -+++ b/ld/testsuite/ld-plugin/lto.exp -@@ -234,6 +234,11 @@ set lto_link_tests [list \ - [list "Build pr24406-2b.o" \ - "" "-O2 -fno-lto" \ - {pr24406-2b.c}] \ -+ [list "pr25355.o" \ -+ "" \ -+ "-flto -fno-common $lto_no_fat" \ -+ {pr25355.c} \ -+ [list [list "nm" "$plug_opt" "pr25355.d"]]] \ - ] - - if { [at_least_gcc_version 4 7] } { -diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index 6752a76483..e276bb589d 100644 ---- a/ld/testsuite/lib/ld-lib.exp -+++ b/ld/testsuite/lib/ld-lib.exp -@@ -928,6 +928,7 @@ proc run_cc_link_tests { ldtests } { - - if { $binfile eq "tmpdir/" } { - # compile only -+ set binfile $objfile - } elseif { [regexp ".*\\.a$" $binfile] } { - if { ![ar_simple_create $ar $ldflags $binfile "$objfiles"] } { - set failed 1 diff --git a/binutils-readelf-other-sym-info.patch b/binutils-readelf-other-sym-info.patch index fa1b2f2..72913ba 100644 --- a/binutils-readelf-other-sym-info.patch +++ b/binutils-readelf-other-sym-info.patch @@ -1,25 +1,24 @@ -diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c ---- binutils.orig/binutils/readelf.c 2017-12-12 16:24:19.571221194 +0000 -+++ binutils-2.29/binutils/readelf.c 2017-12-12 16:27:26.997979803 +0000 -@@ -11018,12 +11018,14 @@ print_dynamic_symbol (bfd_vma si, unsign +--- binutils.orig/binutils/readelf.c 2020-07-24 15:08:30.317597020 +0100 ++++ binutils-2.35/binutils/readelf.c 2020-07-24 15:09:39.029155552 +0100 +@@ -12069,11 +12069,13 @@ print_dynamic_symbol (Filedata *filedata unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); - printf (" %-7s", get_symbol_visibility (vis)); + printf (" %-7s", get_symbol_visibility (vis)); +#if 0 /* Check to see if any other bits in the st_other field are set. Note - displaying this information disrupts the layout of the - table being generated, but for the moment this case is very - rare. */ + table being generated, but for the moment this case is very rare. */ if (psym->st_other ^ vis) printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis)); +#endif } + printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx)); - printf (" %3.3s ", get_symbol_index_type (filedata, psym->st_shndx)); -@@ -11031,6 +11033,15 @@ print_dynamic_symbol (bfd_vma si, unsign - print_symbol (25, GET_DYNAMIC_NAME (psym->st_name)); - else - printf (_(" "), psym->st_name); +@@ -12112,7 +12114,17 @@ print_dynamic_symbol (Filedata *filedata + version_string); + } + +- putchar ('\n'); +#if 1 + { + unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); @@ -29,38 +28,8 @@ diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c + printf (" \t[%s]", get_symbol_other (filedata, psym->st_other ^ vis)); + } +#endif - putchar ('\n'); - } - ---- binutils.orig/binutils/readelf.c 2017-12-12 16:36:21.806561149 +0000 -+++ binutils-2.29.1/binutils/readelf.c 2017-12-12 16:38:17.763168514 +0000 -@@ -11548,11 +11548,13 @@ process_symbol_table (FILE * file) - unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); - - printf (" %-7s", get_symbol_visibility (vis)); -+#if 0 - /* Check to see if any other bits in the st_other field are set. - Note - displaying this information disrupts the layout of the - table being generated, but for the moment this case is very rare. */ - if (psym->st_other ^ vis) - printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis)); -+#endif - } - printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx)); - print_symbol (25, psym->st_name < strtab_size -@@ -11571,7 +11573,15 @@ process_symbol_table (FILE * file) - printf (sym_info == symbol_hidden ? "@%s" : "@@%s", - version_string); - } -+#if 1 -+ { -+ unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); - -+ /* Check to see if any other bits in the st_other field are set. */ -+ if (psym->st_other ^ vis) -+ printf (" \t[%s] ", get_symbol_other (filedata, psym->st_other ^ vis)); -+ } -+#endif - putchar ('\n'); ++ ++ putchar ('\n'); - if (ELF_ST_BIND (psym->st_info) == STB_LOCAL + if (ELF_ST_BIND (psym->st_info) == STB_LOCAL + && section != NULL diff --git a/binutils-s390-build.patch b/binutils-s390-build.patch new file mode 100644 index 0000000..cdb6a5d --- /dev/null +++ b/binutils-s390-build.patch @@ -0,0 +1,772 @@ +diff -rup binutils.orig/libctf/ctf-create.c binutils-2.34.0/libctf/ctf-create.c +--- binutils.orig/libctf/ctf-create.c 2020-06-16 12:06:28.466468753 +0100 ++++ binutils-2.34.0/libctf/ctf-create.c 2020-06-16 12:16:19.744482839 +0100 +@@ -871,7 +871,8 @@ ctf_add_encoded (ctf_file_t *fp, uint32_ + + if ((type = ctf_add_generic (fp, flag, name, kind, &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ +- ++ if (dtd == NULL) ++ return CTF_ERR; + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, flag, 0); + dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT) + / CHAR_BIT); +@@ -896,6 +897,8 @@ ctf_add_reftype (ctf_file_t *fp, uint32_ + + if ((type = ctf_add_generic (fp, flag, NULL, kind, &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, flag, 0); + dtd->dtd_data.ctt_type = (uint32_t) ref; +@@ -958,6 +961,8 @@ ctf_add_slice (ctf_file_t *fp, uint32_t + + if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_SLICE, &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_SLICE, flag, 0); + dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT) +@@ -1008,6 +1013,8 @@ ctf_add_array (ctf_file_t *fp, uint32_t + + if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_ARRAY, &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_ARRAY, flag, 0); + dtd->dtd_data.ctt_size = 0; +@@ -1075,6 +1082,8 @@ ctf_add_function (ctf_file_t *fp, uint32 + free (vdat); + return CTF_ERR; /* errno is set for us. */ + } ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_FUNCTION, flag, vlen); + dtd->dtd_data.ctt_type = (uint32_t) ctc->ctc_return; +@@ -1104,6 +1113,8 @@ ctf_add_struct_sized (ctf_file_t *fp, ui + else if ((type = ctf_add_generic (fp, flag, name, CTF_K_STRUCT, + &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_STRUCT, flag, 0); + +@@ -1141,6 +1152,8 @@ ctf_add_union_sized (ctf_file_t *fp, uin + else if ((type = ctf_add_generic (fp, flag, name, CTF_K_UNION, + &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_UNION, flag, 0); + +@@ -1177,6 +1190,8 @@ ctf_add_enum (ctf_file_t *fp, uint32_t f + else if ((type = ctf_add_generic (fp, flag, name, CTF_K_ENUM, + &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_ENUM, flag, 0); + dtd->dtd_data.ctt_size = fp->ctf_dmodel->ctd_int; +diff -rup binutils.orig/libctf/ctf-types.c binutils-2.34.0/libctf/ctf-types.c +--- binutils.orig/libctf/ctf-types.c 2020-06-16 12:06:28.466468753 +0100 ++++ binutils-2.34.0/libctf/ctf-types.c 2020-06-16 12:10:58.033563365 +0100 +@@ -748,7 +748,7 @@ ctf_type_encoding (ctf_file_t *fp, ctf_i + case CTF_K_SLICE: + { + const ctf_slice_t *slice; +- ctf_encoding_t underlying_en; ++ ctf_encoding_t underlying_en = {0}; + slice = &dtd->dtd_u.dtu_slice; + + data = ctf_type_encoding (fp, slice->cts_type, &underlying_en); +diff -rup binutils.orig/opcodes/s390-mkopc.c binutils-2.34.0/opcodes/s390-mkopc.c +--- binutils.orig/opcodes/s390-mkopc.c 2020-06-16 12:06:28.447468816 +0100 ++++ binutils-2.34.0/opcodes/s390-mkopc.c 2020-06-16 12:17:10.783311417 +0100 +@@ -168,7 +168,7 @@ insertExpandedMnemonic (char *opcode, ch + int mask_start, i = 0, tag_found = 0, reading_number = 0; + int number_p = 0, suffix_p = 0, prefix_p = 0; + const struct s390_cond_ext_format *ext_table; +- int ext_table_length; ++ int ext_table_length = 0; + + if (!(tag = strpbrk (mnemonic, "*$"))) + { +Only in binutils.orig/libctf: .#ctf-create.c +diff -rup binutils.orig/libctf/ctf-create.c binutils-2.34.0/libctf/ctf-create.c +--- binutils.orig/libctf/ctf-create.c 2020-06-16 14:49:06.080801319 +0100 ++++ binutils-2.34.0/libctf/ctf-create.c 2020-06-16 14:49:08.046794113 +0100 +@@ -798,6 +798,7 @@ ctf_add_generic (ctf_file_t *fp, uint32_ + { + ctf_dtdef_t *dtd; + ctf_id_t type; ++ *rp = NULL; + + if (flag != CTF_ADD_NONROOT && flag != CTF_ADD_ROOT) + return (ctf_set_errno (fp, EINVAL)); +diff -rup binutils.orig/opcodes/fr30-ibld.c binutils-2.34.0/opcodes/fr30-ibld.c +--- binutils.orig/opcodes/fr30-ibld.c 2020-06-16 14:49:06.074801341 +0100 ++++ binutils-2.34.0/opcodes/fr30-ibld.c 2020-06-16 16:43:31.428324833 +0100 +@@ -810,7 +810,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_DIR10 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 8, 16, total_length, pc, & value); + value = ((value) << (2)); + fields->f_dir10 = value; +@@ -821,7 +821,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_DIR9 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 8, 16, total_length, pc, & value); + value = ((value) << (1)); + fields->f_dir9 = value; +@@ -829,7 +829,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_DISP10 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_disp10 = value; +@@ -840,7 +840,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_DISP9 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_disp9 = value; +@@ -865,7 +865,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_LABEL12 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_rel12 = value; +@@ -873,7 +873,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_LABEL9 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_rel9 = value; +@@ -881,7 +881,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_M4 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 4, 16, total_length, pc, & value); + value = ((value) | (-16)); + fields->f_m4 = value; +@@ -911,7 +911,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_U10 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 8, 16, total_length, pc, & value); + value = ((value) << (2)); + fields->f_u10 = value; +@@ -928,7 +928,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_UDISP6 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 4, 16, total_length, pc, & value); + value = ((value) << (2)); + fields->f_udisp6 = value; + +diff -rup binutils.orig/opcodes/fr30-ibld.c binutils-2.34.0/opcodes/fr30-ibld.c +--- binutils.orig/opcodes/fr30-ibld.c 2020-06-16 17:10:22.540563440 +0100 ++++ binutils-2.34.0/opcodes/fr30-ibld.c 2020-06-16 17:10:48.966468906 +0100 +@@ -903,7 +903,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC + break; + case FR30_OPERAND_S10 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_s10 = value; +Only in binutils-2.34.0/opcodes: fr30-ibld.c~ +--- binutils.orig/opcodes/m32c-ibld.c 2020-06-16 17:10:22.531563472 +0100 ++++ binutils-2.34.0/opcodes/m32c-ibld.c 2020-06-16 17:25:48.612258094 +0100 +@@ -1805,7 +1805,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_BIT32RNPREFIXED : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value); + value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2)))); + fields->f_dst32_rn_prefixed_QI = value; +@@ -1813,7 +1813,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_BIT32RNUNPREFIXED : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value); + value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2)))); + fields->f_dst32_rn_unprefixed_QI = value; +@@ -1824,7 +1824,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_BITBASE16_16_U16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; +@@ -1860,7 +1860,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 13, 3, 32, total_length, pc, & fields->f_bitno32_unprefixed); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_16_s16 = value; +@@ -1887,7 +1887,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 13, 3, 32, total_length, pc, & fields->f_bitno32_unprefixed); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; +@@ -1903,7 +1903,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 13, 3, 32, total_length, pc, & fields->f_bitno32_unprefixed); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; +@@ -1971,7 +1971,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_32_u16 = value; +@@ -1996,7 +1996,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_16_S16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_16_s16 = value; +@@ -2007,7 +2007,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_16_U16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; +@@ -2016,7 +2016,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_DSP_16_U20 : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; +@@ -2032,7 +2032,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_DSP_16_U24 : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; +@@ -2078,7 +2078,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_32_u16 = value; +@@ -2094,7 +2094,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_32_u16 = value; +@@ -2110,7 +2110,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_32_S16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_32_s16 = value; +@@ -2121,7 +2121,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_32_U16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_32_u16 = value; +@@ -2129,7 +2129,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_32_U20 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 24, 32, total_length, pc, & value); + value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680)))); + fields->f_dsp_32_u24 = value; +@@ -2137,7 +2137,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_32_U24 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 24, 32, total_length, pc, & value); + value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680)))); + fields->f_dsp_32_u24 = value; +@@ -2148,7 +2148,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_40_S16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_40_s16 = value; +@@ -2159,7 +2159,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_40_U16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_40_u16 = value; +@@ -2167,7 +2167,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_40_U20 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 20, 32, total_length, pc, & value); + value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (983040)))); + fields->f_dsp_40_u20 = value; +@@ -2175,7 +2175,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_40_U24 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 24, 32, total_length, pc, & value); + value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680)))); + fields->f_dsp_40_u24 = value; +@@ -2186,7 +2186,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_48_S16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_48_s16 = value; +@@ -2197,7 +2197,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_48_U16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_48_u16 = value; +@@ -2206,7 +2206,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_DSP_48_U20 : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_48_u16 = value; +@@ -2222,7 +2222,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_DSP_48_U24 : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_48_u16 = value; +@@ -2240,7 +2240,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_8_S24 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (16))) & (255))) | (((value) & (65280))))) | (((((value) & (255))) << (16))))) ^ (8388608))) - (8388608)); + fields->f_dsp_8_s24 = value; +@@ -2251,7 +2251,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_8_U16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_8_u16 = value; +@@ -2259,7 +2259,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DSP_8_U24 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 24, 32, total_length, pc, & value); + value = ((((((USI) (value) >> (16))) | (((value) & (65280))))) | (((((value) & (255))) << (16)))); + fields->f_dsp_8_u24 = value; +@@ -2343,7 +2343,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DST32RNPREFIXEDHI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value); + value = ((((value) + (2))) % (4)); + fields->f_dst32_rn_prefixed_HI = value; +@@ -2351,7 +2351,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DST32RNPREFIXEDQI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value); + value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2)))); + fields->f_dst32_rn_prefixed_QI = value; +@@ -2359,7 +2359,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DST32RNPREFIXEDSI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value); + value = ((value) - (2)); + fields->f_dst32_rn_prefixed_SI = value; +@@ -2367,7 +2367,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DST32RNUNPREFIXEDHI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value); + value = ((((value) + (2))) % (4)); + fields->f_dst32_rn_unprefixed_HI = value; +@@ -2375,7 +2375,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DST32RNUNPREFIXEDQI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value); + value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2)))); + fields->f_dst32_rn_unprefixed_QI = value; +@@ -2383,7 +2383,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_DST32RNUNPREFIXEDSI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value); + value = ((value) - (2)); + fields->f_dst32_rn_unprefixed_SI = value; +@@ -2402,7 +2402,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_IMM_16_HI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_16_s16 = value; +@@ -2414,14 +2414,14 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_IMM_16_SI : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_16_u16 = value; + } + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_32_u16 = value; +@@ -2454,7 +2454,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8); + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 24, 32, total_length, pc, & value); + value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680)))); + fields->f_dsp_32_u24 = value; +@@ -2467,7 +2467,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_IMM_32_HI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_32_s16 = value; +@@ -2486,7 +2486,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_IMM_40_HI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_40_s16 = value; +@@ -2498,7 +2498,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_IMM_40_SI : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 24, 32, total_length, pc, & value); + value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680)))); + fields->f_dsp_40_u24 = value; +@@ -2513,7 +2513,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_IMM_48_HI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_48_s16 = value; +@@ -2525,14 +2525,14 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + case M32C_OPERAND_IMM_48_SI : + { + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_48_u16 = value; + } + if (length <= 0) break; + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 64, 0, 16, 32, total_length, pc, & value); + value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))); + fields->f_dsp_64_u16 = value; +@@ -2567,7 +2567,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_IMM_8_HI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) & (255))) | (((((value) & (255))) << (8))))))); + fields->f_dsp_8_s16 = value; +@@ -2593,7 +2593,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_IMM1_S : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 2, 1, 32, total_length, pc, & value); + value = ((value) + (1)); + fields->f_imm1_S = value; +@@ -2612,7 +2612,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_16_8 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_lab_16_8 = value; +@@ -2620,7 +2620,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_24_8 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_lab_24_8 = value; +@@ -2628,7 +2628,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_32_8 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_lab_32_8 = value; +@@ -2636,7 +2636,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_40_8 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_lab_40_8 = value; +@@ -2644,7 +2644,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_5_3 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_lab_5_3 = value; +@@ -2652,7 +2652,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_8_16 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (8))) | (((((value) & (255))) << (8))))) ^ (32768))) - (32768))) + (((pc) + (1)))); + fields->f_lab_8_16 = value; +@@ -2660,7 +2660,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_8_24 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<> (16))) | (((value) & (65280))))) | (((((value) & (255))) << (16)))); + fields->f_lab_8_24 = value; +@@ -2668,7 +2668,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_LAB_8_8 : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0|(1<f_lab_8_8 = value; +@@ -2757,7 +2757,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_SRC32RNPREFIXEDHI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 18, 2, 32, total_length, pc, & value); + value = ((((value) + (2))) % (4)); + fields->f_src32_rn_prefixed_HI = value; +@@ -2765,7 +2765,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_SRC32RNPREFIXEDQI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 18, 2, 32, total_length, pc, & value); + value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2)))); + fields->f_src32_rn_prefixed_QI = value; +@@ -2773,7 +2773,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_SRC32RNPREFIXEDSI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 18, 2, 32, total_length, pc, & value); + value = ((value) - (2)); + fields->f_src32_rn_prefixed_SI = value; +@@ -2781,7 +2781,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_SRC32RNUNPREFIXEDHI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 2, 32, total_length, pc, & value); + value = ((((value) + (2))) % (4)); + fields->f_src32_rn_unprefixed_HI = value; +@@ -2789,7 +2789,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_SRC32RNUNPREFIXEDQI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 2, 32, total_length, pc, & value); + value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2)))); + fields->f_src32_rn_unprefixed_QI = value; +@@ -2797,7 +2797,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC + break; + case M32C_OPERAND_SRC32RNUNPREFIXEDSI : + { +- long value; ++ long value = 0; + length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 2, 32, total_length, pc, & value); + value = ((value) - (2)); + fields->f_src32_rn_unprefixed_SI = value; +--- binutils.orig/binutils/srconv.c 2020-06-16 17:10:22.251564474 +0100 ++++ binutils-2.34.0/binutils/srconv.c 2020-06-16 20:07:51.670025912 +0100 +@@ -492,6 +492,8 @@ wr_rl (struct coff_ofile *ptr ATTRIBUTE_ + rl.addr = r->offset; + rl.bitloc = 0; + rl.flen = 32; /* SH Specific. */ ++ rl.dunno = 0; ++ rl.symn = 0; + + /* What sort of reloc ? Look in the section to find out. */ + ref = r->symbol; +--- binutils.orig/libctf/ctf-create.c 2020-07-24 15:33:26.100996335 +0100 ++++ binutils-2.35/libctf/ctf-create.c 2020-07-24 15:33:29.042977475 +0100 +@@ -1257,6 +1257,8 @@ ctf_add_forward (ctf_file_t *fp, uint32_ + + if ((type = ctf_add_generic (fp, flag, name, kind, &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ ++ if (dtd == NULL) ++ return CTF_ERR; + + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_FORWARD, flag, 0); + dtd->dtd_data.ctt_type = kind; diff --git a/binutils-warnings.patch b/binutils-warnings.patch index d75d0c4..6f3d32d 100644 --- a/binutils-warnings.patch +++ b/binutils-warnings.patch @@ -11,19 +11,6 @@ index 6ecfab5d..f8698213 100644 } if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH)) -diff --git a/gold/target-reloc.h b/gold/target-reloc.h -index 071f211e..0f81dd13 100644 ---- a/gold/target-reloc.h -+++ b/gold/target-reloc.h -@@ -259,7 +259,7 @@ issue_discarded_error( - &is_ordinary); - if (orig_shndx != elfcpp::SHN_UNDEF) - { -- unsigned int key_symndx; -+ unsigned int key_symndx = 0; - Relobj* kept_obj = object->find_kept_section_object(orig_shndx, - &key_symndx); - if (key_symndx != 0) diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 3639bfbf..ed080a1a 100644 --- a/libiberty/cp-demangle.c diff --git a/cross-binutils.spec b/cross-binutils.spec index 9a93e98..c6aa6a0 100644 --- a/cross-binutils.spec +++ b/cross-binutils.spec @@ -62,10 +62,10 @@ # relocations against absolute symbols. %define default_generate_notes 0 -Summary: A GNU collection of cross-compilation binary utilities Name: %{cross}-binutils -Version: 2.34 -Release: 3%{?dist} +Version: 2.35 +Release: 1%{?dist} +Summary: A GNU collection of cross-compilation binary utilities License: GPLv3+ URL: https://sourceware.org/binutils @@ -149,13 +149,8 @@ Patch09: binutils-do-not-link-with-static-libstdc++.patch # Lifetime: Permanent. Patch10: binutils-attach-to-group.patch -# Purpose: Stop gold from complaining about relocs in the .gnu.build.attribute -# section that reference symbols in discarded sections. -# Lifetime: Fixed in 2.35 (maybe) -Patch11: binutils-gold-ignore-discarded-note-relocs.patch - # Purpose: Allow OS specific sections in section groups. -# Lifetime: Might be fixed in 2.35 (maybe) +# Lifetime: Fixed in 2.35 (maybe) Patch12: binutils-special-sections-in-groups.patch # Purpose: Fix linker testsuite failures. @@ -172,13 +167,27 @@ Patch14: binutils-gold-mismatched-section-flags.patch # Lifetime: Fixed in 2.35 (maybe) Patch15: binutils-CVE-2019-1010204.patch -# Purpose: Fix the LTO plugin so that it passes full symbol information -# to the linker. -# Lifetime: Fixed in 2.35 -Patch16: binutils-nm-lto-plugin.patch +# Purpose: Change the gold configuration script to only warn about +# unsupported targets. This allows the binutils to be built with +# BPF support enabled. +# Lifetime: Permanent. +Patch17: binutils-gold-warn-unsupported.patch +# Purpose: Fix compile time warning messages building s390 target with gcc-10. +# Lifetime: Should be fixed in 2.36. +Patch19: binutils-s390-build.patch + +# Purpose: Fix LTO problems running config mini-builds. +# Lifetime: Should be fixed in 2.36. Patch20: binutils-config.patch + +# Purpose: Fix compile time warning messages building with gcc-10. +# Lifetime: Should be fixed in 2.36. Patch21: binutils-warnings.patch + +# Purpose: Fix compile time warning messages building with gcc-10. (part 2). +# Lifetime: Should be fixed in 2.36. +Patch22: binutils-gcc-10-fixes.patch #---------------------------------------------------------------------------- BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel @@ -281,29 +290,7 @@ Cross-build binary image generation, manipulation and query tools. \ # ############################################################################### %prep - -%global srcdir binutils-%{version} -%setup -q -n %{srcdir} -c -cd %{srcdir} -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 -%patch04 -p1 -%patch05 -p1 -%patch06 -p1 -%patch07 -p1 -%patch08 -p1 -%patch09 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 - -%patch20 -p1 -%patch21 -p1 +%autosetup -p1 -n binutils-%{version} # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -784,6 +771,9 @@ cd - %do_files xtensa-linux-gnu %{build_xtensa} %changelog +* Sun Jul 26 2020 Peter Robinson - 2.35-1 +- Update to 2.35 + * Mon Jul 20 2020 Jeff Law - 2.34-3 - Fix configure tests compromised by LTO - Work around diagnostics exposed by LTO diff --git a/sources b/sources index ef80505..e0a77b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (binutils-2.34.tar.xz) = 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd +SHA512 (binutils-2.35.tar.xz) = 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786