From patchwork Tue Oct 19 22:36:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12571271 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 38EE0C433F5 for ; Tue, 19 Oct 2021 22:39:11 +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 0691161154 for ; Tue, 19 Oct 2021 22:39:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0691161154 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=XItQLRutlKOI7sofqOTi+32XEkokmPgwmhjaeSlWI1c=; b=fHvvpJfGWUI5mJmomq6anoyxz7 nzmFeNkku9INiu1fySabAUzBfqbNuZRMRxnBYncOuWvbp/ZvcfDP0SAJ9dZ5EhBiFQLAerEirMPCL J5xHXy1c5BuQKtTyP/YvDWJrWXiKrCVmzixf0e6AHTZ6ZkA0zCpAwX9IiPs2CwvFgzFaCuirBWHlo anCvqUH/GihSnCrMgYS7eNbJpSdrz2wW0cuBwGVJe/gUA3wanhVQhokQjz3BNG8IoZGAKc76mnfoA PCvYrO2MimUxTGk0TD0a4S3OsXJWVmTuBnWRhqRIwcXGXIgh/fRKy5Ss3ZxwC73jd5G1gDDMmNRCx /A0TUh9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxju-002rVF-V1; Tue, 19 Oct 2021 22:37:47 +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 1mcxjC-002rIv-NM for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 22:37:04 +0000 Received: by mail-yb1-xb49.google.com with SMTP id y18-20020a25a092000000b005bddb39f160so25722302ybh.10 for ; Tue, 19 Oct 2021 15:37:01 -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=ieJkUq9AzcpIj4LQBtK/SuYHkz864IVu4L+C9FeReNk=; b=ERko7aMyEefMKRlvV+YD2HoE6JCeR02DxC3cDmrCS0O1UiBj+RN2tSODvIWcna78Cw EJR33ISjdTzmwBPptFpZbGhcPvP4wQ/wlvy/jh/F5JfsfiG7Nwaoy7dsONTwHvPP7YJo wqdihZee+7b7qp3N9lLeJUXPikSzPfCkK3O3jppmlVpy+p4/D5m9KVmWBTdOjIttqqBb XNcKhpveeawTx3cJCTsN50vbXBF+S91p2IOyqhdMBcjThvW8iAGo6nckvEmibPnHUbzb tMG1bFm6Th+iIzS+zYG23S7K9UTJDw4wBFJ8/VIMGzm8Y4T/9FiaFppZ3vbDfkAsU2cG cE4Q== 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=ieJkUq9AzcpIj4LQBtK/SuYHkz864IVu4L+C9FeReNk=; b=ibK7JtlKOgBfBP/1T6zj+1gIjfANCeVpakDNfe9is6bRQNIX5Pk9Thv8FNlO4D9wFI B8CPl+DEaM0Vxh80ULEQ/wwf1KAePsJP1rFc9FOhBdgidWVmLfGW9HT0GgFhFQ13Pybv xMkajvom7PL+GZxLQ8nXJzmXRKymgCS543xJx5LfjYZ66Z7RGBt8sFWCOIDTdvMAelXI OAZYMRcDOv2q7ygg/RX3fwq7NAwCQysIM/272saC1OysBwGPLBWHdthi51LS0oWPOgC8 YptVVlPX8j+114wcHQ4fAdC+/NrR5Fx16TcYF2/tKMJmRhlwVclcsMOcvnYA/AWjdUSn 3paQ== X-Gm-Message-State: AOAM532+Wg6JdWuxORea6KiQXbLhu46XCBy6XoNxyX4K+grCVnVHz6eQ l3UDlaIY9exS6TX5ggeJsiztj+va3XXW44+eXK4= X-Google-Smtp-Source: ABdhPJw8tBLJuOZSF61b7iRwYY/fKQtMy2X99637/nO9cOgSqDLJbdat9U2v0D48/Z7up8cj+LueXImtfbNoMWSaySs= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:de0:247b:5157:7c15]) (user=ndesaulniers job=sendgmr) by 2002:a25:1a46:: with SMTP id a67mr42666171yba.21.1634683021220; Tue, 19 Oct 2021 15:37:01 -0700 (PDT) Date: Tue, 19 Oct 2021 15:36:46 -0700 In-Reply-To: <20211019223646.1146945-1-ndesaulniers@google.com> Message-Id: <20211019223646.1146945-5-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211019223646.1146945-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=1634683006; l=3156; s=20211004; h=from:subject; bh=bnFBQ6SFPtVAkwcilKxCNvOoVbtexwjszCO7lK1gTak=; b=WK0kuoDuvYBKOWtOBxZiPPiBoN9HIqJyfM6EDsHV+1PUewJNi21HNTTWWfH7V5NZcKxfR4UBSAPi L3H7+RH4BlB/mChnNglFhRxhTz73LV4hNQDAa3YHRyCtVpW1JNKe X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 4/4] 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 , Nathan Chancellor , Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_153702_791985_1C2CE0F9 X-CRM114-Status: GOOD ( 10.85 ) 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: , 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, since commit ef94340583ee ("arm64: vdso32: drop -no-integrated-as flag"). 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 Reviewed-by: Nathan Chancellor Suggested-by: Nathan Chancellor Tested-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Reviewed-by: Vincenzo Frascino --- Changes v1 -> v2: * Cite ef94340583ee as per Nathan. * Add parens to Kconfig expression as per Nathan. * Pick up Nathan's RB, TB, and SB tags. 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..f0f2c95aa4c8 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 e478cebb9891..c8fec493a450 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 @@ -45,10 +42,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