From patchwork Mon Nov 11 14:53:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35793 Received: (qmail 115523 invoked by alias); 11 Nov 2019 14:53:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 115510 invoked by uid 89); 11 Nov 2019 14:53:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN autolearn=ham version=3.3.1 spammy=packed, increasing X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Nov 2019 14:53:48 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 4E84A2032B; Mon, 11 Nov 2019 09:53:47 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 1CE78201E8 for ; Mon, 11 Nov 2019 09:53:46 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id EDB5A20AF6 for ; Mon, 11 Nov 2019 09:53:45 -0500 (EST) X-Gerrit-PatchSet: 1 Date: Mon, 11 Nov 2019 09:53:45 -0500 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] Do not static assert symbol size on Windows X-Gerrit-Change-Id: I51940fb2240c474838b48494b5072081701789bb X-Gerrit-Change-Number: 611 X-Gerrit-ChangeURL: X-Gerrit-Commit: aa9898559c2dcb22fd1c4a746e729350f79bd624 References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-76-gf8b6da0ab5 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 * 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 + + * 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 * 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. */