From 3eb4862ad3862ec011c1a867216d25d20d6e97b3 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 27 Jul 2020 15:21:06 +0100 Subject: [PATCH] Remove unneeded patches --- binutils-bad-plugin-err-message.patch | 12 -- ...ls-gold-ignore-discarded-note-relocs.patch | 10 -- ...tils-readelf-compression-header-size.patch | 127 ------------------ 3 files changed, 149 deletions(-) delete mode 100644 binutils-bad-plugin-err-message.patch delete mode 100644 binutils-gold-ignore-discarded-note-relocs.patch delete mode 100644 binutils-readelf-compression-header-size.patch diff --git a/binutils-bad-plugin-err-message.patch b/binutils-bad-plugin-err-message.patch deleted file mode 100644 index 79cac9e..0000000 --- a/binutils-bad-plugin-err-message.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- binutils.orig/bfd/plugin.c 2020-05-26 12:48:41.604021632 +0100 -+++ binutils-2.34.0/bfd/plugin.c 2020-05-26 12:50:02.553762744 +0100 -@@ -273,7 +273,8 @@ try_load_plugin (const char *pname, - plugin_handle = dlopen (pname, RTLD_NOW); - if (!plugin_handle) - { -- _bfd_error_handler ("%s\n", dlerror ()); -+ _bfd_error_handler ("Failed to load plugin '%s', reason: %s\n", -+ pname, dlerror ()); - return 0; - } - 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-readelf-compression-header-size.patch b/binutils-readelf-compression-header-size.patch deleted file mode 100644 index cd93dce..0000000 --- a/binutils-readelf-compression-header-size.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/binutils/readelf.c b/binutils/readelf.c -index 6b5bebe743..6246b16428 100644 ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -6714,15 +6714,18 @@ process_section_headers (Filedata * filedata) - { - Elf_Internal_Chdr chdr; - -- (void) get_compression_header (&chdr, buf, sizeof (buf)); -- -- if (chdr.ch_type == ELFCOMPRESS_ZLIB) -- printf (" ZLIB, "); -+ if (get_compression_header (&chdr, buf, sizeof (buf)) == 0) -+ printf (_(" []\n")); - else -- printf (_(" [: 0x%x], "), -- chdr.ch_type); -- print_vma (chdr.ch_size, LONG_HEX); -- printf (", %lu\n", (unsigned long) chdr.ch_addralign); -+ { -+ if (chdr.ch_type == ELFCOMPRESS_ZLIB) -+ printf (" ZLIB, "); -+ else -+ printf (_(" [: 0x%x], "), -+ chdr.ch_type); -+ print_vma (chdr.ch_size, LONG_HEX); -+ printf (", %lu\n", (unsigned long) chdr.ch_addralign); -+ } - } - } - } -@@ -13658,11 +13661,16 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) - = get_compression_header (& chdr, (unsigned char *) start, - num_bytes); - -+ if (compression_header_size == 0) -+ /* An error message will have already been generated -+ by get_compression_header. */ -+ goto error_out; -+ - if (chdr.ch_type != ELFCOMPRESS_ZLIB) - { - warn (_("section '%s' has unsupported compress type: %d\n"), - printable_section_name (filedata, section), chdr.ch_type); -- return FALSE; -+ goto error_out; - } - uncompressed_size = chdr.ch_size; - start += compression_header_size; -@@ -13694,7 +13702,7 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) - { - error (_("Unable to decompress section %s\n"), - printable_section_name (filedata, section)); -- return FALSE; -+ goto error_out; - } - } - else -@@ -13764,6 +13772,10 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) - - putchar ('\n'); - return TRUE; -+ -+ error_out: -+ free (real_start); -+ return FALSE; - } - - static bfd_boolean -@@ -13776,7 +13788,7 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, - bfd_size_type section_size; - bfd_vma addr; - unsigned char * data; -- unsigned char * real_start; -+ unsigned char * real_start = NULL; - unsigned char * start; - - real_start = start = (unsigned char *) get_section_contents (section, filedata); -@@ -13799,11 +13811,16 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, - unsigned int compression_header_size - = get_compression_header (& chdr, start, section_size); - -+ if (compression_header_size == 0) -+ /* An error message will have already been generated -+ by get_compression_header. */ -+ goto error_out; -+ - if (chdr.ch_type != ELFCOMPRESS_ZLIB) - { - warn (_("section '%s' has unsupported compress type: %d\n"), - printable_section_name (filedata, section), chdr.ch_type); -- return FALSE; -+ goto error_out; - } - uncompressed_size = chdr.ch_size; - start += compression_header_size; -@@ -13838,7 +13855,7 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, - error (_("Unable to decompress section %s\n"), - printable_section_name (filedata, section)); - /* FIXME: Print the section anyway ? */ -- return FALSE; -+ goto error_out; - } - } - else -@@ -13918,6 +13935,10 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, - - putchar ('\n'); - return TRUE; -+ -+ error_out: -+ free (real_start); -+ return FALSE; - } - - static ctf_sect_t * -@@ -14128,6 +14149,10 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, - } - - compression_header_size = get_compression_header (&chdr, start, size); -+ if (compression_header_size == 0) -+ /* An error message will have already been generated -+ by get_compression_header. */ -+ return FALSE; - - if (chdr.ch_type != ELFCOMPRESS_ZLIB) - {