This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] bfd: Fix left shift of negative value.
- From: Andreas Krebbel <krebbel at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 9 Nov 2015 16:14:02 -0000
- Subject: [binutils-gdb] bfd: Fix left shift of negative value.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=29f628db8835fd86b85ffb40d4a9ed5b1c28f1e6
commit 29f628db8835fd86b85ffb40d4a9ed5b1c28f1e6
Author: Dominik Vogt <vogt@linux.vnet.ibm.com>
Date: Mon Nov 9 17:12:56 2015 +0100
bfd: Fix left shift of negative value.
This patch fixes all occurences of left-shifting negative constants in C code
which is undefined by the C standard.
bfd/ChangeLog:
* elf64-ppc.c (ppc64_elf_size_stubs, ppc64_elf_build_stubs): Fix left
shift of negative value.
* libbfd.c (safe_read_leb128): Likewise.
* dwarf2.c (place_sections): Likewise.
* bfd-in.h (align_power): Likewise.
* bfd-in2.h (align_power): Likewise.
Diff:
---
bfd/ChangeLog | 9 +++++++++
bfd/bfd-in.h | 2 +-
bfd/bfd-in2.h | 2 +-
bfd/dwarf2.c | 4 ++--
bfd/elf64-ppc.c | 4 ++--
bfd/libbfd.c | 2 +-
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57ea3c1..60d13b9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2015-11-09 Dominik Vogt <vogt@linux.vnet.ibm.com>
+
+ * elf64-ppc.c (ppc64_elf_size_stubs, ppc64_elf_build_stubs): Fix left
+ shift of negative value.
+ * libbfd.c (safe_read_leb128): Likewise.
+ * dwarf2.c (place_sections): Likewise.
+ * bfd-in.h (align_power): Likewise.
+ * bfd-in2.h (align_power): Likewise.
+
2015-10-30 Nick Clifton <nickc@redhat.com>
* po/zh_CN.po: Updated (simplified) Chinese translation.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 9e40df5..1721ce7 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -272,7 +272,7 @@ alent;
/* Object and core file sections. */
#define align_power(addr, align) \
- (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+ (((addr) + ((bfd_vma) 1 << (align)) - 1) & (-((bfd_vma) 1 << (align))))
typedef struct bfd_section *sec_ptr;
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index e2e247d..900b45c 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -279,7 +279,7 @@ alent;
/* Object and core file sections. */
#define align_power(addr, align) \
- (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+ (((addr) + ((bfd_vma) 1 << (align)) - 1) & (-((bfd_vma) 1 << (align))))
typedef struct bfd_section *sec_ptr;
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index cbd4cf6..401ec43 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -3354,8 +3354,8 @@ place_sections (bfd *orig_bfd, struct dwarf2_debug *stash)
/* Align the new address to the current section
alignment. */
last_vma = ((last_vma
- + ~((bfd_vma) -1 << sect->alignment_power))
- & ((bfd_vma) -1 << sect->alignment_power));
+ + ~(-((bfd_vma) 1 << sect->alignment_power)))
+ & (-((bfd_vma) 1 << sect->alignment_power)));
sect->vma = last_vma;
last_vma += sz;
}
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index cda8e59..0a85ab8 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -12497,7 +12497,7 @@ ppc64_elf_size_stubs (struct bfd_link_info *info)
if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
stub_sec->size = ((stub_sec->size
+ (1 << htab->params->plt_stub_align) - 1)
- & (-1 << htab->params->plt_stub_align));
+ & -(1 << htab->params->plt_stub_align));
for (stub_sec = htab->params->stub_bfd->sections;
stub_sec != NULL;
@@ -13021,7 +13021,7 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
stub_sec->size = ((stub_sec->size
+ (1 << htab->params->plt_stub_align) - 1)
- & (-1 << htab->params->plt_stub_align));
+ & -(1 << htab->params->plt_stub_align));
for (stub_sec = htab->params->stub_bfd->sections;
stub_sec != NULL;
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 40afc2d..69582d5 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -1037,7 +1037,7 @@ safe_read_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
*length_return = num_read;
if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
- result |= (bfd_vma) -1 << shift;
+ result |= -((bfd_vma) 1 << shift);
return result;
}