Fix scanning for object symbols in binutils-2.25-kernel-ld-r.patch

Resolves: BZ #1149660
This commit is contained in:
Nick Clifton 2015-02-02 16:32:37 +00:00
parent 09dade7667
commit cb8d97c37e
3 changed files with 116 additions and 2481 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
diff -rup binutils-2.25.orig/bfd/bfd.c binutils-2.25/bfd/bfd.c
--- binutils-2.25.orig/bfd/bfd.c 2014-12-24 10:46:27.893435026 +0000
+++ binutils-2.25/bfd/bfd.c 2014-12-24 10:48:25.666096395 +0000
diff -rup binutils-2.25/bfd/bfd.c binutils-2.25.patched/bfd/bfd.c
--- binutils-2.25/bfd/bfd.c 2014-11-04 09:54:41.000000000 +0000
+++ binutils-2.25.patched/bfd/bfd.c 2015-02-02 16:10:13.853438622 +0000
@@ -44,6 +44,14 @@ CODE_FRAGMENT
. both_direction = 3
. };
@ -73,11 +73,9 @@ diff -rup binutils-2.25.orig/bfd/bfd.c binutils-2.25/bfd/bfd.c
+ }
+ return NULL;
+}
Only in binutils-2.25/bfd: bfd.c.orig
Only in binutils-2.25/bfd: bfd.c.rej
diff -rup binutils-2.25.orig/bfd/bfd-in2.h binutils-2.25/bfd/bfd-in2.h
--- binutils-2.25.orig/bfd/bfd-in2.h 2014-12-24 10:46:27.890435009 +0000
+++ binutils-2.25/bfd/bfd-in2.h 2014-12-24 10:54:21.498104097 +0000
diff -rup binutils-2.25/bfd/bfd-in2.h binutils-2.25.patched/bfd/bfd-in2.h
--- binutils-2.25/bfd/bfd-in2.h 2015-02-02 16:11:06.706681097 +0000
+++ binutils-2.25.patched/bfd/bfd-in2.h 2015-02-02 16:10:13.841438566 +0000
@@ -1078,6 +1078,9 @@ struct bfd_section *bfd_create_gnu_debug
bfd_boolean bfd_fill_in_gnu_debuglink_section
(bfd *abfd, struct bfd_section *sect, const char *filename);
@ -142,11 +140,9 @@ diff -rup binutils-2.25.orig/bfd/bfd-in2.h binutils-2.25/bfd/bfd-in2.h
/* Extracted from archive.c. */
symindex bfd_get_next_mapent
(bfd *abfd, symindex previous, carsym **sym);
Only in binutils-2.25/bfd: bfd-in2.h.orig
Only in binutils-2.25/bfd: bfd-in2.h.rej
diff -rup binutils-2.25.orig/bfd/elf.c binutils-2.25/bfd/elf.c
--- binutils-2.25.orig/bfd/elf.c 2014-12-24 10:46:27.884434975 +0000
+++ binutils-2.25/bfd/elf.c 2014-12-24 10:47:06.954654379 +0000
diff -rup binutils-2.25/bfd/elf.c binutils-2.25.patched/bfd/elf.c
--- binutils-2.25/bfd/elf.c 2015-02-02 16:11:06.700681069 +0000
+++ binutils-2.25.patched/bfd/elf.c 2015-02-02 16:10:13.833438530 +0000
@@ -2208,6 +2208,7 @@ static const struct bfd_elf_special_sect
{ STRING_COMMA_LEN (".gnu.linkonce.b"), -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE },
{ STRING_COMMA_LEN (".gnu.lto_"), -1, SHT_PROGBITS, SHF_EXCLUDE },
@ -155,9 +151,9 @@ diff -rup binutils-2.25.orig/bfd/elf.c binutils-2.25/bfd/elf.c
{ STRING_COMMA_LEN (".gnu.version"), 0, SHT_GNU_versym, 0 },
{ STRING_COMMA_LEN (".gnu.version_d"), 0, SHT_GNU_verdef, 0 },
{ STRING_COMMA_LEN (".gnu.version_r"), 0, SHT_GNU_verneed, 0 },
diff -rup binutils-2.25.orig/bfd/format.c binutils-2.25/bfd/format.c
--- binutils-2.25.orig/bfd/format.c 2014-12-24 10:46:27.897435048 +0000
+++ binutils-2.25/bfd/format.c 2014-12-24 10:47:06.961654419 +0000
diff -rup binutils-2.25/bfd/format.c binutils-2.25.patched/bfd/format.c
--- binutils-2.25/bfd/format.c 2014-10-14 08:32:02.000000000 +0100
+++ binutils-2.25.patched/bfd/format.c 2015-02-02 16:10:13.857438640 +0000
@@ -94,6 +94,33 @@ bfd_check_format (bfd *abfd, bfd_format
return bfd_check_format_matches (abfd, format, NULL);
}
@ -214,10 +210,9 @@ diff -rup binutils-2.25.orig/bfd/format.c binutils-2.25/bfd/format.c
/* File position has moved, BTW. */
return TRUE;
}
Only in binutils-2.25/bfd: format.c.orig
diff -rup binutils-2.25.orig/bfd/opncls.c binutils-2.25/bfd/opncls.c
--- binutils-2.25.orig/bfd/opncls.c 2014-12-24 10:46:27.903435082 +0000
+++ binutils-2.25/bfd/opncls.c 2014-12-24 10:47:06.962654424 +0000
diff -rup binutils-2.25/bfd/opncls.c binutils-2.25.patched/bfd/opncls.c
--- binutils-2.25/bfd/opncls.c 2015-02-02 16:11:06.707681101 +0000
+++ binutils-2.25.patched/bfd/opncls.c 2015-02-02 16:10:13.866438681 +0000
@@ -1711,3 +1711,69 @@ bfd_fill_in_gnu_debuglink_section (bfd *
return TRUE;
@ -288,10 +283,9 @@ diff -rup binutils-2.25.orig/bfd/opncls.c binutils-2.25/bfd/opncls.c
+ fclose (file);
+ return name;
+}
Only in binutils-2.25/bfd: opncls.c.orig
diff -rup binutils-2.25.orig/bfd/plugin.c binutils-2.25/bfd/plugin.c
--- binutils-2.25.orig/bfd/plugin.c 2014-12-24 10:46:27.898435054 +0000
+++ binutils-2.25/bfd/plugin.c 2014-12-24 10:47:06.963654430 +0000
diff -rup binutils-2.25/bfd/plugin.c binutils-2.25.patched/bfd/plugin.c
--- binutils-2.25/bfd/plugin.c 2014-11-04 09:54:41.000000000 +0000
+++ binutils-2.25.patched/bfd/plugin.c 2015-02-02 16:10:49.164600619 +0000
@@ -129,6 +129,139 @@ register_claim_file (ld_plugin_claim_fil
return LDPS_OK;
}
@ -432,17 +426,22 @@ diff -rup binutils-2.25.orig/bfd/plugin.c binutils-2.25/bfd/plugin.c
static enum ld_plugin_status
add_symbols (void * handle,
int nsyms,
@@ -141,7 +274,9 @@ add_symbols (void * handle,
@@ -140,11 +273,13 @@ add_symbols (void * handle,
plugin_data->nsyms = nsyms;
plugin_data->syms = syms;
+ abfd->tdata.plugin_data = plugin_data;
+
+ bfd_plugin_get_symbols_in_object_only (abfd);
- if (nsyms != 0)
+ bfd_plugin_get_symbols_in_object_only (abfd);
+
+ if ((nsyms + plugin_data->object_only_nsyms) != 0)
abfd->flags |= HAS_SYMS;
abfd->tdata.plugin_data = plugin_data;
- abfd->tdata.plugin_data = plugin_data;
return LDPS_OK;
}
@@ -390,7 +525,8 @@ static long
bfd_plugin_get_symtab_upper_bound (bfd *abfd)
{
@ -502,10 +501,9 @@ diff -rup binutils-2.25.orig/bfd/plugin.c binutils-2.25/bfd/plugin.c
return nsyms;
}
Only in binutils-2.25/bfd: plugin.c.orig
diff -rup binutils-2.25.orig/bfd/plugin.h binutils-2.25/bfd/plugin.h
--- binutils-2.25.orig/bfd/plugin.h 2014-12-24 10:46:27.894435031 +0000
+++ binutils-2.25/bfd/plugin.h 2014-12-24 10:47:06.964654436 +0000
diff -rup binutils-2.25/bfd/plugin.h binutils-2.25.patched/bfd/plugin.h
--- binutils-2.25/bfd/plugin.h 2014-10-14 08:32:02.000000000 +0100
+++ binutils-2.25.patched/bfd/plugin.h 2015-02-02 16:10:13.854438626 +0000
@@ -30,6 +30,8 @@ typedef struct plugin_data_struct
{
int nsyms;
@ -515,9 +513,9 @@ diff -rup binutils-2.25.orig/bfd/plugin.h binutils-2.25/bfd/plugin.h
}
plugin_data_struct;
diff -rup binutils-2.25.orig/bfd/section.c binutils-2.25/bfd/section.c
--- binutils-2.25.orig/bfd/section.c 2014-12-24 10:46:27.882434964 +0000
+++ binutils-2.25/bfd/section.c 2014-12-24 10:47:07.163655553 +0000
diff -rup binutils-2.25/bfd/section.c binutils-2.25.patched/bfd/section.c
--- binutils-2.25/bfd/section.c 2014-10-14 08:32:02.000000000 +0100
+++ binutils-2.25.patched/bfd/section.c 2015-02-02 16:10:13.829438511 +0000
@@ -595,6 +595,9 @@ CODE_FRAGMENT
. || ((SEC) == bfd_com_section_ptr) \
. || ((SEC) == bfd_ind_section_ptr))
@ -528,10 +526,9 @@ diff -rup binutils-2.25.orig/bfd/section.c binutils-2.25/bfd/section.c
.{* Macros to handle insertion and deletion of a bfd's sections. These
. only handle the list pointers, ie. do not adjust section_count,
. target_index etc. *}
Only in binutils-2.25/bfd: section.c.orig
diff -rup binutils-2.25.orig/binutils/objcopy.c binutils-2.25/binutils/objcopy.c
--- binutils-2.25.orig/binutils/objcopy.c 2014-12-24 10:46:27.917435160 +0000
+++ binutils-2.25/binutils/objcopy.c 2014-12-24 10:47:07.165655564 +0000
diff -rup binutils-2.25/binutils/objcopy.c binutils-2.25.patched/binutils/objcopy.c
--- binutils-2.25/binutils/objcopy.c 2014-12-23 08:47:10.000000000 +0000
+++ binutils-2.25.patched/binutils/objcopy.c 2015-02-02 16:10:13.883438759 +0000
@@ -1009,30 +1009,6 @@ is_specified_symbol (const char *name, h
return htab_find (htab, name) != NULL;
}
@ -581,10 +578,9 @@ diff -rup binutils-2.25.orig/binutils/objcopy.c binutils-2.25/binutils/objcopy.c
if (gsym != NULL)
{
Only in binutils-2.25/binutils: objcopy.c.orig
diff -rup binutils-2.25.orig/binutils/readelf.c binutils-2.25/binutils/readelf.c
--- binutils-2.25.orig/binutils/readelf.c 2014-12-24 10:46:27.916435155 +0000
+++ binutils-2.25/binutils/readelf.c 2014-12-24 10:47:07.170655592 +0000
diff -rup binutils-2.25/binutils/readelf.c binutils-2.25.patched/binutils/readelf.c
--- binutils-2.25/binutils/readelf.c 2014-12-23 08:47:10.000000000 +0000
+++ binutils-2.25.patched/binutils/readelf.c 2015-02-02 16:10:13.882438755 +0000
@@ -3624,6 +3624,7 @@ get_section_type_name (unsigned int sh_t
case 0x7ffffffd: return "AUXILIARY";
case 0x7fffffff: return "FILTER";
@ -593,10 +589,9 @@ diff -rup binutils-2.25.orig/binutils/readelf.c binutils-2.25/binutils/readelf.c
default:
if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
Only in binutils-2.25/binutils: readelf.c.orig
diff -rup binutils-2.25.orig/include/bfdlink.h binutils-2.25/include/bfdlink.h
--- binutils-2.25.orig/include/bfdlink.h 2014-12-24 10:46:27.704433964 +0000
+++ binutils-2.25/include/bfdlink.h 2014-12-24 10:47:07.170655592 +0000
diff -rup binutils-2.25/include/bfdlink.h binutils-2.25.patched/include/bfdlink.h
--- binutils-2.25/include/bfdlink.h 2014-12-23 08:47:10.000000000 +0000
+++ binutils-2.25.patched/include/bfdlink.h 2015-02-02 16:10:13.656437718 +0000
@@ -389,6 +389,12 @@ struct bfd_link_info
/* TRUE if ok to have multiple definition. */
unsigned int allow_multiple_definition: 1;
@ -610,10 +605,9 @@ diff -rup binutils-2.25.orig/include/bfdlink.h binutils-2.25/include/bfdlink.h
/* TRUE if ok to have version with no definition. */
unsigned int allow_undefined_version: 1;
Only in binutils-2.25/include: bfdlink.h.orig
diff -rup binutils-2.25.orig/include/elf/common.h binutils-2.25/include/elf/common.h
--- binutils-2.25.orig/include/elf/common.h 2014-12-24 10:46:27.698433930 +0000
+++ binutils-2.25/include/elf/common.h 2014-12-24 10:47:07.171655598 +0000
diff -rup binutils-2.25/include/elf/common.h binutils-2.25.patched/include/elf/common.h
--- binutils-2.25/include/elf/common.h 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/include/elf/common.h 2015-02-02 16:10:13.650437690 +0000
@@ -472,6 +472,7 @@
#define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes */
#define SHT_GNU_HASH 0x6ffffff6 /* GNU style symbol hash table */
@ -622,9 +616,9 @@ diff -rup binutils-2.25.orig/include/elf/common.h binutils-2.25/include/elf/comm
/* The next three section types are defined by Solaris, and are named
SHT_SUNW*. We use them in GNU code, so we also define SHT_GNU*
diff -rup binutils-2.25.orig/ld/emultempl/alphaelf.em binutils-2.25/ld/emultempl/alphaelf.em
--- binutils-2.25.orig/ld/emultempl/alphaelf.em 2014-12-24 10:46:27.717434037 +0000
+++ binutils-2.25/ld/emultempl/alphaelf.em 2014-12-24 10:47:07.172655604 +0000
diff -rup binutils-2.25/ld/emultempl/alphaelf.em binutils-2.25.patched/ld/emultempl/alphaelf.em
--- binutils-2.25/ld/emultempl/alphaelf.em 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/emultempl/alphaelf.em 2015-02-02 16:10:13.667437768 +0000
@@ -100,7 +100,7 @@ alpha_finish (void)
if (limit_32bit)
elf_elfheader (link_info.output_bfd)->e_flags |= EF_ALPHA_32BIT;
@ -634,9 +628,9 @@ diff -rup binutils-2.25.orig/ld/emultempl/alphaelf.em binutils-2.25/ld/emultempl
}
EOF
diff -rup binutils-2.25.orig/ld/emultempl/armelf.em binutils-2.25/ld/emultempl/armelf.em
--- binutils-2.25.orig/ld/emultempl/armelf.em 2014-12-24 10:46:27.718434043 +0000
+++ binutils-2.25/ld/emultempl/armelf.em 2014-12-24 10:47:07.172655604 +0000
diff -rup binutils-2.25/ld/emultempl/armelf.em binutils-2.25.patched/ld/emultempl/armelf.em
--- binutils-2.25/ld/emultempl/armelf.em 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/emultempl/armelf.em 2015-02-02 16:10:13.668437773 +0000
@@ -370,7 +370,7 @@ gld${EMULATION_NAME}_after_allocation (v
}
@ -661,10 +655,9 @@ diff -rup binutils-2.25.orig/ld/emultempl/armelf.em binutils-2.25/ld/emultempl/a
# Call the extra arm-elf function
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
+LDEMUL_FINISH=arm_finish
Only in binutils-2.25/ld/emultempl: armelf.em.orig
diff -rup binutils-2.25.orig/ld/emultempl/elf32.em binutils-2.25/ld/emultempl/elf32.em
--- binutils-2.25.orig/ld/emultempl/elf32.em 2014-12-24 10:46:27.717434037 +0000
+++ binutils-2.25/ld/emultempl/elf32.em 2014-12-24 10:47:07.174655615 +0000
diff -rup binutils-2.25/ld/emultempl/elf32.em binutils-2.25.patched/ld/emultempl/elf32.em
--- binutils-2.25/ld/emultempl/elf32.em 2015-02-02 16:11:06.703681083 +0000
+++ binutils-2.25.patched/ld/emultempl/elf32.em 2015-02-02 16:10:13.667437768 +0000
@@ -65,6 +65,7 @@ static void gld${EMULATION_NAME}_before_
static void gld${EMULATION_NAME}_after_allocation (void);
static lang_output_section_statement_type *gld${EMULATION_NAME}_place_orphan
@ -768,10 +761,9 @@ diff -rup binutils-2.25.orig/ld/emultempl/elf32.em binutils-2.25/ld/emultempl/el
${LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS-NULL},
${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive},
${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan},
Only in binutils-2.25/ld/emultempl: elf32.em.orig
diff -rup binutils-2.25.orig/ld/emultempl/ppc64elf.em binutils-2.25/ld/emultempl/ppc64elf.em
--- binutils-2.25.orig/ld/emultempl/ppc64elf.em 2014-12-24 10:46:27.717434037 +0000
+++ binutils-2.25/ld/emultempl/ppc64elf.em 2014-12-24 10:47:07.174655615 +0000
diff -rup binutils-2.25/ld/emultempl/ppc64elf.em binutils-2.25.patched/ld/emultempl/ppc64elf.em
--- binutils-2.25/ld/emultempl/ppc64elf.em 2014-12-23 08:47:10.000000000 +0000
+++ binutils-2.25.patched/ld/emultempl/ppc64elf.em 2015-02-02 16:10:13.667437768 +0000
@@ -522,7 +522,7 @@ gld${EMULATION_NAME}_after_allocation (v
/* Final emulation specific call. */
@ -798,10 +790,9 @@ diff -rup binutils-2.25.orig/ld/emultempl/ppc64elf.em binutils-2.25/ld/emultempl
+LDEMUL_FINISH=ppc_finish
LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=ppc_create_output_section_statements
LDEMUL_NEW_VERS_PATTERN=gld${EMULATION_NAME}_new_vers_pattern
Only in binutils-2.25/ld/emultempl: ppc64elf.em.orig
diff -rup binutils-2.25.orig/ld/emultempl/spuelf.em binutils-2.25/ld/emultempl/spuelf.em
--- binutils-2.25.orig/ld/emultempl/spuelf.em 2014-12-24 10:46:27.716434032 +0000
+++ binutils-2.25/ld/emultempl/spuelf.em 2014-12-24 10:47:07.175655620 +0000
diff -rup binutils-2.25/ld/emultempl/spuelf.em binutils-2.25.patched/ld/emultempl/spuelf.em
--- binutils-2.25/ld/emultempl/spuelf.em 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/emultempl/spuelf.em 2015-02-02 16:10:13.667437768 +0000
@@ -416,7 +416,7 @@ spu_elf_relink (void)
/* Final emulation specific call. */
@ -827,9 +818,9 @@ diff -rup binutils-2.25.orig/ld/emultempl/spuelf.em binutils-2.25/ld/emultempl/s
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
+LDEMUL_FINISH=spu_finish
LDEMUL_CHOOSE_TARGET=gld${EMULATION_NAME}_choose_target
diff -rup binutils-2.25.orig/ld/ldfile.c binutils-2.25/ld/ldfile.c
--- binutils-2.25.orig/ld/ldfile.c 2014-12-24 10:46:27.708433987 +0000
+++ binutils-2.25/ld/ldfile.c 2014-12-24 10:57:43.021241971 +0000
diff -rup binutils-2.25/ld/ldfile.c binutils-2.25.patched/ld/ldfile.c
--- binutils-2.25/ld/ldfile.c 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/ldfile.c 2015-02-02 16:10:13.659437732 +0000
@@ -317,7 +317,9 @@ success:
plugin_maybe_claim (&file, entry);
}
@ -840,10 +831,9 @@ diff -rup binutils-2.25.orig/ld/ldfile.c binutils-2.25/ld/ldfile.c
/* It opened OK, the format checked out, and the plugins have had
their chance to claim it, so this is success. */
Only in binutils-2.25/ld: ldfile.c.orig
diff -rup binutils-2.25.orig/ld/ldlang.c binutils-2.25/ld/ldlang.c
--- binutils-2.25.orig/ld/ldlang.c 2014-12-24 10:46:27.712434009 +0000
+++ binutils-2.25/ld/ldlang.c 2014-12-24 11:00:13.328090658 +0000
diff -rup binutils-2.25/ld/ldlang.c binutils-2.25.patched/ld/ldlang.c
--- binutils-2.25/ld/ldlang.c 2014-10-15 08:43:36.000000000 +0100
+++ binutils-2.25.patched/ld/ldlang.c 2015-02-02 16:10:13.663437750 +0000
@@ -36,6 +36,7 @@
#include "ldctor.h"
#include "ldfile.h"
@ -1932,11 +1922,9 @@ diff -rup binutils-2.25.orig/ld/ldlang.c binutils-2.25/ld/ldlang.c
+
+
+
Only in binutils-2.25/ld: ldlang.c.orig
Only in binutils-2.25/ld: ldlang.c.rej
diff -rup binutils-2.25.orig/ld/ldlang.h binutils-2.25/ld/ldlang.h
--- binutils-2.25.orig/ld/ldlang.h 2014-12-24 10:46:27.718434043 +0000
+++ binutils-2.25/ld/ldlang.h 2014-12-24 10:47:07.181655654 +0000
diff -rup binutils-2.25/ld/ldlang.h binutils-2.25.patched/ld/ldlang.h
--- binutils-2.25/ld/ldlang.h 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/ldlang.h 2015-02-02 16:10:13.668437773 +0000
@@ -523,7 +523,7 @@ extern struct asneeded_minfo **asneeded_
extern void (*output_bfd_hash_table_free_fn) (struct bfd_link_hash_table *);
@ -1992,10 +1980,9 @@ diff -rup binutils-2.25.orig/ld/ldlang.h binutils-2.25/ld/ldlang.h
+extern void cmdline_remove_object_only_files (void);
+
#endif
Only in binutils-2.25/ld: ldlang.h.orig
diff -rup binutils-2.25.orig/ld/ldlex.h binutils-2.25/ld/ldlex.h
--- binutils-2.25.orig/ld/ldlex.h 2014-12-24 10:46:27.720434054 +0000
+++ binutils-2.25/ld/ldlex.h 2014-12-24 10:47:07.181655654 +0000
diff -rup binutils-2.25/ld/ldlex.h binutils-2.25.patched/ld/ldlex.h
--- binutils-2.25/ld/ldlex.h 2014-11-04 09:54:41.000000000 +0000
+++ binutils-2.25.patched/ld/ldlex.h 2015-02-02 16:10:13.670437782 +0000
@@ -133,6 +133,7 @@ enum option_values
#ifdef ENABLE_PLUGINS
OPTION_PLUGIN,
@ -2004,9 +1991,9 @@ diff -rup binutils-2.25.orig/ld/ldlex.h binutils-2.25/ld/ldlex.h
#endif /* ENABLE_PLUGINS */
OPTION_DEFAULT_SCRIPT,
OPTION_PRINT_OUTPUT_FORMAT,
diff -rup binutils-2.25.orig/ld/ldmain.c binutils-2.25/ld/ldmain.c
--- binutils-2.25.orig/ld/ldmain.c 2014-12-24 10:46:27.715434026 +0000
+++ binutils-2.25/ld/ldmain.c 2014-12-24 11:02:55.443006018 +0000
diff -rup binutils-2.25/ld/ldmain.c binutils-2.25.patched/ld/ldmain.c
--- binutils-2.25/ld/ldmain.c 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/ldmain.c 2015-02-02 16:10:13.665437759 +0000
@@ -220,6 +220,9 @@ main (int argc, char **argv)
xatexit (ld_cleanup);
@ -2140,11 +2127,9 @@ diff -rup binutils-2.25.orig/ld/ldmain.c binutils-2.25/ld/ldmain.c
+ lex_string = NULL;
+ }
+}
Only in binutils-2.25/ld: ldmain.c.orig
Only in binutils-2.25/ld: ldmain.c.rej
diff -rup binutils-2.25.orig/ld/ldmain.h binutils-2.25/ld/ldmain.h
--- binutils-2.25.orig/ld/ldmain.h 2014-12-24 10:46:27.715434026 +0000
+++ binutils-2.25/ld/ldmain.h 2014-12-24 10:47:07.183655665 +0000
diff -rup binutils-2.25/ld/ldmain.h binutils-2.25.patched/ld/ldmain.h
--- binutils-2.25/ld/ldmain.h 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/ldmain.h 2015-02-02 16:10:13.665437759 +0000
@@ -59,4 +59,6 @@ extern void add_wrap (const char *);
extern void add_ignoresym (struct bfd_link_info *, const char *);
extern void add_keepsyms_file (const char *);
@ -2152,10 +2137,9 @@ diff -rup binutils-2.25.orig/ld/ldmain.h binutils-2.25/ld/ldmain.h
+extern void ld_parse_linker_script (void);
+
#endif
Only in binutils-2.25/ld: ldmain.h.orig
diff -rup binutils-2.25.orig/ld/lexsup.c binutils-2.25/ld/lexsup.c
--- binutils-2.25.orig/ld/lexsup.c 2014-12-24 10:46:27.870434896 +0000
+++ binutils-2.25/ld/lexsup.c 2014-12-24 10:47:07.184655671 +0000
diff -rup binutils-2.25/ld/lexsup.c binutils-2.25.patched/ld/lexsup.c
--- binutils-2.25/ld/lexsup.c 2014-11-04 09:54:41.000000000 +0000
+++ binutils-2.25.patched/ld/lexsup.c 2015-02-02 16:10:13.809438420 +0000
@@ -166,6 +166,9 @@ static const struct ld_option ld_options
'\0', N_("PLUGIN"), N_("Load named plugin"), ONE_DASH },
{ {"plugin-opt", required_argument, NULL, OPTION_PLUGIN_OPT},
@ -2176,10 +2160,9 @@ diff -rup binutils-2.25.orig/ld/lexsup.c binutils-2.25/ld/lexsup.c
#endif /* ENABLE_PLUGINS */
case 'q':
link_info.emitrelocations = TRUE;
Only in binutils-2.25/ld: lexsup.c.orig
diff -rup binutils-2.25.orig/ld/plugin.c binutils-2.25/ld/plugin.c
--- binutils-2.25.orig/ld/plugin.c 2014-12-24 10:46:27.719434048 +0000
+++ binutils-2.25/ld/plugin.c 2014-12-24 10:47:07.185655677 +0000
diff -rup binutils-2.25/ld/plugin.c binutils-2.25.patched/ld/plugin.c
--- binutils-2.25/ld/plugin.c 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/plugin.c 2015-02-02 16:10:13.669437777 +0000
@@ -39,6 +39,9 @@
/* Report plugin symbols. */
bfd_boolean report_plugin_symbols;
@ -2244,10 +2227,9 @@ diff -rup binutils-2.25.orig/ld/plugin.c binutils-2.25/ld/plugin.c
dlclose (curplug->dlhandle);
}
curplug = curplug->next;
Only in binutils-2.25/ld: plugin.c.orig
diff -rup binutils-2.25.orig/ld/plugin.h binutils-2.25/ld/plugin.h
--- binutils-2.25.orig/ld/plugin.h 2014-12-24 10:46:27.718434043 +0000
+++ binutils-2.25/ld/plugin.h 2014-12-24 10:47:07.185655677 +0000
diff -rup binutils-2.25/ld/plugin.h binutils-2.25.patched/ld/plugin.h
--- binutils-2.25/ld/plugin.h 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/plugin.h 2015-02-02 16:10:13.668437773 +0000
@@ -24,6 +24,9 @@
/* Report plugin symbols. */
extern bfd_boolean report_plugin_symbols;
@ -2258,9 +2240,9 @@ diff -rup binutils-2.25.orig/ld/plugin.h binutils-2.25/ld/plugin.h
/* Set at all symbols read time, to avoid recursively offering the plugin
its own newly-added input files and libs to claim. */
extern bfd_boolean no_more_claiming;
diff -rup binutils-2.25.orig/ld/scripttempl/armbpabi.sc binutils-2.25/ld/scripttempl/armbpabi.sc
--- binutils-2.25.orig/ld/scripttempl/armbpabi.sc 2014-12-24 10:46:27.709433992 +0000
+++ binutils-2.25/ld/scripttempl/armbpabi.sc 2014-12-24 10:47:07.400656884 +0000
diff -rup binutils-2.25/ld/scripttempl/armbpabi.sc binutils-2.25.patched/ld/scripttempl/armbpabi.sc
--- binutils-2.25/ld/scripttempl/armbpabi.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/armbpabi.sc 2015-02-02 16:10:13.660437736 +0000
@@ -36,7 +36,7 @@ INTERP=".interp 0 : { *(.interp) }
PLT=".plt ${RELOCATING-0} : { *(.plt) }"
RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
@ -2270,10 +2252,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/armbpabi.sc binutils-2.25/ld/scriptt
if test -z "${NO_SMALL_DATA}"; then
SBSS=".sbss ${RELOCATING-0} :
{
Only in binutils-2.25/ld/scripttempl: armbpabi.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/elf32sh-symbian.sc binutils-2.25/ld/scripttempl/elf32sh-symbian.sc
--- binutils-2.25.orig/ld/scripttempl/elf32sh-symbian.sc 2014-12-24 10:46:27.709433992 +0000
+++ binutils-2.25/ld/scripttempl/elf32sh-symbian.sc 2014-12-24 10:47:07.401656890 +0000
diff -rup binutils-2.25/ld/scripttempl/elf32sh-symbian.sc binutils-2.25.patched/ld/scripttempl/elf32sh-symbian.sc
--- binutils-2.25/ld/scripttempl/elf32sh-symbian.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/elf32sh-symbian.sc 2015-02-02 16:10:13.660437736 +0000
@@ -88,7 +88,7 @@ fi
PLT=".plt : { *(.plt) } :dynamic :dyn"
DYNAMIC=".dynamic : { *(.dynamic) } :dynamic :dyn"
@ -2283,10 +2264,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/elf32sh-symbian.sc binutils-2.25/ld/
test -z "$GOT" && GOT=".got ${RELOCATING-0} : { *(.got.plt) *(.got) } :dynamic :dyn"
INIT_ARRAY=".init_array ${RELOCATING-0} :
{
Only in binutils-2.25/ld/scripttempl: elf32sh-symbian.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/elf64hppa.sc binutils-2.25/ld/scripttempl/elf64hppa.sc
--- binutils-2.25.orig/ld/scripttempl/elf64hppa.sc 2014-12-24 10:46:27.711434003 +0000
+++ binutils-2.25/ld/scripttempl/elf64hppa.sc 2014-12-24 10:47:07.401656890 +0000
diff -rup binutils-2.25/ld/scripttempl/elf64hppa.sc binutils-2.25.patched/ld/scripttempl/elf64hppa.sc
--- binutils-2.25/ld/scripttempl/elf64hppa.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/elf64hppa.sc 2015-02-02 16:10:13.662437745 +0000
@@ -132,7 +132,7 @@ fi
DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }"
RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
@ -2296,10 +2276,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/elf64hppa.sc binutils-2.25/ld/script
if test -z "${NO_SMALL_DATA}"; then
SBSS=".sbss ${RELOCATING-0} :
{
Only in binutils-2.25/ld/scripttempl: elf64hppa.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/elf.sc binutils-2.25/ld/scripttempl/elf.sc
--- binutils-2.25.orig/ld/scripttempl/elf.sc 2014-12-24 10:46:27.709433992 +0000
+++ binutils-2.25/ld/scripttempl/elf.sc 2014-12-24 10:47:07.402656895 +0000
diff -rup binutils-2.25/ld/scripttempl/elf.sc binutils-2.25.patched/ld/scripttempl/elf.sc
--- binutils-2.25/ld/scripttempl/elf.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/elf.sc 2015-02-02 16:10:13.660437736 +0000
@@ -165,7 +165,7 @@ RELA_IPLT=".rela.iplt ${RELOCATING-0}
DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }"
RODATA=".${RODATA_NAME} ${RELOCATING-0} : { *(.${RODATA_NAME}${RELOCATING+ .${RODATA_NAME}.* .gnu.linkonce.r.*}) }"
@ -2309,10 +2288,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/elf.sc binutils-2.25/ld/scripttempl/
if test -z "${NO_SMALL_DATA}"; then
SBSS=".${SBSS_NAME} ${RELOCATING-0} :
{
Only in binutils-2.25/ld/scripttempl: elf.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/elfxtensa.sc binutils-2.25/ld/scripttempl/elfxtensa.sc
--- binutils-2.25.orig/ld/scripttempl/elfxtensa.sc 2014-12-24 10:46:27.710433998 +0000
+++ binutils-2.25/ld/scripttempl/elfxtensa.sc 2014-12-24 10:47:07.402656895 +0000
diff -rup binutils-2.25/ld/scripttempl/elfxtensa.sc binutils-2.25.patched/ld/scripttempl/elfxtensa.sc
--- binutils-2.25/ld/scripttempl/elfxtensa.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/elfxtensa.sc 2015-02-02 16:10:13.661437741 +0000
@@ -145,7 +145,7 @@ fi
DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }"
RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
@ -2322,10 +2300,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/elfxtensa.sc binutils-2.25/ld/script
INIT_LIT=".init.literal 0 : { *(.init.literal) }"
INIT=".init 0 : { *(.init) }"
FINI_LIT=".fini.literal 0 : { *(.fini.literal) }"
Only in binutils-2.25/ld/scripttempl: elfxtensa.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/mep.sc binutils-2.25/ld/scripttempl/mep.sc
--- binutils-2.25.orig/ld/scripttempl/mep.sc 2014-12-24 10:46:27.711434003 +0000
+++ binutils-2.25/ld/scripttempl/mep.sc 2014-12-24 10:47:07.403656901 +0000
diff -rup binutils-2.25/ld/scripttempl/mep.sc binutils-2.25.patched/ld/scripttempl/mep.sc
--- binutils-2.25/ld/scripttempl/mep.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/mep.sc 2015-02-02 16:10:13.662437745 +0000
@@ -119,7 +119,7 @@ fi
DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }"
RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
@ -2335,10 +2312,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/mep.sc binutils-2.25/ld/scripttempl/
if test -z "${NO_SMALL_DATA}"; then
SBSS=".sbss ${RELOCATING-0} :
{
Only in binutils-2.25/ld/scripttempl: mep.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/pep.sc binutils-2.25/ld/scripttempl/pep.sc
--- binutils-2.25.orig/ld/scripttempl/pep.sc 2014-12-24 10:46:27.709433992 +0000
+++ binutils-2.25/ld/scripttempl/pep.sc 2014-12-24 10:47:07.403656901 +0000
diff -rup binutils-2.25/ld/scripttempl/pep.sc binutils-2.25.patched/ld/scripttempl/pep.sc
--- binutils-2.25/ld/scripttempl/pep.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/pep.sc 2015-02-02 16:10:13.660437736 +0000
@@ -170,6 +170,7 @@ SECTIONS
*(.drectve)
${RELOCATING+ *(.note.GNU-stack)}
@ -2347,10 +2323,9 @@ diff -rup binutils-2.25.orig/ld/scripttempl/pep.sc binutils-2.25/ld/scripttempl/
}
.idata ${RELOCATING+BLOCK(__section_alignment__)} :
Only in binutils-2.25/ld/scripttempl: pep.sc.orig
diff -rup binutils-2.25.orig/ld/scripttempl/pe.sc binutils-2.25/ld/scripttempl/pe.sc
--- binutils-2.25.orig/ld/scripttempl/pe.sc 2014-12-24 10:46:27.711434003 +0000
+++ binutils-2.25/ld/scripttempl/pe.sc 2014-12-24 10:47:07.404656906 +0000
diff -rup binutils-2.25/ld/scripttempl/pe.sc binutils-2.25.patched/ld/scripttempl/pe.sc
--- binutils-2.25/ld/scripttempl/pe.sc 2014-10-14 08:32:04.000000000 +0100
+++ binutils-2.25.patched/ld/scripttempl/pe.sc 2015-02-02 16:10:13.662437745 +0000
@@ -165,6 +165,7 @@ SECTIONS
*(.drectve)
${RELOCATING+ *(.note.GNU-stack)}
@ -2359,4 +2334,3 @@ diff -rup binutils-2.25.orig/ld/scripttempl/pe.sc binutils-2.25/ld/scripttempl/p
}
.idata ${RELOCATING+BLOCK(__section_alignment__)} :
Only in binutils-2.25/ld/scripttempl: pe.sc.orig

View File

@ -19,7 +19,7 @@
Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.25
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv3+
Group: Development/Tools
URL: http://sources.redhat.com/binutils
@ -486,6 +486,10 @@ exit 0
%endif # %{isnative}
%changelog
* Mon Feb 02 2015 Nick Clifton <nickc@redhat.com> - 2.25-5
- Fix scanning for object symbols in binutils-2.25-kernel-ld-r.patch
- Resolves: BZ #1149660
* Tue Jan 20 2015 Nick Clifton <nickc@redhat.com> - 2.25-4
- Import the fix for PR ld/17827 from FSF mainline.
- Resolves: BZ #1182511