From d8ce39864ae23c62a1a25266315e963377c19d9e Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 7 Jul 2020 10:56:06 +0100 Subject: [PATCH] Switch to using %autosetup --- ...s-alignment-of-decompressed-sections.patch | 447 --------- binutils-nm-lto-plugin.patch | 946 ------------------ binutils.spec | 26 +- 3 files changed, 5 insertions(+), 1414 deletions(-) delete mode 100644 binutils-alignment-of-decompressed-sections.patch delete mode 100644 binutils-nm-lto-plugin.patch 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-nm-lto-plugin.patch b/binutils-nm-lto-plugin.patch deleted file mode 100644 index 8809174..0000000 --- a/binutils-nm-lto-plugin.patch +++ /dev/null @@ -1,946 +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 ---- binutils.orig/bfd/plugin.c 2020-04-28 10:49:15.297127841 +0100 -+++ binutils-2.34/bfd/plugin.c 2020-04-28 13:30:08.722175980 +0100 -@@ -601,17 +601,13 @@ try_load_plugin (const char *pname, - int i; - ld_plugin_onload onload; - enum ld_plugin_status status; -+ int result = 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; -- } -+ memset (current_plugin, 0, -+ offsetof (struct plugin_list_entry, next)); - - if (plugin_list_iter) - pname = plugin_list_iter->plugin_name; -@@ -627,14 +623,16 @@ try_load_plugin (const char *pname, - { - size_t length_plugin_name = strlen (pname) + 1; - char *plugin_name = bfd_malloc (length_plugin_name); -+ - if (plugin_name == NULL) -- return 0; -+ goto short_circuit; - plugin_list_iter = bfd_malloc (sizeof *plugin_list_iter); - if (plugin_list_iter == NULL) - { - free (plugin_name); -- return 0; -+ goto short_circuit; - } -+ - /* Make a copy of PNAME since PNAME from load_plugin () will be - freed. */ - memcpy (plugin_name, pname, length_plugin_name); -@@ -646,11 +644,11 @@ try_load_plugin (const char *pname, - - plugin_list_iter->handle = plugin_handle; - if (build_list_p) -- return 0; -+ goto short_circuit; - - onload = dlsym (plugin_handle, "onload"); - if (!onload) -- return 0; -+ goto short_circuit; - - i = 0; - tv[i].tv_tag = LDPT_MESSAGE; -@@ -709,22 +707,26 @@ try_load_plugin (const char *pname, - status = (*onload)(tv); - - if (status != LDPS_OK) -- return 0; -+ goto short_circuit; - - if (current_plugin->lto_wrapper - && setup_lto_wrapper_env (current_plugin)) -- return 0; -+ goto short_circuit; - - abfd->plugin_format = bfd_plugin_no; - - if (!current_plugin->claim_file) -- return 0; -+ goto short_circuit; - - if (!try_claim (abfd)) -- return 0; -+ goto short_circuit; - - abfd->plugin_format = bfd_plugin_yes; -- return 1; -+ result = 1; -+ -+ short_circuit: -+ dlclose (plugin_handle); -+ return result; - } - - /* There may be plugin libraries in lib/bfd-plugins. */ diff --git a/binutils.spec b/binutils.spec index db51ac0..97b0f87 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.34.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -371,26 +371,7 @@ Conflicts: gcc-c++ < 4.0.0 #---------------------------------------------------------------------------- %prep -%setup -q -n binutils-%{version} -%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 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 +%autosetup -p1 -n binutils-%{version} # We cannot run autotools as there is an exact requirement of autoconf-2.59. # FIXME - this is no longer true. Maybe try reinstating autotool use ? @@ -809,6 +790,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Tue Jul 07 2020 Jeff Law - 2.34-8 +- Switch to using %%autosetup. + * Tue Jun 16 2020 Nick Clifton - 2.34-7 - Add BPF support to the s390x target. (#1825193)