From patchwork Wed Feb 21 16:46:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 86174 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B5183858402 for ; Wed, 21 Feb 2024 16:47:43 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 5918E3858C52 for ; Wed, 21 Feb 2024 16:47:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5918E3858C52 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5918E3858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708534033; cv=none; b=AzKBvuqFoNSLYNa+6C1Lcm47s5SGsWdNIDapPuCwhW77SDJ24lzJUOyhkpoRO0Rezc9oy7UAIDl2f7ZSx1mM8+QPuPXYJCi8aQw18nppiXBlj71SGeiJGsthWyrYrYoTx0P172hscokM/gRctxPxTLUuZM/39kDKRFux4GxFX3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708534033; c=relaxed/simple; bh=tNi9Nb8v691R1cyy0N2+5bQysuVI93IRsqmsaio3EQ0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=eQioxXvaw3IDvGSXoFr4jLIm0+vB8EazpO+vzyvxoE2beI4axMD8gR5km1qTQ0GaHXCivxmTn/jzhOj+4ddSl5V02VrWDdeh2nuPnP1oqWVDs96ZGEmEgHIoAhrbp4Idxcz1eZzOBuAekeeFvCKFuuv1E5WIc35rRgxR615g2S4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id CB33D1E030; Wed, 21 Feb 2024 11:47:10 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 1/2] gdb: remove some GCC version checks Date: Wed, 21 Feb 2024 11:46:51 -0500 Message-ID: <20240221164709.54212-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1173.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org New in v2: - remove changes to nat/x86-gcc-cpuid.h - adjust indentation in tracepoint.h Since we now require C++17, and therefore gcc >= 9, it's no longer useful to have gcc version checks for older gcc version. Change-Id: I3a87baa03c475f2b847b422b16b69c5ff7215b54 Reviewed-by: Kevin Buettner --- gdb/unittests/enum-flags-selftests.c | 6 ------ gdbserver/tracepoint.h | 6 +----- gdbsupport/common-defs.h | 9 --------- 3 files changed, 1 insertion(+), 20 deletions(-) base-commit: 99eeecc8d276e5af745e48825d66efff693a7678 diff --git a/gdb/unittests/enum-flags-selftests.c b/gdb/unittests/enum-flags-selftests.c index 853ebca37823..607b8ac66a64 100644 --- a/gdb/unittests/enum-flags-selftests.c +++ b/gdb/unittests/enum-flags-selftests.c @@ -253,10 +253,8 @@ CHECK_VALID (true, EF, true ? RE () : EF ()) CHECK_VALID (true, int, true ? EF () : EF2 ()) CHECK_VALID (true, int, true ? EF2 () : EF ()) -#if GCC_VERSION >= 5003 || defined __clang__ CHECK_VALID (true, int, true ? EF () : RE2 ()) CHECK_VALID (true, int, true ? RE2 () : EF ()) -#endif /* Same, but with an unsigned enum. */ @@ -264,10 +262,8 @@ typedef unsigned int uns; CHECK_VALID (true, uns, true ? EF () : UEF ()) CHECK_VALID (true, uns, true ? UEF () : EF ()) -#if GCC_VERSION >= 5003 || defined __clang__ CHECK_VALID (true, uns, true ? EF () : URE ()) CHECK_VALID (true, uns, true ? URE () : EF ()) -#endif /* Unfortunately this can't work due to the way C++ computes the return type of the ternary conditional operator. int isn't @@ -279,10 +275,8 @@ CHECK_VALID (true, uns, true ? URE () : EF ()) error: operands to ?: have different types ‘enum_flags’ and ‘int’ Confirmed to work with gcc 4.9, 5.3 and clang 3.7. */ -#if GCC_VERSION >= 4009 || defined __clang__ CHECK_VALID (false, void, true ? EF () : 0) CHECK_VALID (false, void, true ? 0 : EF ()) -#endif /* Check that the ++/--/<>/<<=/>>= operators are deleted. */ diff --git a/gdbserver/tracepoint.h b/gdbserver/tracepoint.h index 8b232324d2ec..1660c9445ee5 100644 --- a/gdbserver/tracepoint.h +++ b/gdbserver/tracepoint.h @@ -38,11 +38,7 @@ void initialize_tracepoint (void); #if defined _WIN32 || defined __CYGWIN__ # define EXPORTED_SYMBOL __declspec (dllexport) #else -# if __GNUC__ >= 4 -# define EXPORTED_SYMBOL __attribute__ ((visibility ("default"))) -# else -# define EXPORTED_SYMBOL -# endif +# define EXPORTED_SYMBOL __attribute__ ((visibility ("default"))) #endif /* Use these to make sure the functions and variables the IPA needs to diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h index 8ec559e9b680..6120719480b8 100644 --- a/gdbsupport/common-defs.h +++ b/gdbsupport/common-defs.h @@ -187,17 +187,8 @@ #undef ATTRIBUTE_NONNULL #define ATTRIBUTE_NONNULL(m) -#if GCC_VERSION >= 3004 #define ATTRIBUTE_UNUSED_RESULT __attribute__ ((__warn_unused_result__)) -#else -#define ATTRIBUTE_UNUSED_RESULT -#endif - -#if (GCC_VERSION > 4000) #define ATTRIBUTE_USED __attribute__ ((__used__)) -#else -#define ATTRIBUTE_USED -#endif #include "libiberty.h" #include "pathmax.h"