From patchwork Mon May 16 21:09:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12851458 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D6D1CC433F5 for ; Mon, 16 May 2022 21:11:50 +0000 (UTC) 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=WPpjUL3tFGvkljDrRSy3hn7Tdirb/D81eYH639nQDPM=; b=lS/t7Wbb6c+CG9GEbIRZSgRSiP gM3ztyzvwh1LLlWJLALCN4xWACByH688Uaasq3blA+5yGO+ewDZb2Apy7kyjQ3HR1RDNSrbOaYNWM r9Q5eJ9RJg1SKMZrwlciRAdCN6K3U+K7ywF+SCj4rNxl2A2SjbZZGSlw67VYX0JbnbP460XBetmT3 70IfO6hJIy8AFCkTVpSPD5TXSAUri6cS2K8jVx9LCxLLhkHrZYIPsbEv2Zh1gvQUkKDMm/uu7paZj 8iEZjQwTmU10hqZAt//kVo0ubbyKMLL4rjBbhIQGKm/pCgAUahQ/CoCMthpLbqDaL80egzaqgg6WS 5ECMlFVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqhzL-00ACik-Oe; Mon, 16 May 2022 21:10:47 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqhyp-00ACYI-Ov for linux-arm-kernel@lists.infradead.org; Mon, 16 May 2022 21:10:17 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2fecc57ec14so57315517b3.11 for ; Mon, 16 May 2022 14:10:13 -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=BmTyv5Df5nSkvL+7PwI+QdbCtOf+cNe9vmiXu33ntQI=; b=gptOuy544f1/kWDiF/3OwcmGk6scE1yCINr+MYB1fM6wQOI6FyysBHER/hQTOSK0b+ MaV+lyiNd6H08pwzyCgMNFopwYNwi/ySdFT99VpNmwgQEw0rEy19FI8sloRnORfz9EV4 YuA8+Csdh3kYQlEkStrZ0CpdJcbK+x+1D+bsBF5GlIIousYpIEVQAE3MkbbjAsA60HDM jP9FqLob+qAOGNb6Ycu0ImKBZ1mi+hSyanggzGdQSkDubEMBbMo3sfYBAr0LDXQzZdaR JkwFLL7wq3O3irglenxPj5cF750M8ZXPb/t3wKR9aCD4OZO67kD9v4JgQWVu/llWeVVm 8ZHg== 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=BmTyv5Df5nSkvL+7PwI+QdbCtOf+cNe9vmiXu33ntQI=; b=OCuZbPg2FPnq8yXuA1/k8FtDoVFfwskTpm3kEn5WdmuUwgdgIVMozUsJCGZSp5NVlB jaqPrT12d1O7vld+HsvBXpGLQbMuInb4c5JRUOpvuu3iVIDtnSpUPqye0+vodQvdZ3P1 dLNqg8KhMuWdnvizksgyhIxP/++mUKmwyxrziFIaMf6IWDSetcAPFbVqzRF++VPRhs0C JI0Lez0nriIvXBniA/XqbHdmYkQg7rfTPuQzBaRmJROOVRRBLKi2xn0psqmE7TbPeb78 Yho9q/c8JHcXyoFBucLblCehBW5m/x8N8arY/DTYILHUV3XgwPfwdSPahkajc7TVoXCr bJCA== X-Gm-Message-State: AOAM533EAHKPMvhNM+BSehQTL+DsTRVwKGUax7PbZjvuVKO107KLrNbO gxvCGr4T7LVapnSD6s2IbQZw5PoCczZjfVtj5gQ= X-Google-Smtp-Source: ABdhPJyMla5qPnmYHt216sR4ibgSN7vwxmKWbie1i9N4867KZ+Hc7TO27zSrR5W1Qkojj5JAsQSKdVVdoFJA+sTbuZw= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:2ef0:b8de:b9c8:da45]) (user=ndesaulniers job=sendgmr) by 2002:a25:d116:0:b0:64d:6fe1:4dc5 with SMTP id i22-20020a25d116000000b0064d6fe14dc5mr11663959ybg.576.1652735412883; Mon, 16 May 2022 14:10:12 -0700 (PDT) Date: Mon, 16 May 2022 14:09:54 -0700 In-Reply-To: <20220516210954.1660716-1-ndesaulniers@google.com> Message-Id: <20220516210954.1660716-5-ndesaulniers@google.com> Mime-Version: 1.0 References: <20220516210954.1660716-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=1652735394; l=3775; s=20211004; h=from:subject; bh=+s618NXBymdAo9VdYorCW3hWAXdQktAqz3laN51+p0c=; b=OVKnwODfYq9bHW9OJKqrl5qkJCDSXoxeW3Uqh+U1PMMqzJNX8xSLFGLaDqfYUfRMRaRK9PaeLrVs k97zmrYECFqtsXsQ5YEhv3E7FzsuxYTtWcX5oD9dXLdHurNhF4CA X-Mailer: git-send-email 2.36.0.550.gb090851708-goog Subject: [PATCH v3 4/4] ARM: pass -march= only to compiler From: Nick Desaulniers To: Arnd Bergmann , Ard@google.com, Biesheuvel@google.com Cc: Russell King , Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220516_141015_855220_F19B54A7 X-CRM114-Status: GOOD ( 12.80 ) 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 When both -march= and -Wa,-march= are specified for assembler or assembler-with-cpp sources, GCC and Clang will prefer the -Wa,-march= value but Clang will warn that -march= is unused. warning: argument unused during compilation: '-march=armv6k' [-Wunused-command-line-argument] This is the top group of warnings we observe when using clang to assemble the kernel via `ARCH=arm make LLVM=1`. Split the arch-y make variable into two, so that -march= flags only get passed to the compiler, not the assembler. -D flags are added to KBUILD_CPPFLAGS which is used for both C and assembler-with-cpp sources. Link: https://github.com/ClangBuiltLinux/linux/issues/1315 Link: https://github.com/ClangBuiltLinux/linux/issues/1587 Link: https://lore.kernel.org/llvm/628249e8.1c69fb81.d20fd.02ea@mx.google.com/ Signed-off-by: Nick Desaulniers Reported-by: kernel test robot --- arch/arm/Makefile | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1029c2503aef..47a300f6f99c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -57,21 +57,34 @@ endif KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra) # This selects which instruction set is used. +arch-$(CONFIG_CPU_32v7M) :=-march=armv7-m +arch-$(CONFIG_CPU_32v7) :=-march=armv7-a +arch-$(CONFIG_CPU_32v6) :=-march=armv6 +# Only override the compiler option if ARMv6. The ARMv6K extensions are +# always available in ARMv7 +ifeq ($(CONFIG_CPU_32v6),y) +arch-$(CONFIG_CPU_32v6K) :=-march=armv6k +endif +arch-$(CONFIG_CPU_32v5) :=-march=armv5te +arch-$(CONFIG_CPU_32v4T) :=-march=armv4t +arch-$(CONFIG_CPU_32v4) :=-march=armv4 +arch-$(CONFIG_CPU_32v3) :=-march=armv3m + # Note that GCC does not numerically define an architecture version # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. -arch-$(CONFIG_CPU_32v7M) :=-D__LINUX_ARM_ARCH__=7 -march=armv7-m -arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 -march=armv7-a -arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 -march=armv6 -# Only override the compiler opt:ion if ARMv6. The ARMv6K extensions are +cpp-$(CONFIG_CPU_32v7M) :=-D__LINUX_ARM_ARCH__=7 +cpp-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 +cpp-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 +# Only override the compiler option if ARMv6. The ARMv6K extensions are # always available in ARMv7 ifeq ($(CONFIG_CPU_32v6),y) -arch-$(CONFIG_CPU_32v6K) :=-D__LINUX_ARM_ARCH__=6 -march=armv6k +cpp-$(CONFIG_CPU_32v6K) :=-D__LINUX_ARM_ARCH__=6 endif -arch-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 -march=armv5te -arch-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 -march=armv4t -arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 -arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3m +cpp-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 +cpp-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 +cpp-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 +cpp-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 # This selects how we optimise for the processor. tune-$(CONFIG_CPU_ARM7TDMI) :=-mtune=arm7tdmi @@ -123,8 +136,9 @@ AFLAGS_ISA :=$(CFLAGS_ISA) endif # Need -Uarm for gcc < 3.x +KBUILD_CPPFLAGS +=$(cpp-y) KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm -KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float CHECKFLAGS += -D__arm__