From patchwork Mon Dec 4 21:25:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24718 Received: (qmail 109122 invoked by alias); 4 Dec 2017 21:26:33 -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 108824 invoked by uid 89); 4 Dec 2017 21:26:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, SPF_PASS autolearn=ham version=3.3.2 spammy=intelligent, restating, HX-AuditID:sk:c1b4fb3 X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 04 Dec 2017 21:26:30 +0000 Received: from ESESSHC017.ericsson.se (Unknown_Domain [153.88.183.69]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id A4.AB.10723.28DB52A5; Mon, 4 Dec 2017 22:26:26 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.69) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 4 Dec 2017 22:25:25 +0100 Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AM3PR07MB307.eurprd07.prod.outlook.com (2a01:111:e400:881b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.2; Mon, 4 Dec 2017 21:25:23 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Replace gdb_static_assert with static_assert Date: Mon, 4 Dec 2017 16:25:10 -0500 Message-ID: <1512422710-26693-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: CY4PR19CA0031.namprd19.prod.outlook.com (2603:10b6:903:103::17) To AM3PR07MB307.eurprd07.prod.outlook.com (2a01:111:e400:881b::15) X-MS-Office365-Filtering-Correlation-Id: c9c410f6-ff93-474a-217a-08d53b5d87ca X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603286); SRVR:AM3PR07MB307; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 3:ixn3Z6bQihkCcsZE8lywPoQaOulNPlrxS3GiS0vG/3SSA+ceMF1+XnXSyDgFGp/csIPlgEIwmJoQc/g3p5jEBaHJfszjkWSukJXchC2jnms4WVUgQ7HAC6BiPG5wvjbYPXp2+bN35L6kyNxHDDVxroOTDwIvcqN0acKyq8FYxLBj9MmqHTsV+SleUf/eXRAG0yG++mGo9i1TL5ba0maHg8lbIuuKXIFwoNHiOs2ZCDLu46yNYlm7pAQYMmrQ2ybu; 25:9OpY4B3UJvnP7N0UrFs7KTKVR2y9Iqdr6zPAgCXRl//t/e7bS6mfk+rkKB5iWTG5OZ9hWPgS2ABzhkQuZWbUjOGGcEANjnepbYRcMMkx+s73XAzcoH5e84HbF25XulsXCKe1Egsc7mVODsIZ6rxJXBRZ1wYgrJAb96I7hLhVtjGdjCMAunxzcGmEQQuoqn0jtaWBHLzoGhrmF5h/2TGC5utM0eQyKyalW5wM38PfXIAnO169tZULPEmUq2Dqdxjm/N2jFRlopVu6bukbcNUc8eq3WOV8FDXkkLCdkvG6/jMZ74/M0dRgFp6CJZkwQ53AiWKell6IS9HvN5kGW1RV6g==; 31:eO2w5eMdO0+kateYvusrxifqJh6VqVgNer/j3v/rM0HF4I1R/ZjnFJp4epdeaYg9DIQ3P9vjlw9VjawjqzMBqkmmy7IxgjZLC1HE0F0/Kt8BUi0wMZQqoJY9iFx+Jt/RBEq78ondpFtbLgPZsgCqy13lD42Mihpg82Cxzw/79/uzMs6eGn1Hf5RcNQiG6qp/5RIbw8H5oE88vJwqncYmvXNGUgbiahyumniw/f/L4R8= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PR07MB307: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 20:f+/y7nQqFvq+uH6YHXPL4lTZYr2GCKLLbUKdTQ7o5Nn148/yYrwizFbIiJ0rUkqtYTWnOzmfG+lhJBcOmIqSiIY13PnR7uliQ0hoh5xJjRC646L26pkWcnEBjDQSEmNt9zmd57mFJLD9GfCQto7VF28UINAaDB0kLp95+ur6SGsOQo78EaJ3ef71stOrHnds8KGm2bbZAm570K+iZV9DxeeUFZ14ptkR/GWihDn4PwXWhbKREbNIGgpdjiKRsmGUkDJF+v4Er8cIZPvGe5bjrmja2DspaDTgO336wpjKnKcev9U498A1645HqVEWJu+91bFa09DG0hEAifTkdY8MReTavtHT9lbyFHuyVwnqRrF3nt1cOEQzPMavzAtYsM/4wW/2kbq4UXTL81QTX5pQz/wcCUE9g7CmNO5X5iLncPg5X75+OFvv+1wCS4bmWfV2H6lXl/iYtmN2r4+PsJJmKU4d5jKCRxl17fkTkXY+CXUpas+p4P1QJYp20LrnyIcw; 4:cioDZezJfQVXnVuqONtMXYi52Cj9WuQU4bJcB2lrbrQYnbgdfHHfIdjERZwO763vK6qxSbulVE++lbxe0ZAyUN95LfOC+3dA3CQ87ezvJeQE+AjsBufkepv19rV0MVUDHR549ngU6QjNR0N4zoNebIKVSbz4Y9V9UzL33q4MX9ntm9PDLOyT6dEuktsgkhXcDq8A3Ko3VZMsfqfHLdwMIMKMkHvC9MM00AMoXYiCNwR+XfbuviELlDzPjW4zlALgpsYXrPudUXhWIpDvDFQw+WPlC21nR+pZLGV+CuBXn7QAIG3oZr9RmA20N3k0FG/R X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231022)(6041248)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123555025)(6072148)(201708071742011); SRVR:AM3PR07MB307; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM3PR07MB307; X-Forefront-PRVS: 051158ECBB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(366004)(189002)(199003)(54534003)(36756003)(8936002)(106356001)(97736004)(105586002)(2906002)(25786009)(66066001)(47776003)(48376002)(5660300001)(575784001)(2361001)(52116002)(86362001)(50466002)(478600001)(8676002)(81166006)(101416001)(3846002)(6512007)(68736007)(6116002)(4326008)(2351001)(51416003)(316002)(33646002)(81156014)(16586007)(6486002)(6506006)(7736002)(107886003)(6666003)(6916009)(305945005)(16526018)(189998001)(53936002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR07MB307; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR07MB307; 23:f45Fncr1UAIV29MUnRgo1cxe5E3aJVXHAW/UrdfUaI?= =?us-ascii?Q?kMFBdRwRuhbeawaSduG1NUKNMISHGUWV2pL9N9S2gy3dfIcsOIi4Fdmriqmi?= =?us-ascii?Q?jf8pz2rXCDmKAu2lXu/7/UbAzMviqEt6dVuKqkdjQha2B1PQMeLQp/EgSFPo?= =?us-ascii?Q?dHWik7ovbPwL4bcevvYTGLctlmILaYvF6NbI9Bq07LTQpTGEiiU91xgh7Ucp?= =?us-ascii?Q?S6a9w43a0aWeGXmKBl9LsQaOJZM0Ysxq29ydE5xI120S7yB0aWE5VUK6x7qe?= =?us-ascii?Q?dbDThQmKbKGc576p8z9BoVyvVLDvhj+XxTD5cXD4tECF68tiks2BReej50mn?= =?us-ascii?Q?+Ak84QqkAZ3w6XZF+1OFa3RlpIlNsQ95H8/0JS6z9QWhsUTGExELudw6vNPS?= =?us-ascii?Q?/Ojs24O+Zv2K+a4hLPFkdRsDHo0okwthX4A+oNbzGvV+n6kxyC9EhUhxFuH3?= =?us-ascii?Q?CIgU2cMrS0ZxJXsQxV8WDAMuDMaF2ik+Dpj028Oi+7gXIIMOYfzAOfNxIwUw?= =?us-ascii?Q?tjs/C1irb6nsjeTHlS6/GGftFJNPP3g5wPq3JjJS1Sk+znUaRTP8Z0DmBQ+m?= =?us-ascii?Q?NJki3hjx1uFCElxh+OS/o4LhmJs+O8X2SXYB511/EmyC2HOSI/8NFrCGDHia?= =?us-ascii?Q?25BRkSYjCwow9mktwOeWWo5yF/5zAslTr6FP/3mVQNwMymXhwWnfjWXq9gIO?= =?us-ascii?Q?Coq1Gx9UkA8Av8gzezbkH0O95wHbUDRiM90rcIS7XdsKQrF6hVwzsiiGXGR9?= =?us-ascii?Q?QbPfEs8JW3DT1lvf+IMSIcoIpR3YWfBOcJPefvFZcpspq0V5QDlwrsYAgh5V?= =?us-ascii?Q?5QtA+astIU1UQH5CLj+RI3A2TFiAnOXcJhw0J9ro2/tegega9DS1Y/StyWfj?= =?us-ascii?Q?9ObwnJYOlEVH+MqqNym0qKSs+lhqZK0EZN2oi0ZB4Fa91l4VNG1UCTOHaHxy?= =?us-ascii?Q?ysOqcapBCFZscKDLM2viFozJgsTVHV7QMz4QbKySrsS88PnLJkDu7NfLiXN8?= =?us-ascii?Q?LjNxtiVogR7YD9FqUZT2JzSmJFVPAgwH2oSZXyHz/ftFvsEcrhedwp8gSaCo?= =?us-ascii?Q?uqrkdEBTGk5AVbEhhmptaADWhedIUjQrgKD5nVlBQpT+0056wJe0gMr6qpl5?= =?us-ascii?Q?53/vj9CqZ+Li3m+EsJwVa5ccxkJSBcnbIj4z+YjdsYiHW2EiIAUw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 6:TtW79vV/duGDUxAIUM5MOojfP1B/+axLrDDgisKYR3MDhETDwyolbevbwel9yFdxUovYOrwfL/YxQRCtZHPGT6i/JzBv62krNb5W4eyS5LI1JBmtT6+sC+Bw9Peb6fe6L+LJUypgHi1a1TFrNwAMFYXm9H3xUJVyQT7qafUh933b/GS6UBKQtCuO2Fxxgb6WgvwtYwmY8czQTikxvaX1lsfzj8/OuNFc2i2780siB0LCBpPw8WMdWGAT28vDbj4sX0X4ns7nAQaJXmJBAtodk7P1r1PKZooXyHt+3+axh1JLF+dm2texTAuSKbTU9FYyXJH4JzHH34ebtnDCzHOVRCi900CpJ/7NV5KO7TdxQu4=; 5:G5fb9TWMAwBijvkZKYWt2BR5gDWeynLtLBHIWTRE7nzRrLTsIpnNoWSlv0yOKqX4/pPdMKsBB+xLiP3swHeOp5MaRlShkMn86k/iwjp2hFoTfBxrzkkmXrSDxevMGCKfAxpeCOUZkY4EM/F+OYZdJcksVMylW+ZZLROh5O78N0w=; 24:SBGnZV3m9O27zdCXXYagYYltLTlpvk4zzsaLmubrUmjjEIRujXTbDDYh7HaqN02wTLNrM9we3ppmJL2kBtS7umrOAbVmBEVhz8RkhQJzJYI=; 7:jPtpvGFzJJH4AsDZIQhfhU+/dcRBgS1DrjOQvPzG/c26ofVU3R22zL2hy3OVCA4Jb/ussXvFL3r3sZzkZzU9h/lvcNZoNmnfsoWBwXokasnX3VwikZxnDQwptQnU6ZthGihsa4kSoBw0tYLHrrlg8sa+Adw67pixG2VxZfS2i1egfNsF6FFYS4O73OWP42gCz8tf2ENy4NXod0jNfxClfJM5iwwwT/II1Yua7dAmb8LWTbnG+S3/7N85Tp7PtTg0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2017 21:25:23.1774 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9c410f6-ff93-474a-217a-08d53b5d87ca X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR07MB307 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes Since we use C++11, we can replace gdb_static_assert with static_assert, which is built in the language and gives clearer error messages. The static_assert in C++11 takes a mandatory "message" argument (as opposed to C++17). I tried to put something intelligent there, but usually it ended up useless/obvious/redundant, just restating the assertion using words. So I decided to leave them empty. gdb/ChangeLog: * common/gdb_assert.h: Remove. * aarch64-linux-nat.c: Replace gdb_static_assert with static_assert. * arc-tdep.c: Likewise. * defs.h: Likewise. * dwarf2read.c: Likewise. * gdb_bfd.c: Likewise. * i386-fbsd-tdep.c: Likewise. * linux-tdep.c: Likewise. * mi/mi-common.c: Likewise. * nat/amd64-linux-siginfo.c: Likewise. * nios2-tdep.c: Likewise. * remote-notif.c: Likewise. * symfile-mem.c: Likewise. * symtab.c: Likewise. * symtab.h: Likewise. * value.c: Likewise. gdb/gdbserver/ChangeLog: * server.h: Replace gdb_static_assert with static_assert. --- gdb/aarch64-linux-nat.c | 8 ++++---- gdb/arc-tdep.c | 2 +- gdb/common/gdb_assert.h | 6 ------ gdb/defs.h | 2 +- gdb/dwarf2read.c | 4 ++-- gdb/gdb_bfd.c | 2 +- gdb/gdbserver/server.h | 2 +- gdb/i386-fbsd-tdep.c | 32 ++++++++++++++++---------------- gdb/linux-tdep.c | 2 +- gdb/mi/mi-common.c | 4 ++-- gdb/nat/amd64-linux-siginfo.c | 10 +++++----- gdb/nios2-tdep.c | 2 +- gdb/remote-notif.c | 2 +- gdb/symfile-mem.c | 6 +++--- gdb/symtab.c | 2 +- gdb/symtab.h | 6 +++--- gdb/value.c | 2 +- 17 files changed, 44 insertions(+), 50 deletions(-) diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 9e317c0..c6ce4c4 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -161,7 +161,7 @@ fetch_gregs_from_thread (struct regcache *regcache) /* Make sure REGS can hold all registers contents on both aarch64 and arm. */ - gdb_static_assert (sizeof (regs) >= 18 * 4); + static_assert (sizeof (regs) >= 18 * 4, ""); tid = ptid_get_lwp (regcache_get_ptid (regcache)); @@ -199,7 +199,7 @@ store_gregs_to_thread (const struct regcache *regcache) /* Make sure REGS can hold all registers contents on both aarch64 and arm. */ - gdb_static_assert (sizeof (regs) >= 18 * 4); + static_assert (sizeof (regs) >= 18 * 4, ""); tid = ptid_get_lwp (regcache_get_ptid (regcache)); iovec.iov_base = ®s; @@ -242,7 +242,7 @@ fetch_fpregs_from_thread (struct regcache *regcache) /* Make sure REGS can hold all VFP registers contents on both aarch64 and arm. */ - gdb_static_assert (sizeof regs >= VFP_REGS_SIZE); + static_assert (sizeof regs >= VFP_REGS_SIZE, ""); tid = ptid_get_lwp (regcache_get_ptid (regcache)); @@ -290,7 +290,7 @@ store_fpregs_to_thread (const struct regcache *regcache) /* Make sure REGS can hold all VFP registers contents on both aarch64 and arm. */ - gdb_static_assert (sizeof regs >= VFP_REGS_SIZE); + static_assert (sizeof regs >= VFP_REGS_SIZE, ""); tid = ptid_get_lwp (regcache_get_ptid (regcache)); iovec.iov_base = ®s; diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index 09572ac..bd01e97 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -190,7 +190,7 @@ arc_insn_get_operand_value_signed (const struct arc_instruction &insn, /* Convert unsigned raw value to signed one. This assumes 2's complement arithmetic, but so is the LONG_MIN value from generic defs.h and that assumption is true for ARC. */ - gdb_static_assert (sizeof (insn.limm_value) == sizeof (int)); + static_assert (sizeof (insn.limm_value) == sizeof (int), ""); return (((LONGEST) insn.limm_value) ^ INT_MIN) - INT_MIN; case ARC_OPERAND_KIND_SHIMM: /* Sign conversion has been done by binutils. */ diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h index 5de9d3f..e8a9d14 100644 --- a/gdb/common/gdb_assert.h +++ b/gdb/common/gdb_assert.h @@ -19,12 +19,6 @@ #ifndef GDB_ASSERT_H #define GDB_ASSERT_H -/* A static assertion. This will cause a compile-time error if EXPR, - which must be a compile-time constant, is false. */ - -#define gdb_static_assert(expr) \ - extern int never_defined_just_used_for_checking[(expr) ? 1 : -1] - /* PRAGMATICS: "gdb_assert.h":gdb_assert() is a lower case (rather than upper case) macro since that provides the closest fit to the existing lower case macro :assert() that it is diff --git a/gdb/defs.h b/gdb/defs.h index f76293f..cf0434b 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -223,7 +223,7 @@ enum language /* The number of bits needed to represent all languages, with enough padding to allow for reasonable growth. */ #define LANGUAGE_BITS 5 -gdb_static_assert (nr_languages <= (1 << LANGUAGE_BITS)); +static_assert (nr_languages <= (1 << LANGUAGE_BITS), ""); enum precision_type { diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 78c663c..081ddcf 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3062,7 +3062,7 @@ create_cus_from_index_list (struct objfile *objfile, for (i = 0; i < n_elements; i += 2) { - gdb_static_assert (sizeof (ULONGEST) >= 8); + static_assert (sizeof (ULONGEST) >= 8, ""); sect_offset sect_off = (sect_offset) extract_unsigned_integer (cu_list, 8, BFD_ENDIAN_LITTLE); @@ -3135,7 +3135,7 @@ create_signatured_type_table_from_index (struct objfile *objfile, void **slot; cu_offset type_offset_in_tu; - gdb_static_assert (sizeof (ULONGEST) >= 8); + static_assert (sizeof (ULONGEST) >= 8, ""); sect_offset sect_off = (sect_offset) extract_unsigned_integer (bytes, 8, BFD_ENDIAN_LITTLE); type_offset_in_tu diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index cc02740..9cafd52 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -880,7 +880,7 @@ gdb_bfd_fdopenr (const char *filename, const char *target, int fd) -gdb_static_assert (ARRAY_SIZE (_bfd_std_section) == 4); +static_assert (ARRAY_SIZE (_bfd_std_section) == 4, ""); /* See gdb_bfd.h. */ diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 46b614c..54d4cbc 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -21,7 +21,7 @@ #include "common-defs.h" -gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *)); +static_assert (sizeof (CORE_ADDR) >= sizeof (void *), ""); #ifdef __MINGW32CE__ #include "wincecompat.h" diff --git a/gdb/i386-fbsd-tdep.c b/gdb/i386-fbsd-tdep.c index 5a2c67e..46371f6 100644 --- a/gdb/i386-fbsd-tdep.c +++ b/gdb/i386-fbsd-tdep.c @@ -107,24 +107,24 @@ static const gdb_byte i386fbsd_osigtramp_end[] = }; /* The three different trampolines are all the same size. */ -gdb_static_assert (sizeof i386fbsd_sigtramp_start - == sizeof i386fbsd_freebsd4_sigtramp_start); -gdb_static_assert (sizeof i386fbsd_sigtramp_start - == sizeof i386fbsd_osigtramp_start); -gdb_static_assert (sizeof i386fbsd_sigtramp_middle - == sizeof i386fbsd_freebsd4_sigtramp_middle); -gdb_static_assert (sizeof i386fbsd_sigtramp_middle - == sizeof i386fbsd_osigtramp_middle); -gdb_static_assert (sizeof i386fbsd_sigtramp_end - == sizeof i386fbsd_freebsd4_sigtramp_end); -gdb_static_assert (sizeof i386fbsd_sigtramp_end - == sizeof i386fbsd_osigtramp_end); +static_assert (sizeof i386fbsd_sigtramp_start + == sizeof i386fbsd_freebsd4_sigtramp_start, ""); +static_assert (sizeof i386fbsd_sigtramp_start + == sizeof i386fbsd_osigtramp_start, ""); +static_assert (sizeof i386fbsd_sigtramp_middle + == sizeof i386fbsd_freebsd4_sigtramp_middle, ""); +static_assert (sizeof i386fbsd_sigtramp_middle + == sizeof i386fbsd_osigtramp_middle, ""); +static_assert (sizeof i386fbsd_sigtramp_end + == sizeof i386fbsd_freebsd4_sigtramp_end, ""); +static_assert (sizeof i386fbsd_sigtramp_end + == sizeof i386fbsd_osigtramp_end, ""); /* We assume that the middle is the largest chunk below. */ -gdb_static_assert (sizeof i386fbsd_sigtramp_middle - > sizeof i386fbsd_sigtramp_start); -gdb_static_assert (sizeof i386fbsd_sigtramp_middle - > sizeof i386fbsd_sigtramp_end); +static_assert (sizeof i386fbsd_sigtramp_middle + > sizeof i386fbsd_sigtramp_start, ""); +static_assert (sizeof i386fbsd_sigtramp_middle + > sizeof i386fbsd_sigtramp_end, ""); static int i386fbsd_sigtramp_p (struct frame_info *this_frame) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index c8a8216..bd4805f 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1008,7 +1008,7 @@ linux_core_info_proc_mappings (struct gdbarch *gdbarch, const char *args) unsigned int addr_size_bits, addr_size; struct gdbarch *core_gdbarch = gdbarch_from_bfd (core_bfd); /* We assume this for reading 64-bit core files. */ - gdb_static_assert (sizeof (ULONGEST) >= 8); + static_assert (sizeof (ULONGEST) >= 8, ""); section = bfd_get_section_by_name (core_bfd, ".note.linuxcore.file"); if (section == NULL) diff --git a/gdb/mi/mi-common.c b/gdb/mi/mi-common.c index 977ea87..818ad0e 100644 --- a/gdb/mi/mi-common.c +++ b/gdb/mi/mi-common.c @@ -42,8 +42,8 @@ static const char * const async_reason_string_lookup[] = NULL }; -gdb_static_assert (ARRAY_SIZE (async_reason_string_lookup) - == EXEC_ASYNC_LAST + 1); +static_assert (ARRAY_SIZE (async_reason_string_lookup) + == EXEC_ASYNC_LAST + 1, ""); const char * async_reason_lookup (enum async_reply_reason reason) diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c index 3bdf0db..d960a1a 100644 --- a/gdb/nat/amd64-linux-siginfo.c +++ b/gdb/nat/amd64-linux-siginfo.c @@ -587,10 +587,10 @@ amd64_linux_siginfo_fixup_common (siginfo_t *ptrace, gdb_byte *inf, /* Sanity check for the siginfo structure sizes. */ -gdb_static_assert (sizeof (siginfo_t) == GDB_SI_SIZE); +static_assert (sizeof (siginfo_t) == GDB_SI_SIZE, ""); #ifndef __ILP32__ -gdb_static_assert (sizeof (nat_siginfo_t) == GDB_SI_SIZE); +static_assert (sizeof (nat_siginfo_t) == GDB_SI_SIZE, ""); #endif -gdb_static_assert (sizeof (compat_x32_siginfo_t) == GDB_SI_SIZE); -gdb_static_assert (sizeof (compat_siginfo_t) == GDB_SI_SIZE); -gdb_static_assert (sizeof (ptrace_siginfo_t) == GDB_SI_SIZE); +static_assert (sizeof (compat_x32_siginfo_t) == GDB_SI_SIZE, ""); +static_assert (sizeof (compat_siginfo_t) == GDB_SI_SIZE, ""); +static_assert (sizeof (ptrace_siginfo_t) == GDB_SI_SIZE, ""); diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c index 0a9f138..c8f0a40 100644 --- a/gdb/nios2-tdep.c +++ b/gdb/nios2-tdep.c @@ -138,7 +138,7 @@ static int nios2_dwarf2gdb_regno_map[] = NIOS2_MPUACC_REGNUM /* 48 */ }; -gdb_static_assert (ARRAY_SIZE (nios2_dwarf2gdb_regno_map) == NIOS2_NUM_REGS); +static_assert (ARRAY_SIZE (nios2_dwarf2gdb_regno_map) == NIOS2_NUM_REGS, ""); /* Implement the dwarf2_reg_to_regnum gdbarch method. */ diff --git a/gdb/remote-notif.c b/gdb/remote-notif.c index 3952161..1f79a07 100644 --- a/gdb/remote-notif.c +++ b/gdb/remote-notif.c @@ -50,7 +50,7 @@ static struct notif_client *notifs[] = ¬if_client_stop, }; -gdb_static_assert (ARRAY_SIZE (notifs) == REMOTE_NOTIF_LAST); +static_assert (ARRAY_SIZE (notifs) == REMOTE_NOTIF_LAST, ""); static void do_notif_event_xfree (void *arg); diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index 4ce315d..7bbff49 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -57,9 +57,9 @@ /* 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 (gdb_byte) == sizeof (bfd_byte)); -gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type)); +static_assert (sizeof (CORE_ADDR) == sizeof (bfd_vma), ""); +static_assert (sizeof (gdb_byte) == sizeof (bfd_byte), ""); +static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type), ""); /* Provide bfd/ compatible prototype for target_read_memory. Casting would not be enough as LEN width may differ. */ diff --git a/gdb/symtab.c b/gdb/symtab.c index dd7434e..2394623 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -5681,7 +5681,7 @@ const struct symbol_impl *symbol_impls = &symbol_impl[0]; /* Make sure we saved enough room in struct symbol. */ -gdb_static_assert (MAX_SYMBOL_IMPLS <= (1 << SYMBOL_ACLASS_BITS)); +static_assert (MAX_SYMBOL_IMPLS <= (1 << SYMBOL_ACLASS_BITS), ""); /* Register a computed symbol type. ACLASS must be LOC_COMPUTED. OPS is the ops vector associated with this index. This returns the new diff --git a/gdb/symtab.h b/gdb/symtab.h index 239a479..f2c9490 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -592,7 +592,7 @@ enum minimal_symbol_type /* The number of enum minimal_symbol_type values, with some padding for reasonable growth. */ #define MINSYM_TYPE_BITS 4 -gdb_static_assert (nr_minsym_types <= (1 << MINSYM_TYPE_BITS)); +static_assert (nr_minsym_types <= (1 << MINSYM_TYPE_BITS), ""); /* Define a simple structure used to hold some very basic information about all defined global symbols (text, data, bss, abs, etc). The only required @@ -749,7 +749,7 @@ typedef enum domain_enum_tag /* The number of bits in a symbol used to represent the domain. */ #define SYMBOL_DOMAIN_BITS 3 -gdb_static_assert (NR_DOMAINS <= (1 << SYMBOL_DOMAIN_BITS)); +static_assert (NR_DOMAINS <= (1 << SYMBOL_DOMAIN_BITS), ""); extern const char *domain_name (domain_enum); @@ -892,7 +892,7 @@ enum address_class verify that we have reserved enough space for synthetic address classes. */ #define SYMBOL_ACLASS_BITS 5 -gdb_static_assert (LOC_FINAL_VALUE <= (1 << SYMBOL_ACLASS_BITS)); +static_assert (LOC_FINAL_VALUE <= (1 << SYMBOL_ACLASS_BITS), ""); /* The methods needed to implement LOC_COMPUTED. These methods can use the symbol's .aux_value for additional per-symbol information. diff --git a/gdb/value.c b/gdb/value.c index 3e0ca25..6089ced 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -964,7 +964,7 @@ static int max_value_size = 65536; /* 64k bytes */ is bigger than LONGEST on all GDB supported hosts we're fine. */ #define MIN_VALUE_FOR_MAX_VALUE_SIZE 16 -gdb_static_assert (sizeof (LONGEST) <= MIN_VALUE_FOR_MAX_VALUE_SIZE); +static_assert (sizeof (LONGEST) <= MIN_VALUE_FOR_MAX_VALUE_SIZE, ""); /* Implement the "set max-value-size" command. */