From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BECF22C80 for ; Tue, 12 Oct 2021 23:46:52 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id z2-20020a254c02000000b005b68ef4fe24so1208720yba.11 for ; Tue, 12 Oct 2021 16:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=3talEs2itJqGmarZ00bRlZ+EZGYrtuuD53DfIvzQNtg=; b=qzdeDSvgzhMcWtYkdUSFa0ZuPywUNS8d6Iq0opEXqOeXrVaoiG5JxPJ0TJQiRZh0LG WrVHXzHG2RJrNxv+YjLx4cto+c5SmzGQ2/z0zUULMIT7Ylb7pXOl297B1+MWZ4URm6S3 K90m3PbtV9kWTxRgSNz3PeKremWzBOf0Cox3VCPKFO56xhD3za4t6+XsqAI+rP2pGL1W cTfACzuqg94r2cGOPU8l0OIdCsWVRzb7nWFXAEYC/pjCatjBxM87j3vg47R/3uW0gnuW mMjxF9pyyNF+/pFKR62WKfH+q/OPZAGXiRJrN508Uimg4ecnjxAB+2n+VMbix2baq+nU YzeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3talEs2itJqGmarZ00bRlZ+EZGYrtuuD53DfIvzQNtg=; b=UmKrVE3GF7ZcOaxHlGl3+nHPdj+p9dwN2K8UF/oA71DYLKjJX0DCy0byEd+uT9dhPo 8iM+g+OTtgrtfzQy/1Ljk07tQqkoDrageBVs84o4oFd+fQA9Ba5WNsPu6/z9FighyRwE ks0xOvsIqTMDNzZiQECHMpAJqYt+saSzMK4fif/RJMlUVm4LEImSTDL9aV9vhWOpvlyl 8ypbInnwHrQJK22/f5FzyMWIVDRCK1kEqZtVDzKbxnfcdk4Vq/4/1OAEHhH8wlXOkH1f 932rpfOSXLzxYkurCN1aLrqdEZ64VF2Di4IzHV1Ed3irX5DlIHvYZyHlbCR7H3u6oxtd j+pw== X-Gm-Message-State: AOAM531cdJ3FNvFQmZ2PxaFryR9DUHkgkxDVXfI+snHmgUgskYcMMlyT nDz+ys7UApifbNVnIN1xtXEKAFNGTJeUtyxkjLU= X-Google-Smtp-Source: ABdhPJzIFutXhB9fFNe6qJTxVeF1qwVsjQr5R4imjUV0XUci065GZ+CKOL8HJ4Lt4zkEXo2DTCrWFbyf95vjjodTJI0= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:9b44:962:5897:17c0]) (user=ndesaulniers job=sendgmr) by 2002:a25:81c5:: with SMTP id n5mr31228924ybm.276.1634082411872; Tue, 12 Oct 2021 16:46:51 -0700 (PDT) Date: Tue, 12 Oct 2021 16:46:06 -0700 In-Reply-To: <20211012234606.91717-1-ndesaulniers@google.com> Message-Id: <20211012234606.91717-4-ndesaulniers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20211012234606.91717-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=lvO/pmg+aaCb6dPhyGC1GyOCvPueDrrc8Zeso5CaGKE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1634082366; l=2773; s=20211004; h=from:subject; bh=KivxBEiz8kY/YG1A752ABLoGXTndClfSbCaLd5U6VRE=; b=o6J8KwlbYffgoHGg/p2CFoh1PIdXMYZrdEsa/Db69BI0eYl2197Z05hXHSNfvgmMqr/qea2Oqv2M U0DjCIgcDQNjSaSxOvufMKH6LrB5PlivtBlBsJEAz4gLGwPgsM2T X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 3/3] arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd From: Nick Desaulniers To: Catalin Marinas , Will Deacon Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincenzo Frascino , Nick Desaulniers Content-Type: text/plain; charset="UTF-8" Similar to commit 231ad7f409f1 ("Makefile: infer --target from ARCH for CC=clang") There really is no point in setting --target based on $CROSS_COMPILE_COMPAT for clang when the integrated assembler is being used. Allows COMPAT_VDSO to be selected without setting $CROSS_COMPILE_COMPAT when using clang and lld together. Before: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y $ ARCH=arm64 make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config $ After: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y $ ARCH=arm64 make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y Signed-off-by: Nick Desaulniers --- arch/arm64/Kconfig | 3 ++- arch/arm64/kernel/vdso32/Makefile | 17 +++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5c7ae4c3954b..7b28dad2fb80 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1264,7 +1264,8 @@ config KUSER_HELPERS config COMPAT_VDSO bool "Enable vDSO for 32-bit applications" - depends on !CPU_BIG_ENDIAN && "$(CROSS_COMPILE_COMPAT)" != "" + depends on !CPU_BIG_ENDIAN + depends on CC_IS_CLANG && LD_IS_LLD || "$(CROSS_COMPILE_COMPAT)" != "" select GENERIC_COMPAT_VDSO default y help diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index d24b12318f4c..376261d3791f 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -10,18 +10,15 @@ include $(srctree)/lib/vdso/Makefile # Same as cc-*option, but using CC_COMPAT instead of CC ifeq ($(CONFIG_CC_IS_CLANG), y) -CC_COMPAT_CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) - CC_COMPAT ?= $(CC) -CC_COMPAT += $(CC_COMPAT_CLANG_FLAGS) - -ifneq ($(LLVM),) -LD_COMPAT ?= $(LD) +CC_COMPAT += --target=arm-linux-gnueabi else -LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld +CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc endif + +ifeq ($(CONFIG_LD_IS_LLD), y) +LD_COMPAT ?= $(LD) else -CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld endif @@ -44,10 +41,6 @@ VDSO_CPPFLAGS += $(LINUXINCLUDE) # Common C and assembly flags # From top-level Makefile VDSO_CAFLAGS = $(VDSO_CPPFLAGS) -ifneq ($(shell $(CC_COMPAT) --version 2>&1 | head -n 1 | grep clang),) -VDSO_CAFLAGS += --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) -endif - VDSO_CAFLAGS += $(call cc32-option,-fno-PIE) ifdef CONFIG_DEBUG_INFO VDSO_CAFLAGS += -g -- 2.33.0.882.g93a45727a2-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6151BC433EF for ; Tue, 12 Oct 2021 23:49:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A4CE60E74 for ; Tue, 12 Oct 2021 23:49:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1A4CE60E74 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TvWmV7WS/ADadJo2x6vWB8tmiopTE4GDra2GBtd10To=; b=VHgQapw3QeVjeEO6KflZLM6+8Z YFInSY6IbCjpHW72jA71gwfR6PZRxTfvBw++e9gs0D9uLuxfodpiFoTw320VwT/UGsMaYb64H564+ pxTooD48YCxJdQgbEEqvOx7BQ1jJj+ATp8oJUtxINWY4YjXAfMUioZ+jBLKagnZx459/DD8fQqQSw nqelBZI5k4lmZ4DCkyPhRpi75x/e1XQwrs4MZzN/Qvv/YbxZa4NthbglVRoIUTNqn86Jf6xVHtfKN FOll1zBojzFkQuUGZRMUSXopGSFcx+s7UEz5BIMwYeLDeobBwWlaUL4Fk7l0s7ht9Ga21bZnJCYcd 89oJFDJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRUM-00ECff-FH; Tue, 12 Oct 2021 23:47:18 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRTy-00ECXr-E1 for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 23:46:55 +0000 Received: by mail-yb1-xb49.google.com with SMTP id h185-20020a256cc2000000b005bdce4db0easo1197486ybc.12 for ; Tue, 12 Oct 2021 16:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=3talEs2itJqGmarZ00bRlZ+EZGYrtuuD53DfIvzQNtg=; b=qzdeDSvgzhMcWtYkdUSFa0ZuPywUNS8d6Iq0opEXqOeXrVaoiG5JxPJ0TJQiRZh0LG WrVHXzHG2RJrNxv+YjLx4cto+c5SmzGQ2/z0zUULMIT7Ylb7pXOl297B1+MWZ4URm6S3 K90m3PbtV9kWTxRgSNz3PeKremWzBOf0Cox3VCPKFO56xhD3za4t6+XsqAI+rP2pGL1W cTfACzuqg94r2cGOPU8l0OIdCsWVRzb7nWFXAEYC/pjCatjBxM87j3vg47R/3uW0gnuW mMjxF9pyyNF+/pFKR62WKfH+q/OPZAGXiRJrN508Uimg4ecnjxAB+2n+VMbix2baq+nU YzeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3talEs2itJqGmarZ00bRlZ+EZGYrtuuD53DfIvzQNtg=; b=uRXcEhAR2GbUN4/ylFSbIaJrMYvlRM9DvgunGuVhZnen+xEgBOL7lvy4xgrPjfVLf2 FeZlvJImLJ5mE9ZgFY7g4R3MlZTs/OMAs6JXIryaxHciMIhIqcRbZGCNB7wa1A27fz4+ LuqSPuX+ryIGOqWLgYZPfxmHUI9QGInm6SX5SxFVgQbtvSs27uutu/cBgpw84HeAVZvX Q6PrbuaqmPWUGcRSjO4EroF2n/ny92ELyMIAo4J869rFhUc58zU59uM2bzNP4ljOSpuT j0wMAa0TX0jekFrxeHEVS3navWG5qmelIvZPQC7ydrSegiJyMw4EzYgL/DCwxQEyYO5e dMug== X-Gm-Message-State: AOAM530ocWpgKcUk8XHIMPFh/7S5Y78NOkh7XNVZCYiBuyp47Xk8khah KZGGkXGVBJLb8+RQqmWSbI79ba79pU9drbiU7e4= X-Google-Smtp-Source: ABdhPJzIFutXhB9fFNe6qJTxVeF1qwVsjQr5R4imjUV0XUci065GZ+CKOL8HJ4Lt4zkEXo2DTCrWFbyf95vjjodTJI0= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:9b44:962:5897:17c0]) (user=ndesaulniers job=sendgmr) by 2002:a25:81c5:: with SMTP id n5mr31228924ybm.276.1634082411872; Tue, 12 Oct 2021 16:46:51 -0700 (PDT) Date: Tue, 12 Oct 2021 16:46:06 -0700 In-Reply-To: <20211012234606.91717-1-ndesaulniers@google.com> Message-Id: <20211012234606.91717-4-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211012234606.91717-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=lvO/pmg+aaCb6dPhyGC1GyOCvPueDrrc8Zeso5CaGKE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1634082366; l=2773; s=20211004; h=from:subject; bh=KivxBEiz8kY/YG1A752ABLoGXTndClfSbCaLd5U6VRE=; b=o6J8KwlbYffgoHGg/p2CFoh1PIdXMYZrdEsa/Db69BI0eYl2197Z05hXHSNfvgmMqr/qea2Oqv2M U0DjCIgcDQNjSaSxOvufMKH6LrB5PlivtBlBsJEAz4gLGwPgsM2T X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 3/3] arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd From: Nick Desaulniers To: Catalin Marinas , Will Deacon Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincenzo Frascino , Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_164654_520506_AD041E2B X-CRM114-Status: GOOD ( 10.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Similar to commit 231ad7f409f1 ("Makefile: infer --target from ARCH for CC=clang") There really is no point in setting --target based on $CROSS_COMPILE_COMPAT for clang when the integrated assembler is being used. Allows COMPAT_VDSO to be selected without setting $CROSS_COMPILE_COMPAT when using clang and lld together. Before: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y $ ARCH=arm64 make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config $ After: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y $ ARCH=arm64 make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y Signed-off-by: Nick Desaulniers --- arch/arm64/Kconfig | 3 ++- arch/arm64/kernel/vdso32/Makefile | 17 +++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5c7ae4c3954b..7b28dad2fb80 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1264,7 +1264,8 @@ config KUSER_HELPERS config COMPAT_VDSO bool "Enable vDSO for 32-bit applications" - depends on !CPU_BIG_ENDIAN && "$(CROSS_COMPILE_COMPAT)" != "" + depends on !CPU_BIG_ENDIAN + depends on CC_IS_CLANG && LD_IS_LLD || "$(CROSS_COMPILE_COMPAT)" != "" select GENERIC_COMPAT_VDSO default y help diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index d24b12318f4c..376261d3791f 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -10,18 +10,15 @@ include $(srctree)/lib/vdso/Makefile # Same as cc-*option, but using CC_COMPAT instead of CC ifeq ($(CONFIG_CC_IS_CLANG), y) -CC_COMPAT_CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) - CC_COMPAT ?= $(CC) -CC_COMPAT += $(CC_COMPAT_CLANG_FLAGS) - -ifneq ($(LLVM),) -LD_COMPAT ?= $(LD) +CC_COMPAT += --target=arm-linux-gnueabi else -LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld +CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc endif + +ifeq ($(CONFIG_LD_IS_LLD), y) +LD_COMPAT ?= $(LD) else -CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld endif @@ -44,10 +41,6 @@ VDSO_CPPFLAGS += $(LINUXINCLUDE) # Common C and assembly flags # From top-level Makefile VDSO_CAFLAGS = $(VDSO_CPPFLAGS) -ifneq ($(shell $(CC_COMPAT) --version 2>&1 | head -n 1 | grep clang),) -VDSO_CAFLAGS += --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) -endif - VDSO_CAFLAGS += $(call cc32-option,-fno-PIE) ifdef CONFIG_DEBUG_INFO VDSO_CAFLAGS += -g -- 2.33.0.882.g93a45727a2-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel