This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_29-branch] x86: Return -1 if bfd_canonicalize_dynamic_reloc returns 0
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 22 Sep 2017 21:34:07 -0000
- Subject: [binutils-gdb/binutils-2_29-branch] x86: Return -1 if bfd_canonicalize_dynamic_reloc returns 0
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e70c19e3a4c26e9c1ebf0c9170d105039b56d7cf
commit e70c19e3a4c26e9c1ebf0c9170d105039b56d7cf
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Sep 22 07:25:16 2017 -0700
x86: Return -1 if bfd_canonicalize_dynamic_reloc returns 0
Stop if bfd_canonicalize_dynamic_reloc returns 0.
PR binutils/22163
* elf32-i386.c (elf_i386_get_synthetic_symtab): Also return -1
if bfd_canonicalize_dynamic_reloc returns 0.
* elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Likewise.
(cherry picked from commit b69e9267d15a09ce3f3d4599eae2952dfc6df502)
Diff:
---
bfd/ChangeLog | 7 +++++++
bfd/elf32-i386.c | 2 +-
bfd/elf64-x86-64.c | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 42d1e51..31e2a7f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-22 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR binutils/22163
+ * elf32-i386.c (elf_i386_get_synthetic_symtab): Also return -1
+ if bfd_canonicalize_dynamic_reloc returns 0.
+ * elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Likewise.
+
2017-09-21 Nick Clifton <nickc@redhat.com>
* development.sh (development): Revert previous delta.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 5c1c3ff..9dc2d25 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -6342,7 +6342,7 @@ elf_i386_get_synthetic_symtab (bfd *abfd,
dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, dynrelbuf,
dynsyms);
- if (dynrelcount < 0)
+ if (dynrelcount <= 0)
return -1;
/* Sort the relocs by address. */
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 80dd791..558db98 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -6717,7 +6717,7 @@ elf_x86_64_get_synthetic_symtab (bfd *abfd,
dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, dynrelbuf,
dynsyms);
- if (dynrelcount < 0)
+ if (dynrelcount <= 0)
return -1;
/* Sort the relocs by address. */