From patchwork Sun Nov 9 21:53:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 123847 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 1EDB4385840E for ; Sun, 9 Nov 2025 22:04:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1EDB4385840E Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=qPjT9U8V X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by sourceware.org (Postfix) with ESMTPS id AF80E3858402 for ; Sun, 9 Nov 2025 21:53:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF80E3858402 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AF80E3858402 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762725212; cv=none; b=iIDRNTHB1JM2uiTcuFDlp/9L5n64TR7fQ+ZFf5VDywrjhtnCr45vSiZQJFjBtE0Ycj+B+raQE0OKD2Z4RP8VBviezqNsHfqw0ptzcP2IX+d6+ezJ/37aHqPzVxGHd5UCDKtK97uttupRv/whGQsyjAAK0Wj8FaTpOSfqbhsSX08= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762725212; c=relaxed/simple; bh=xU51HDCK6E+iy4WhigK5aAK0ANxuxVZ+fKh2G67mUWI=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=BZGKkaa7xF3B3JBZfCEKI4KqRIHEbLx2sIDmv0slzwmEYO3rd3OzsThZYU/6I7IfU4H/rgMGTn9H2rMyQv50w/LCgisL1iyOHKWRJd5MW0OQOOkDhno5cLVSZ+zt32LmrxUCAZ9V6HCt/ZQVQCIJaWgkeKDe7AkJdpwxkifxD74= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF80E3858402 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 2036B444AE for ; Sun, 9 Nov 2025 21:53:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52FF9C19424; Sun, 9 Nov 2025 21:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762725212; bh=xU51HDCK6E+iy4WhigK5aAK0ANxuxVZ+fKh2G67mUWI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qPjT9U8V3JfBV+0gLeYWaCJxnjvIGfiZNqBAk/swnfPRv4bzqk5+KIqw38oYSFoqV SpeTX4T3QvsxuZCFxEUnaGmeV385SPetGMX+E+ZwUBIo8q4DEni5Ivid8GrtIs0Waa cF4X704MgwqFdku1uX8RBYd1GT4+J+OeiRalQ9bOsMg9swFuNa3l9nWuXf+bKpKXLf Iqhj58Jorz8yEGFk6wyo0UluO+hUO+tq5jCsVost6bWyZJ5XQAXA9k8TpWCUWTwCxv AA8U62qRBLe7+mdxylL8jMlAA5DUWY6eL76AA4xQ4YoHNlRaB4sgty90CN82jHp3N2 hYUebs09E1CQA== Date: Sun, 9 Nov 2025 22:53:29 +0100 From: Alejandro Colomar To: libc-alpha@sourceware.org Cc: Alejandro Colomar Subject: [PATCH v1 17/35] Assume that GCC is at least GCC 5 Message-ID: <6da6af3c366b2fc751d445c5fc62116809f02e7c.1762725057.git.alx@kernel.org> X-Mailer: git-send-email 2.51.0 References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_PASS, TXREP 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Signed-off-by: Alejandro Colomar --- misc/sys/cdefs.h | 13 +------------ string/bits/string_fortified.h | 19 ------------------- string/string.h | 3 +-- sysdeps/x86/bits/floatn.h | 7 +------ 4 files changed, 3 insertions(+), 39 deletions(-) diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index d28af8b30a..8f565acda1 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -524,12 +524,6 @@ # define __glibc_unlikely(cond) __builtin_expect ((cond), 0) # define __glibc_likely(cond) __builtin_expect ((cond), 1) -#if (!defined _Noreturn \ - && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ - && !(__GNUC_PREREQ (4,7) || defined(__clang__))) -# define _Noreturn __attribute__ ((__noreturn__)) -#endif - #if __GNUC_PREREQ (8, 0) /* Describes a char array whose address can safely be passed as the first argument to strncpy and strncat, as the char array is not necessarily @@ -551,8 +545,7 @@ #if (!defined _Static_assert && !defined __cplusplus \ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ - && (!(__GNUC_PREREQ (4, 6) || defined(__clang__)) \ - || defined __STRICT_ANSI__)) + && defined __STRICT_ANSI__) # define _Static_assert(expr, diagnostic) \ extern int (*__Static_assert_function (void)) \ [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] @@ -637,13 +630,9 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf Note: MESSAGE must be a _single_ string; concatenation of string literals is not supported. */ -#if __GNUC_PREREQ (4,8) || defined(__clang__) # define __glibc_macro_warning1(message) _Pragma (#message) # define __glibc_macro_warning(message) \ __glibc_macro_warning1 (GCC warning message) -#else -# define __glibc_macro_warning(msg) -#endif /* Generic selection (ISO C11) is a C-only feature, available in GCC since version 4.9. Previous versions do not provide generic diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h index c7f7cb0e35..88eb2510cd 100644 --- a/string/bits/string_fortified.h +++ b/string/bits/string_fortified.h @@ -114,7 +114,6 @@ __NTH (strncpy (__fortify_clang_overload_arg (char *, __restrict, __dest), } #ifdef __USE_XOPEN2K8 -# if __GNUC_PREREQ (4, 7) || defined(__clang__) __fortify_function __attribute_overloadable__ char * __NTH (stpncpy (__fortify_clang_overload_arg (char *, ,__dest), const char *__src, size_t __n)) @@ -123,24 +122,6 @@ __NTH (stpncpy (__fortify_clang_overload_arg (char *, ,__dest), return __builtin___stpncpy_chk (__dest, __src, __n, __glibc_objsize (__dest)); } -# else -extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n, - size_t __destlen) __THROW - __fortified_attr_access (__write_only__, 1, 3) - __attr_access ((__read_only__, 2)); -extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src, - size_t __n), stpncpy); - -__fortify_function __attribute_overloadable__ char * -__NTH (stpncpy (__fortify_clang_overload_arg (char *, ,__dest), - const char *__src, size_t __n)) -{ - if (__bos (__dest) != (size_t) -1 - && (!__builtin_constant_p (__n) || __n > __bos (__dest))) - return __stpncpy_chk (__dest, __src, __n, __bos (__dest)); - return __stpncpy_alias (__dest, __src, __n); -} -# endif #endif diff --git a/string/string.h b/string/string.h index 03987fa352..a226c7808d 100644 --- a/string/string.h +++ b/string/string.h @@ -33,8 +33,7 @@ __BEGIN_DECLS #include /* Tell the caller that we provide correct C++ prototypes. */ -#if defined __cplusplus && (__GNUC_PREREQ (4, 4) \ - || defined(__clang__)) +#if defined __cplusplus # define __CORRECT_ISO_CPP_STRING_H_PROTO #endif diff --git a/sysdeps/x86/bits/floatn.h b/sysdeps/x86/bits/floatn.h index 3407874096..1099ffbb5a 100644 --- a/sysdeps/x86/bits/floatn.h +++ b/sysdeps/x86/bits/floatn.h @@ -28,12 +28,7 @@ support, for x86_64 and x86. Intel SYCL compiler doesn't support _Float128: https://github.com/intel/llvm/issues/16903 */ -#if (defined __x86_64__ \ - ? __GNUC_PREREQ (4, 3) \ - : (defined __GNU__ ? __GNUC_PREREQ (4, 5) : __GNUC_PREREQ (4, 4))) \ - || (defined(__clang__) \ - && (!defined __INTEL_LLVM_COMPILER \ - || !defined SYCL_LANGUAGE_VERSION)) +#if (!defined __INTEL_LLVM_COMPILER || !defined SYCL_LANGUAGE_VERSION) # define __HAVE_FLOAT128 1 #else # define __HAVE_FLOAT128 0