aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2020-03-12 13:32:15 -0600
committerTom Tromey <tromey@adacore.com>2020-03-12 13:32:15 -0600
commit64f251023bcbd068861d4cb83b4e925083e0ea35 (patch)
tree2cf97ec5aee1f920ba66ddcfc5f9ce1cd98e3c27
parent3f512721a829ce7b2d38236917309a32f42faa99 (diff)
downloadbinutils-64f251023bcbd068861d4cb83b4e925083e0ea35.zip
binutils-64f251023bcbd068861d4cb83b4e925083e0ea35.tar.gz
binutils-64f251023bcbd068861d4cb83b4e925083e0ea35.tar.bz2
Fix CORE_ADDR size assertion in symfile-mem.c
symfile-mem.c has some assertions about the size of various types, to ensure that gdb and BFD don't get out of sync in a way that would cause bugs. Once CORE_ADDR is always 64-bit, one of these assertions can fail for a 32-bit BFD build. However, the real requirement here is just that CORE_ADDR is wider -- because this code promotes a bfd_vma to a CORE_ADDR. This patch corrects the assert. gdb/ChangeLog 2020-03-12 Tom Tromey <tom@tromey.com> * symfile-mem.c: Update CORE_ADDR size assert.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/symfile-mem.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2553837..3416b41 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-12 Tom Tromey <tom@tromey.com>
+
+ * symfile-mem.c: Update CORE_ADDR size assert.
+
2020-03-12 Simon Marchi <simon.marchi@efficios.com>
* selftest.m4: Move to gdbsupport/.
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index a62d0d0..e2d2e43 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -57,7 +57,7 @@
/* Verify parameters of target_read_memory_bfd and target_read_memory are
compatible. */
-gdb_static_assert (sizeof (CORE_ADDR) == sizeof (bfd_vma));
+gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (bfd_vma));
gdb_static_assert (sizeof (gdb_byte) == sizeof (bfd_byte));
gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type));