rpms/binutils/F-11 binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch, 1.1, 1.2 binutils.spec, 1.163, 1.164
Nicholas Clifton
nickc at fedoraproject.org
Tue Feb 9 15:43:20 UTC 2010
Author: nickc
Update of /cvs/pkgs/rpms/binutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8313
Modified Files:
binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch
binutils.spec
Log Message:
Add missing frag to BZ 562249 patch.
binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch:
bfd/ChangeLog | 27 +++++++++++
bfd/elf32-ppc.c | 128 ++++++++++++++++++++++++++++++++----------------------
bfd/elf64-ppc.c | 8 ---
include/elf/ppc.h | 7 +-
4 files changed, 108 insertions(+), 62 deletions(-)
Index: binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-11/binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch 9 Feb 2010 09:10:03 -0000 1.1
+++ binutils-2.19.51.0.14-ppc-hidden-plt-relocs.patch 9 Feb 2010 15:43:19 -0000 1.2
@@ -282,20 +282,6 @@ diff -rup ../binutils-2.19.51.0.14.origi
{
unsigned long t0;
unsigned long t1;
-diff -rup ../binutils-2.19.51.0.14.original/bfd/elf64-ppc.c bfd/elf64-ppc.c
---- ../binutils-2.19.51.0.14.original/bfd/elf64-ppc.c 2010-02-08 15:39:17.000000000 +0000
-+++ bfd/elf64-ppc.c 2010-02-08 16:02:47.000000000 +0000
-@@ -5640,9 +5640,7 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, stru
- for (ent = *ifunc; ent != NULL; ent = ent->next)
- if (ent->addend == rel->r_addend)
- break;
-- if (ent == NULL)
-- abort ();
-- if (ent->plt.refcount > 0)
-+ if (ent != NULL && ent->plt.refcount > 0)
- ent->plt.refcount -= 1;
- continue;
- }
diff -rup ../binutils-2.19.51.0.14.original/include/elf/ppc.h include/elf/ppc.h
--- ../binutils-2.19.51.0.14.original/include/elf/ppc.h 2010-02-08 15:39:06.000000000 +0000
+++ include/elf/ppc.h 2010-02-08 16:47:05.000000000 +0000
@@ -313,3 +299,27 @@ diff -rup ../binutils-2.19.51.0.14.origi
#endif
/* Relocs added to support TLS. */
+--- ../binutils-2.19.51.0.14.original/bfd/elf64-ppc.c 2010-02-08 15:39:17.000000000 +0000
++++ bfd/elf64-ppc.c 2010-02-09 15:36:43.000000000 +0000
+@@ -5640,9 +5640,7 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, stru
+ for (ent = *ifunc; ent != NULL; ent = ent->next)
+ if (ent->addend == rel->r_addend)
+ break;
+- if (ent == NULL)
+- abort ();
+- if (ent->plt.refcount > 0)
++ if (ent != NULL && ent->plt.refcount > 0)
+ ent->plt.refcount -= 1;
+ continue;
+ }
+@@ -5721,9 +5719,7 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, stru
+ for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+ if (ent->addend == rel->r_addend)
+ break;
+- if (ent == NULL)
+- abort ();
+- if (ent->plt.refcount > 0)
++ if (ent != NULL && ent->plt.refcount > 0)
+ ent->plt.refcount -= 1;
+ }
+ break;
Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-11/binutils.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- binutils.spec 9 Feb 2010 09:10:03 -0000 1.163
+++ binutils.spec 9 Feb 2010 15:43:19 -0000 1.164
@@ -17,7 +17,7 @@
Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.19.51.0.14
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
Group: Development/Tools
URL: http://sources.redhat.com/binutils
@@ -345,6 +345,9 @@ fi
%endif # %{isnative}
%changelog
+* Tue Feb 9 2010 Nick Clifton <nickc at redhat.com> 2.19.51.0.14-3
+- Add missing frag to BZ 562249 patch.
+
* Tue Feb 9 2010 Nick Clifton <nickc at redhat.com> 2.19.51.0.14-2
- Fix PPC relaxation relocations. (BZ 562249, PR ld/11088)
More information about the scm-commits
mailing list