From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dog.elm.relay.mailchannels.net (dog.elm.relay.mailchannels.net [23.83.212.48]) by sourceware.org (Postfix) with ESMTPS id C552C3857810 for ; Fri, 11 Mar 2022 15:13:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C552C3857810 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 4167B621FD1; Fri, 11 Mar 2022 15:12:59 +0000 (UTC) Received: from pdx1-sub0-mail-a304.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 19793621C19; Fri, 11 Mar 2022 15:12:53 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647011578; a=rsa-sha256; cv=none; b=ZTKslyK85nyp68euwFtd2nI8AHCdZcYtZNaprSeVqRyONnRctaZBUVZ6oMBLnP/o4cZo8r dGG6cbU/3+O9wubppQ9k8HGzyma4fUsGGL7m9AgsNI9Be+s3Y5IAc+m8jU1Hebl4+p8a1A IEp2bm3CzLOvp7fQ8NTVPlkeXep06OQBhou6BjBwxJDLC/NDLXW1YzcRb/aLP9Fb3dlqrC l5puY/nd9AKEDqbr9zkNIt3NOD7JCosiPUmNmuarWEcr6xlgYZTWawN0pnksL2OZFXPF3S IEeo3nueJgL4ExPgc0RQy8NlTp3W1EF4qcqgD2jdTLvd+W6JMnFlnD06tzc7Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647011578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TDsw3ld2uFCyd59CP4T5S8/xGj6QRXratSrjmwNMSX0=; b=DbXHu6/zuDCgLKbvKVE1cxeyIp46oWywkYmWVsTdWTFLUFbHLcWQXs2pyo71RGynaZcnlI NFU9VjzY97b1K7vnaiGcmYI0wYdCXMvAJErdSypE6bDv7g9YYSkGuro//6I6D/Fesq8Gni dqV5CAxp/S4S4vVZlz3OlOfkuObonSDLBDG43cQmsf4VojhMfi/hVHTQ1/mkGYC8gEZQc7 kk0L9hzkLdBq2exY/49FYTm9th+y52v+lG0T+RQ6wGjWcTy3zmJ3aUrsR6nzv/bbY7sXQL przjK97cLlbMdW1TPzB4LW1skXc5s+Z0pLWwr6aub1OMVimMqRmcCnUoQV+Rkw== ARC-Authentication-Results: i=1; rspamd-c9cb649d9-djkwb; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a304.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.112.20.197 (trex/6.5.3); Fri, 11 Mar 2022 15:12:58 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Rock-Keen: 73897701691a2e4f_1647011578732_1769831590 X-MC-Loop-Signature: 1647011578732:437321039 X-MC-Ingress-Time: 1647011578731 Received: from rhbox.redhat.com (unknown [1.186.122.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a304.dreamhost.com (Postfix) with ESMTPSA id 4KFTv33Mghz1Ns; Fri, 11 Mar 2022 07:12:31 -0800 (PST) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: carlos@redhat.com, fweimer@redhat.com, Adhemerval Zanella Subject: [committed 2.34 6/8] Enable _FORTIFY_SOURCE=3 for gcc 12 and above Date: Fri, 11 Mar 2022 20:42:01 +0530 Message-Id: <20220311151203.3585163-7-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220311151203.3585163-1-siddhesh@sourceware.org> References: <20220311151203.3585163-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3494.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2022 15:13:02 -0000 gcc 12 now has support for the __builtin_dynamic_object_size builtin. Adapt the macro checks to enable _FORTIFY_SOURCE=3 on gcc 12 and above. Signed-off-by: Siddhesh Poyarekar Reviewed-by: Adhemerval Zanella (cherry picked from commit 86bf0feb0e3ec8e37872f72499d6ae33406561d7) --- include/features.h | 4 +++- misc/sys/cdefs.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/features.h b/include/features.h index d974eabfaf..933499bcff 100644 --- a/include/features.h +++ b/include/features.h @@ -412,7 +412,9 @@ # warning _FORTIFY_SOURCE requires compiling with optimization (-O) # elif !__GNUC_PREREQ (4, 1) # warning _FORTIFY_SOURCE requires GCC 4.1 or later -# elif _FORTIFY_SOURCE > 2 && __glibc_clang_prereq (9, 0) +# elif _FORTIFY_SOURCE > 2 && (__glibc_clang_prereq (9, 0) \ + || __GNUC_PREREQ (12, 0)) + # if _FORTIFY_SOURCE > 3 # warning _FORTIFY_SOURCE > 3 is treated like 3 on this platform # endif diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 3bb9f38916..515fb681a0 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -142,7 +142,8 @@ #define __bos0(ptr) __builtin_object_size (ptr, 0) /* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available. */ -#if __USE_FORTIFY_LEVEL == 3 && __glibc_clang_prereq (9, 0) +#if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0) \ + || __GNUC_PREREQ (12, 0)) # define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0) # define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1) #else -- 2.35.1