[review] Do not static assert symbol size on Windows
Tom Tromey (Code Review)
gerrit@gnutoolchain-gerrit.osci.io
Mon Nov 11 14:53:00 GMT 2019
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/611
......................................................................
Do not static assert symbol size on Windows
commit 3573abe1d added static asserts to ensure that symbol sizes
don't vary. However, the Windows ABI requires a different layout than
the ABI commonly in use on Unix systems, and so these asserts fail.
This patch simply disables these asserts on Windows.
gdb/ChangeLog
2019-11-11 Tom Tromey <tromey@adacore.com>
* psympriv.h (partial_symbol): Don't static assert on Windows.
* symtab.h (general_symbol_info, symbol): Don't static assert on
Windows.
Change-Id: I51940fb2240c474838b48494b5072081701789bb
---
M gdb/ChangeLog
M gdb/psympriv.h
M gdb/symtab.h
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd280ec..c95cb76 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-11 Tom Tromey <tromey@adacore.com>
+
+ * psympriv.h (partial_symbol): Don't static assert on Windows.
+ * symtab.h (general_symbol_info, symbol): Don't static assert on
+ Windows.
+
2019-11-10 Andrew Burgess <andrew.burgess@embecosm.com>
* python/py-symbol.c (gdbpy_lookup_static_symbols): New
diff --git a/gdb/psympriv.h b/gdb/psympriv.h
index c81261a..80f2a1a 100644
--- a/gdb/psympriv.h
+++ b/gdb/psympriv.h
@@ -82,11 +82,15 @@
ENUM_BITFIELD(address_class) aclass : SYMBOL_ACLASS_BITS;
};
+/* The Windows ABI requires this structure to be packed
+ differently. */
+#ifndef _WIN32
/* This struct is size-critical (see comment at the to of symtab.h), so this
assert makes sure the size doesn't change accidentally. Be careful when
purposely increasing the size. */
gdb_static_assert ((sizeof (void *) == 8 && sizeof (partial_symbol) == 40)
|| (sizeof (void *) == 4 && sizeof (partial_symbol) == 24));
+#endif
/* A convenience enum to give names to some constants used when
searching psymtabs. This is internal to psymtab and should not be
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 111a0f9..3aa4c45 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -446,12 +446,16 @@
short section;
};
+/* The Windows ABI requires this structure to be packed
+ differently. */
+#ifndef _WIN32
/* This struct is size-critical (see comment at the top), so this assert
makes sure the size doesn't change accidentally. Be careful when
purposely increasing the size. */
gdb_static_assert ((sizeof (void *) == 8 && sizeof (general_symbol_info) == 32)
|| (sizeof (void *) == 4
&& sizeof (general_symbol_info) == 20));
+#endif
extern void symbol_set_demangled_name (struct general_symbol_info *,
const char *,
@@ -1194,11 +1198,15 @@
struct symbol *hash_next;
};
+/* The Windows ABI requires this structure to be packed
+ differently. */
+#ifndef _WIN32
/* This struct is size-critical (see comment at the top), so this assert
makes sure the size doesn't change accidentally. Be careful when
purposely increasing the size. */
gdb_static_assert ((sizeof (void *) == 8 && sizeof (symbol) == 72)
|| (sizeof (void *) == 4 && sizeof (symbol) == 40));
+#endif
/* Several lookup functions return both a symbol and the block in which the
symbol is found. This structure is used in these cases. */
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I51940fb2240c474838b48494b5072081701789bb
Gerrit-Change-Number: 611
Gerrit-PatchSet: 1
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newchange
More information about the Gdb-patches
mailing list