aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-05-02 12:16:26 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-05-02 12:16:26 -0700
commit2ecf0cc317d065cfeb960c61688897351521bce0 (patch)
treeb474e3f90bf61ac814ead85223420bf982007768 /binutils
parentd17f7b365cf3896b3129b9077d55b3154fc43131 (diff)
downloadgdb-2ecf0cc317d065cfeb960c61688897351521bce0.zip
gdb-2ecf0cc317d065cfeb960c61688897351521bce0.tar.gz
gdb-2ecf0cc317d065cfeb960c61688897351521bce0.tar.bz2
Cast relcount to unsigned long when comparing with sec->reloc_count
The type of relcount is long and the type of sec->reloc_count is unsigned int. On 32-bit hosts, GCC issues an error: objcopy.c:2144:20: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] if (relcount > sec->reloc_count) Cast relcount to unsigned long to silence GCC. * objcopy.c (merge_gnu_build_notes): Cast relcount to unsigned long when comparing with sec->reloc_count.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/objcopy.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d13dbb6..b3a539a 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * objcopy.c (merge_gnu_build_notes): Cast relcount to unsigned
+ long when comparing with sec->reloc_count.
+
2017-05-02 Nick Clifton <nickc@redhat.com>
* objcopy.c (merge_gnu_build_notes): Disable merge if there are
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 36952ec..ccb5e12 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -2141,7 +2141,7 @@ merge_gnu_build_notes (bfd * abfd, asection * sec, bfd_size_type size, bfd_byte
represent a single external reloc. Unfortunately the current BFD
API does not handle deleting relocs in such situations very well
and so it is unsafe to proceed. */
- if (relcount > sec->reloc_count)
+ if ((unsigned long) relcount > sec->reloc_count)
goto done;
/* Eliminate the duplicates. */