drop the ChangeLog changes from the patch so it applies, and apply it

This commit is contained in:
Adam Williamson 2012-02-08 15:50:44 -08:00
parent 4660e1baa3
commit 65d3230d02
2 changed files with 2 additions and 16 deletions

View File

@ -6,24 +6,9 @@ Subject: [PATCH] * elflink.c (_bfd_elf_gc_mark_rsec): Mark weakdef syms too.
the correct h->u.weakdef.
---
bfd/ChangeLog | 6 ++++++
bfd/elflink.c | 26 +++++++++++++++-----------
2 files changed, 21 insertions(+), 11 deletions(-)
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6d56dd4..4b896f2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-08 Alan Modra <amodra@gmail.com>
+
+ * elflink.c (_bfd_elf_gc_mark_rsec): Mark weakdef syms too.
+ (_bfd_elf_fix_symbol_flags): When a weakdef is def_regular, clear
+ the correct h->u.weakdef.
+
2012-02-07 Alan Modra <amodra@gmail.com>
* elf.c (elf_find_function): Don't use internal_elf_sym.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 1d1ca0b..7f9ec60 100644
--- a/bfd/elflink.c

View File

@ -134,6 +134,7 @@ using libelf instead of BFD.
%patch05 -p0 -b .set-long-long~
%patch06 -p0 -b .copy-osabi~
%patch07 -p0 -b .sec-merge-emit~
%patch08 -p1 -b .weakdef~
# We cannot run autotools as there is an exact requirement of autoconf-2.59.