[tip:,x86/urgent] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block
| Message ID | 167438415817.4906.16581804181334586242.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1101423wrn;
Sun, 22 Jan 2023 02:58:19 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXtHdOt9vn2WJYzUOT3xuUiNl2bFetpXTanZ0UiNK9zPqo3jLEaKU+ePiDwdPQDS9PoZKnV/
X-Received: by 2002:a17:90b:3909:b0:229:ffd3:ad36 with SMTP id
ob9-20020a17090b390900b00229ffd3ad36mr10841934pjb.0.1674385099229;
Sun, 22 Jan 2023 02:58:19 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1674385099; cv=none;
d=google.com; s=arc-20160816;
b=nbyW7mR8FLShVXmVMbKz/BE51xvFghP7UAHsQLwkgvTu9XW3fiMle+4/RlBqfAAvRP
DvmeHfUFYBD4A3MqXW+Y9Dx1TCl3thKcoJK4Yr16vhmWCgVM18MdppuNtpsFmPlm8C2L
9LSoMAMFk18SQ5wpKvX0IaiJPfGSGv0XVuQjKdwClRR7O9XazgYKZxYofCeu+Gn/7rQG
16nqTqNF4T+tnzrdQpabblA2hgHtmwXpVtdUkMrQhwwk+4UXeh9JYomt4juAMoiu0im0
y6Ah3T0czX4vA/lc8lR0tcc55cNXdXz+vDjuoyWCqrbwIdkDRMIrO2pUSCcqsNULW207
fFMw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:robot-unsubscribe
:robot-id:message-id:mime-version:references:in-reply-to:cc:subject
:to:reply-to:sender:from:dkim-signature:dkim-signature:date;
bh=PQzAUlffxP+Cue4tZ7knjTLBcxiecYtxOrWhjKJnyII=;
b=QwCAkSrVpyR3SgbZoDXWfeX34xBsxl5J2ezsJ+g3ngFwxKStxwbwP5B0FawH5o8k1V
qk/gY/r2HTTHa7/IeRC/Ss78ND2tWRUcsP9AXjrzYDozZoZ6/NUXho4+Bs44N/JGQ9Wt
Nl6KY4+91m8y8aATvjcg2eLfbxZSNY1lgwcHAeN8Dby0sCtHHy5Hz2AggUiEjTAxeTRj
s9jO8Prbp28YahzDVjmKYLnffT9PWn5kNjBKMDp8NCdDo/3JYYihxaWmOWSxmKjMlWGV
D7LG80ivOtBjuNcLnpj3f+ESHW1yGowuRqBHrMg4/R3U47u31mvxOiz2mHi8kZQ8Lwp6
xTew==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=TqlUA4vB;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
c13-20020a17090a8d0d00b0022bb6c5fa9dsi6764697pjo.38.2023.01.22.02.58.07;
Sun, 22 Jan 2023 02:58:19 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=TqlUA4vB;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229566AbjAVKms (ORCPT <rfc822;ariel.simulevski@gmail.com>
+ 99 others); Sun, 22 Jan 2023 05:42:48 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56606 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229826AbjAVKmq (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 22 Jan 2023 05:42:46 -0500
Received: from galois.linutronix.de (Galois.linutronix.de
[IPv6:2a0a:51c0:0:12e:550::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9C06A3;
Sun, 22 Jan 2023 02:42:43 -0800 (PST)
Date: Sun, 22 Jan 2023 10:42:38 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1674384159;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=PQzAUlffxP+Cue4tZ7knjTLBcxiecYtxOrWhjKJnyII=;
b=TqlUA4vBbCPiyJpp1gP8yimb7Cioi56xOa1ocWkq07cDmVH0EndkUs6Chqs3jRCNwcuPQN
nBAXw3VUr4fYp7TDY2hP/H/g5ZvNBBuiJoyQZH0e9Tphzmpf64dpNH4zOpURC6v9SINMO1
pKdhbaWDMz8nsQG7Xe/mIJYH1AxedKyBYe9K3T8Z8KM8jbY+qm+VUhfv/0mfu/ZPp5T4pT
QmXc6znrAoXxsPJMz7wujK/WOIstPoLzYohWayqo+EDOTJMky2LmkHhySJMmOFqEdaFn1M
tIMQkPPIURmZ+wYReDksqWSH+5IYDPYzelO9J0yoNPMhGozByb++aNOS6D7Wjw==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1674384159;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=PQzAUlffxP+Cue4tZ7knjTLBcxiecYtxOrWhjKJnyII=;
b=ht6Ar4qiK2waBluVvw+/Ohd5EAorLiZ07VR9jNzCaF8AGauCM58nSeZz3vla5EtaGSqJoP
Ql99WOXzz1lf2GBg==
From: "tip-bot2 for Nathan Chancellor" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: x86/urgent] x86/build: Move '-mindirect-branch-cs-prefix' out
of GCC-only block
Cc: Nathan Chancellor <nathan@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>, x86@kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20230120165826.2469302-1-nathan@kernel.org>
References: <20230120165826.2469302-1-nathan@kernel.org>
MIME-Version: 1.0
Message-ID: <167438415817.4906.16581804181334586242.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1755562554958898001?=
X-GMAIL-MSGID: =?utf-8?q?1755720029604401359?=
|
| Series |
[tip:,x86/urgent] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Jan. 22, 2023, 10:42 a.m. UTC
The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 27b5de622ea3fe0ad5a31a0ebd9f7a0a276932d1 Gitweb: https://git.kernel.org/tip/27b5de622ea3fe0ad5a31a0ebd9f7a0a276932d1 Author: Nathan Chancellor <nathan@kernel.org> AuthorDate: Fri, 20 Jan 2023 09:58:27 -07:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Sun, 22 Jan 2023 11:36:45 +01:00 x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block LLVM 16 will have support for this flag so move it out of the GCC-only block to allow LLVM builds to take advantage of it. Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://github.com/ClangBuiltLinux/linux/issues/1665 Link: https://github.com/llvm/llvm-project/commit/6f867f9102838ebe314c1f3661fdf95700386e5a Link: https://lore.kernel.org/r/20230120165826.2469302-1-nathan@kernel.org --- arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 9cf0732..73ed982 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -14,13 +14,13 @@ endif ifdef CONFIG_CC_IS_GCC RETPOLINE_CFLAGS := $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register) -RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch-cs-prefix) RETPOLINE_VDSO_CFLAGS := $(call cc-option,-mindirect-branch=thunk-inline -mindirect-branch-register) endif ifdef CONFIG_CC_IS_CLANG RETPOLINE_CFLAGS := -mretpoline-external-thunk RETPOLINE_VDSO_CFLAGS := -mretpoline endif +RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch-cs-prefix) ifdef CONFIG_RETHUNK RETHUNK_CFLAGS := -mfunction-return=thunk-extern