From nobody Thu May 7 23:18:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28626C4332F for ; Fri, 14 Oct 2022 20:14:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230522AbiJNUOP (ORCPT ); Fri, 14 Oct 2022 16:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230139AbiJNUOK (ORCPT ); Fri, 14 Oct 2022 16:14:10 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6664101D2 for ; Fri, 14 Oct 2022 13:14:08 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id 88-20020a17090a09e100b00208c35d9452so3051637pjo.6 for ; Fri, 14 Oct 2022 13:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xSZQdVus5Bc10Nyq9KzLPWg8hzLcHTiPyHVyqpOguK4=; b=kD2tnNrehBli3cgB0QmimYdhfvTNc37MT2v7KLpXOBTBhb0BLBdEHaiuHQYJ9qaedM Wu3dyR+bDoP4WxYvgg5pmzR8h0c5XrATYiA1Rqo4u8keEfE8ZV3TEqhaHV6RL5HLtEAC ZT0KzCT10tTowbh0A2WW5JPaazN2RXzmLslOBUMsqxsfmWPZzW91OzdYu01JGs3+xnGo pQt+PsxEwOygchY3h0Ikw5gx2rEArPwKo8UqMhgDbyVMCcQXH0hTIk03Vsc3I9Kz/qfF JD23wKrPN3Owdyz3bAiAB4/zHJIksYkPPNqwFKz7QwFUkDE1uMfXbmizikJoE1nUgxyv qCLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xSZQdVus5Bc10Nyq9KzLPWg8hzLcHTiPyHVyqpOguK4=; b=nnkxhdXis5PE2tYCTib1vLt5bYJbZW7YQiPNdJo9lbZgAEswWSXRzw8gxapE6p8uIh gzF0V6linpAZrs2IXNeWBI/qTWyqL0GtbhN7fdEq0N5CpdLe4EmPiQ5NrLzO/uj+J0x+ M+Gnzmzfgtxvdyb3oimXw85LvNTDYe+hOcq7ZK0h1bK2x1JPySPMyv5zpS5X24WJXRXv 6a067wq5Sua4m6a4VJk5PcjSesPq3z81cL4XSQvU5WmnOjYdAlDaGrf13Iv7RrXyuUVH sAUiDCtMqF9lyiH5PyNn+tjemOX0gwyV/uj+YNETefHj+dqZUKqPaiufjk/2hb0Hh/zQ 5MIQ== X-Gm-Message-State: ACrzQf3DyOPKupy5ZvqbNEyuVxD0Lg62+uquFX9s/ndGNaVgC4H0EGw/ ipTqPDJelEayCAXBDNlaDgpj2y3aMoI1ui9L1nI= X-Google-Smtp-Source: AMsMyM73DcgZrlWR8kfVR813JbsSNHdsmxcyyERaCCsZM7LVFiONrXCBEEsLWHtBjfINZLNG+FfdH9eX3bVIyuo/8fs= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:0:100e:712:2ba5:63af:4077:4515]) (user=ndesaulniers job=sendgmr) by 2002:a17:903:2351:b0:181:68a8:9f9c with SMTP id c17-20020a170903235100b0018168a89f9cmr7043437plh.115.1665778448305; Fri, 14 Oct 2022 13:14:08 -0700 (PDT) Date: Fri, 14 Oct 2022 13:13:51 -0700 In-Reply-To: <20221014201354.3190007-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <20221014201354.3190007-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=UIrHvErwpgNbhCkRZAYSX0CFd/XFEwqX3D0xqtqjNug= X-Developer-Signature: v=1; a=ed25519-sha256; t=1665778433; l=4007; i=ndesaulniers@google.com; s=20220923; h=from:subject; bh=XFiK8v7Ofros3NhMcAkCbMIm1L6g9zzm1gIpb9nZops=; b=UCUZB8NQR1HsjQzqCH+jS/nqSRc0/wpX9vPy7Pb2Ols3E7tqNnIHUsF81BE/YEh0EcS1X2Ky6URN rEa2p/CSCRh53eRwp3EI5XU3oR0m7boibgTA/jRIyZ6/nsDQOts8 X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog Message-ID: <20221014201354.3190007-2-ndesaulniers@google.com> Subject: [PATCH v4 1/4] ARM: remove lazy evaluation in Makefile From: Nick Desaulniers To: Russell King Cc: Arnd Bergmann , Ard Biesheuvel , Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nathan Chancellor , Nick Desaulniers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" arch-y and tune-y used lazy evaluation since they used to contain cc-option checks. They don't any longer, so just eagerly evaluate these command line flags. Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor --- No change from v3. arch/arm/Makefile | 60 +++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c846119c448f..8dd943b50b7d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -63,44 +63,38 @@ KBUILD_CFLAGS +=3D $(call cc-option,-fno-ipa-sra) # 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) =3D-D__LINUX_ARM_ARCH__=3D7 -march=3Darmv7-m -arch-$(CONFIG_CPU_32v7) =3D-D__LINUX_ARM_ARCH__=3D7 -march=3Darmv7-a -arch-$(CONFIG_CPU_32v6) =3D-D__LINUX_ARM_ARCH__=3D6 -march=3Darmv6 -# Only override the compiler option if ARMv6. The ARMv6K extensions are +arch-$(CONFIG_CPU_32v7M) :=3D-D__LINUX_ARM_ARCH__=3D7 -march=3Darmv7-m +arch-$(CONFIG_CPU_32v7) :=3D-D__LINUX_ARM_ARCH__=3D7 -march=3Darmv7-a +arch-$(CONFIG_CPU_32v6) :=3D-D__LINUX_ARM_ARCH__=3D6 -march=3Darmv6 +# Only override the compiler opt:ion if ARMv6. The ARMv6K extensions are # always available in ARMv7 ifeq ($(CONFIG_CPU_32v6),y) -arch-$(CONFIG_CPU_32v6K) =3D-D__LINUX_ARM_ARCH__=3D6 -march=3Darmv6k +arch-$(CONFIG_CPU_32v6K) :=3D-D__LINUX_ARM_ARCH__=3D6 -march=3Darmv6k endif -arch-$(CONFIG_CPU_32v5) =3D-D__LINUX_ARM_ARCH__=3D5 -march=3Darmv5te -arch-$(CONFIG_CPU_32v4T) =3D-D__LINUX_ARM_ARCH__=3D4 -march=3Darmv4t -arch-$(CONFIG_CPU_32v4) =3D-D__LINUX_ARM_ARCH__=3D4 -march=3Darmv4 -arch-$(CONFIG_CPU_32v3) =3D-D__LINUX_ARM_ARCH__=3D3 -march=3Darmv3m - -# Evaluate arch cc-option calls now -arch-y :=3D $(arch-y) +arch-$(CONFIG_CPU_32v5) :=3D-D__LINUX_ARM_ARCH__=3D5 -march=3Darmv5te +arch-$(CONFIG_CPU_32v4T) :=3D-D__LINUX_ARM_ARCH__=3D4 -march=3Darmv4t +arch-$(CONFIG_CPU_32v4) :=3D-D__LINUX_ARM_ARCH__=3D4 -march=3Darmv4 +arch-$(CONFIG_CPU_32v3) :=3D-D__LINUX_ARM_ARCH__=3D3 -march=3Darmv3m =20 # This selects how we optimise for the processor. -tune-$(CONFIG_CPU_ARM7TDMI) =3D-mtune=3Darm7tdmi -tune-$(CONFIG_CPU_ARM720T) =3D-mtune=3Darm7tdmi -tune-$(CONFIG_CPU_ARM740T) =3D-mtune=3Darm7tdmi -tune-$(CONFIG_CPU_ARM9TDMI) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_ARM940T) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_ARM946E) =3D-mtune=3Darm9e -tune-$(CONFIG_CPU_ARM920T) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_ARM922T) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_ARM925T) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_ARM926T) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_FA526) =3D-mtune=3Darm9tdmi -tune-$(CONFIG_CPU_SA110) =3D-mtune=3Dstrongarm110 -tune-$(CONFIG_CPU_SA1100) =3D-mtune=3Dstrongarm1100 -tune-$(CONFIG_CPU_XSCALE) =3D-mtune=3Dxscale -tune-$(CONFIG_CPU_XSC3) =3D-mtune=3Dxscale -tune-$(CONFIG_CPU_FEROCEON) =3D-mtune=3Dxscale -tune-$(CONFIG_CPU_V6) =3D-mtune=3Darm1136j-s -tune-$(CONFIG_CPU_V6K) =3D-mtune=3Darm1136j-s - -# Evaluate tune cc-option calls now -tune-y :=3D $(tune-y) +tune-$(CONFIG_CPU_ARM7TDMI) :=3D-mtune=3Darm7tdmi +tune-$(CONFIG_CPU_ARM720T) :=3D-mtune=3Darm7tdmi +tune-$(CONFIG_CPU_ARM740T) :=3D-mtune=3Darm7tdmi +tune-$(CONFIG_CPU_ARM9TDMI) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_ARM940T) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_ARM946E) :=3D-mtune=3Darm9e +tune-$(CONFIG_CPU_ARM920T) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_ARM922T) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_ARM925T) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_ARM926T) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_FA526) :=3D-mtune=3Darm9tdmi +tune-$(CONFIG_CPU_SA110) :=3D-mtune=3Dstrongarm110 +tune-$(CONFIG_CPU_SA1100) :=3D-mtune=3Dstrongarm1100 +tune-$(CONFIG_CPU_XSCALE) :=3D-mtune=3Dxscale +tune-$(CONFIG_CPU_XSC3) :=3D-mtune=3Dxscale +tune-$(CONFIG_CPU_FEROCEON) :=3D-mtune=3Dxscale +tune-$(CONFIG_CPU_V6) :=3D-mtune=3Darm1136j-s +tune-$(CONFIG_CPU_V6K) :=3D-mtune=3Darm1136j-s =20 ifeq ($(CONFIG_AEABI),y) CFLAGS_ABI :=3D-mabi=3Daapcs-linux -mfpu=3Dvfp --=20 2.38.0.413.g74048e4d9e-goog From nobody Thu May 7 23:18:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71259C4332F for ; Fri, 14 Oct 2022 20:14:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231241AbiJNUOV (ORCPT ); Fri, 14 Oct 2022 16:14:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbiJNUOM (ORCPT ); Fri, 14 Oct 2022 16:14:12 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E37D4101D2 for ; Fri, 14 Oct 2022 13:14:10 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id f9-20020a17090a664900b0020ada57adaeso3049716pjm.7 for ; Fri, 14 Oct 2022 13:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4V1w1ZK85iv+g/osbxdE+4HdIBW8TKuHK7GH5Ncfix4=; b=UjBn+YBMCMvoKokEWmD6iVVb+CmRp8QL3WpqKJ8mv/Tr5MteD0GnXQRW9J3KWJtO+/ Gm9C8BKbLFUNTmZ3JZNTfY/PuAnkARN+kxEyQGoAuriDczy8jUY/VTRYJ1DJK9WQZllV cdJ4SjrA04VVZiu6+gDYU9E+JABdxMrCSyUybd1Ck3JJUyzVKIDfVMVle/cF3ZJWu+BA SR9mGLf52iGHCOdPRhYwkQj08ViJqDkJt+//QFpYhKCyzYa9PUVUs7qm4fy9GxY1vgo2 9WmMSNwUM5PDmsLW7733Ah1n+XOetkkn5BuyX1qEONHh1kRwka+GAYwKWso4JZ97rpO+ u96A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4V1w1ZK85iv+g/osbxdE+4HdIBW8TKuHK7GH5Ncfix4=; b=CkEQB5uOuinH6h3f2csA2wIVVdDWcJNVHRnYTpTVEU+iwt+I9SwtVcMmzQE4M+LnK5 ZQq0Jxxt49qVi8WcvjAw0yUbyJvrDKfnwetGqNZooDhynBLNw3GgP60MmGvnQKL+JSEW o6Y/fMoX6kUDkpUjGsXNOQd6IX/3EqKtxrai3Bgzgiz2i81uRDHaQzLUm24PcsS+SPyW IQF0Hg1WusnWIHnLIoKdLCRcIT3pZ0SHBLwgSlGVg7/J1N6cD0uaAWGdmXeuTBFiyd9r dpD2VQakAGZnHR8oaHLpcoE7Pt+IkKZNEIlFmBG+f5VfKHznXRRt8RWjdXku9AhC1Tj7 CouA== X-Gm-Message-State: ACrzQf2skpFfcgN1yp+wJftkQSoC7/ilXU6vBVcIju6E2V6IrZcV0YX6 QKQeoNuId30fIZKKHk6ZX9G8popjyy6tMAIsUZA= X-Google-Smtp-Source: AMsMyM5KhhNWGT3EKmladXCzyff6T3V13esS8iuzi00rkzT1EcbaUyM8H/agSlq9e94Sgk3Chx9Y4PlYi8qCPIskobI= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:0:100e:712:2ba5:63af:4077:4515]) (user=ndesaulniers job=sendgmr) by 2002:a17:90b:3b47:b0:20d:a991:3f24 with SMTP id ot7-20020a17090b3b4700b0020da9913f24mr10295875pjb.108.1665778450422; Fri, 14 Oct 2022 13:14:10 -0700 (PDT) Date: Fri, 14 Oct 2022 13:13:52 -0700 In-Reply-To: <20221014201354.3190007-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <20221014201354.3190007-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=UIrHvErwpgNbhCkRZAYSX0CFd/XFEwqX3D0xqtqjNug= X-Developer-Signature: v=1; a=ed25519-sha256; t=1665778433; l=22152; i=ndesaulniers@google.com; s=20220923; h=from:subject; bh=+4Yn29WimkqMMpF6pODmaTBXzzr3LxUMjlHYak9mUQ8=; b=WDa29aBJ406/AaI8Ll5V6aeyUH31p7Go0ve9hapjo24wVpzH4c0KrnNBfy/kjrIWPmOEKPzS46Vc ghUUqvN9DBLfSee3EWQ1nr9/A3oNq83M95E3qTpEMgwPv3tld3hS X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog Message-ID: <20221014201354.3190007-3-ndesaulniers@google.com> Subject: [PATCH v4 2/4] ARM: use .arch directives instead of assembler command line flags From: Nick Desaulniers To: Russell King Cc: Arnd Bergmann , Ard Biesheuvel , Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nathan Chancellor , Nick Desaulniers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to commit a6c30873ee4a ("ARM: 8989/1: use .fpu assembler directives instead of assembler arguments"). GCC and GNU binutils support setting the "sub arch" via -march=3D, -Wa,-march, target function attribute, and .arch assembler directive. Clang was missing support for -Wa,-march=3D, but this was implemented in clang-13. The behavior of both GCC and Clang is to prefer -Wa,-march=3D over -march=3D for assembler and assembler-with-cpp sources, but Clang will warn about the -march=3D being unused. clang: warning: argument unused during compilation: '-march=3Darmv6k' [-Wunused-command-line-argument] Since most assembler is non-conditionally assembled with one sub arch (modulo arch/arm/delay-loop.S which conditionally is assembled as armv4 based on CONFIG_ARCH_RPC, and arch/arm/mach-at91/pm-suspend.S which is conditionally assembled as armv7-a based on CONFIG_CPU_V7), prefer the .arch assembler directive. Add a few more instances found in compile testing as found by Arnd and Nathan. Link: https://github.com/llvm/llvm-project/commit/1d51c699b9e2ebc5bcfdbe85c= 74cc871426333d4 Link: https://bugs.llvm.org/show_bug.cgi?id=3D48894 Link: https://github.com/ClangBuiltLinux/linux/issues/1195 Link: https://github.com/ClangBuiltLinux/linux/issues/1315 Suggested-by: Arnd Bergmann Suggested-by: Nathan Chancellor Signed-off-by: Arnd Bergmann Signed-off-by: Nick Desaulniers Tested-by: Nathan Chancellor --- Changes v3 -> v4: * Add .arch armv7-a to arch/arm/mach-tegra/sleep.S as per Nathan. https://github.com/ClangBuiltLinux/linux/issues/1315#issuecomment-1255646= 893 * Add Nathan's SB tag. arch/arm/boot/compressed/Makefile | 1 - arch/arm/common/Makefile | 2 -- arch/arm/common/mcpm_head.S | 2 ++ arch/arm/common/vlock.S | 2 ++ arch/arm/kernel/Makefile | 2 -- arch/arm/kernel/hyp-stub.S | 2 ++ arch/arm/kernel/swp_emulate.c | 1 + arch/arm/lib/Makefile | 4 ---- arch/arm/lib/delay-loop.S | 4 ++++ arch/arm/mach-at91/Makefile | 3 --- arch/arm/mach-at91/pm_suspend.S | 4 ++++ arch/arm/mach-imx/Makefile | 3 --- arch/arm/mach-imx/headsmp.S | 2 ++ arch/arm/mach-imx/resume-imx6.S | 2 ++ arch/arm/mach-imx/suspend-imx6.S | 2 ++ arch/arm/mach-mvebu/Makefile | 3 --- arch/arm/mach-mvebu/coherency_ll.S | 1 + arch/arm/mach-mvebu/pmsu.c | 1 + arch/arm/mach-npcm/Makefile | 2 -- arch/arm/mach-npcm/headsmp.S | 2 ++ arch/arm/mach-tegra/Makefile | 2 -- arch/arm/mach-tegra/reset-handler.S | 2 ++ arch/arm/mach-tegra/sleep-tegra20.S | 2 ++ arch/arm/mach-tegra/sleep-tegra30.S | 2 ++ arch/arm/mach-tegra/sleep.S | 2 ++ arch/arm/mm/Makefile | 15 --------------- arch/arm/mm/abort-ev6.S | 1 + arch/arm/mm/abort-ev7.S | 1 + arch/arm/mm/cache-v6.S | 2 ++ arch/arm/mm/cache-v7.S | 2 ++ arch/arm/mm/cache-v7m.S | 2 ++ arch/arm/mm/copypage-feroceon.c | 1 + arch/arm/mm/proc-v6.S | 2 ++ arch/arm/mm/proc-v7-2level.S | 2 ++ arch/arm/mm/proc-v7.S | 2 ++ arch/arm/mm/tlb-v6.S | 2 ++ arch/arm/mm/tlb-v7.S | 2 ++ drivers/memory/Makefile | 2 -- drivers/memory/ti-emif-sram-pm.S | 1 + drivers/soc/bcm/brcmstb/pm/Makefile | 1 - drivers/soc/bcm/brcmstb/pm/s2-arm.S | 1 + 41 files changed, 54 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/M= akefile index 41bcbb460fac..e5c80ff42a4f 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -163,4 +163,3 @@ $(obj)/piggy_data: $(obj)/../Image FORCE $(obj)/piggy.o: $(obj)/piggy_data =20 CFLAGS_font.o :=3D -Dstatic=3D -AFLAGS_hyp-stub.o :=3D -Wa,-march=3Darmv7-a diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 7bae8cbaafe7..9733381074e0 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -13,7 +13,5 @@ obj-$(CONFIG_SHARP_SCOOP) +=3D scoop.o obj-$(CONFIG_CPU_V7) +=3D secure_cntvoff.o obj-$(CONFIG_MCPM) +=3D mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o CFLAGS_REMOVE_mcpm_entry.o =3D -pg -AFLAGS_mcpm_head.o :=3D -march=3Darmv7-a -AFLAGS_vlock.o :=3D -march=3Darmv7-a obj-$(CONFIG_BL_SWITCHER) +=3D bL_switcher.o obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) +=3D bL_switcher_dummy_if.o diff --git a/arch/arm/common/mcpm_head.S b/arch/arm/common/mcpm_head.S index 291d969bc719..299495c43dfd 100644 --- a/arch/arm/common/mcpm_head.S +++ b/arch/arm/common/mcpm_head.S @@ -15,6 +15,8 @@ =20 #include "vlock.h" =20 +.arch armv7-a + .if MCPM_SYNC_CLUSTER_CPUS .error "cpus must be the first member of struct mcpm_sync_struct" .endif diff --git a/arch/arm/common/vlock.S b/arch/arm/common/vlock.S index f1c7fd44f1b1..1fa09c4697ed 100644 --- a/arch/arm/common/vlock.S +++ b/arch/arm/common/vlock.S @@ -12,6 +12,8 @@ #include #include "vlock.h" =20 +.arch armv7-a + /* Select different code if voting flags can fit in a single word. */ #if VLOCK_VOTING_SIZE > 4 #define FEW(x...) diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 48737ec800eb..d53f56d6f840 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -70,7 +70,6 @@ obj-$(CONFIG_HAVE_TCM) +=3D tcm.o obj-$(CONFIG_OF) +=3D devtree.o obj-$(CONFIG_CRASH_DUMP) +=3D crash_dump.o obj-$(CONFIG_SWP_EMULATE) +=3D swp_emulate.o -CFLAGS_swp_emulate.o :=3D -Wa,-march=3Darmv7-a obj-$(CONFIG_HAVE_HW_BREAKPOINT) +=3D hw_breakpoint.o =20 obj-$(CONFIG_CPU_XSCALE) +=3D xscale-cp0.o @@ -99,7 +98,6 @@ CFLAGS_head-inflate-data.o :=3D $(call cc-option,-Wframe-= larger-than=3D10240) obj-$(CONFIG_XIP_DEFLATED_DATA) +=3D head-inflate-data.o =20 obj-$(CONFIG_ARM_VIRT_EXT) +=3D hyp-stub.o -AFLAGS_hyp-stub.o :=3D-Wa,-march=3Darmv7-a ifeq ($(CONFIG_ARM_PSCI),y) obj-$(CONFIG_SMP) +=3D psci_smp.o endif diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index b699b22a4db1..3a506b9095a5 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -9,6 +9,8 @@ #include #include =20 +.arch armv7-a + #ifndef ZIMAGE /* * For the kernel proper, we need to find out the CPU boot mode long after diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c index b74bfcf94fb1..fdce83c95acb 100644 --- a/arch/arm/kernel/swp_emulate.c +++ b/arch/arm/kernel/swp_emulate.c @@ -34,6 +34,7 @@ */ #define __user_swpX_asm(data, addr, res, temp, B) \ __asm__ __volatile__( \ + ".arch armv7-a\n" \ "0: ldrex"B" %2, [%3]\n" \ "1: strex"B" %0, %1, [%3]\n" \ " cmp %0, #0\n" \ diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 6d2ba454f25b..42fb75c06647 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -36,10 +36,6 @@ else lib-y +=3D io-readsw-armv4.o io-writesw-armv4.o endif =20 -ifeq ($(CONFIG_ARCH_RPC),y) - AFLAGS_delay-loop.o +=3D -march=3Darmv4 -endif - $(obj)/csumpartialcopy.o: $(obj)/csumpartialcopygeneric.S $(obj)/csumpartialcopyuser.o: $(obj)/csumpartialcopygeneric.S =20 diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S index 3ccade0f8130..3ac05177d097 100644 --- a/arch/arm/lib/delay-loop.S +++ b/arch/arm/lib/delay-loop.S @@ -8,6 +8,10 @@ #include #include =20 +#ifdef CONFIG_ARCH_RPC + .arch armv4 +#endif + .text =20 .LC0: .word loops_per_jiffy diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 0dcc37180588..794bd12ab0a8 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -14,9 +14,6 @@ obj-$(CONFIG_SOC_SAMV7) +=3D samv7.o # Power Management obj-$(CONFIG_ATMEL_PM) +=3D pm.o pm_suspend.o =20 -ifeq ($(CONFIG_CPU_V7),y) -AFLAGS_pm_suspend.o :=3D -march=3Darmv7-a -endif ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o +=3D -DDEBUG endif diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspen= d.S index ffed4d949042..78d65809155f 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -12,6 +12,10 @@ #include "pm.h" #include "pm_data-offsets.h" =20 +#ifdef CONFIG_CPU_V7 +.arch armv7-a +#endif + #define SRAMC_SELF_FRESH_ACTIVE 0x01 #define SRAMC_SELF_FRESH_EXIT 0x00 =20 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 6fb3965b9ae6..5c650bf40e02 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -34,7 +34,6 @@ obj-$(CONFIG_HAVE_IMX_GPC) +=3D gpc.o obj-$(CONFIG_HAVE_IMX_MMDC) +=3D mmdc.o obj-$(CONFIG_HAVE_IMX_SRC) +=3D src.o ifneq ($(CONFIG_SOC_IMX6)$(CONFIG_SOC_IMX7D_CA7)$(CONFIG_SOC_LS1021A),) -AFLAGS_headsmp.o :=3D-Wa,-march=3Darmv7-a obj-$(CONFIG_SMP) +=3D headsmp.o platsmp.o obj-$(CONFIG_HOTPLUG_CPU) +=3D hotplug.o endif @@ -48,12 +47,10 @@ obj-$(CONFIG_SOC_IMX7D_CM4) +=3D mach-imx7d-cm4.o obj-$(CONFIG_SOC_IMX7ULP) +=3D mach-imx7ulp.o pm-imx7ulp.o =20 ifeq ($(CONFIG_SUSPEND),y) -AFLAGS_suspend-imx6.o :=3D-Wa,-march=3Darmv7-a obj-$(CONFIG_SOC_IMX6) +=3D suspend-imx6.o obj-$(CONFIG_SOC_IMX53) +=3D suspend-imx53.o endif ifeq ($(CONFIG_ARM_CPU_SUSPEND),y) -AFLAGS_resume-imx6.o :=3D-Wa,-march=3Darmv7-a obj-$(CONFIG_SOC_IMX6) +=3D resume-imx6.o endif obj-$(CONFIG_SOC_IMX6) +=3D pm-imx6.o diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S index fcba58be8e79..5f9c7b48ae80 100644 --- a/arch/arm/mach-imx/headsmp.S +++ b/arch/arm/mach-imx/headsmp.S @@ -8,6 +8,8 @@ #include #include =20 +.arch armv7-a + diag_reg_offset: .word g_diag_reg - . =20 diff --git a/arch/arm/mach-imx/resume-imx6.S b/arch/arm/mach-imx/resume-imx= 6.S index 5bd1ba7ef15b..2c0c5c771251 100644 --- a/arch/arm/mach-imx/resume-imx6.S +++ b/arch/arm/mach-imx/resume-imx6.S @@ -9,6 +9,8 @@ #include #include "hardware.h" =20 +.arch armv7-a + /* * The following code must assume it is running from physical address * where absolute virtual addresses to the data section have to be diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-i= mx6.S index e06f946b75b9..63ccc2d0e920 100644 --- a/arch/arm/mach-imx/suspend-imx6.S +++ b/arch/arm/mach-imx/suspend-imx6.S @@ -9,6 +9,8 @@ #include #include "hardware.h" =20 +.arch armv7-a + /* * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D low level = suspend =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D * diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index c21733cbb4fa..569768a69ffc 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,9 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 ccflags-y :=3D -I$(srctree)/arch/arm/plat-orion/include =20 -AFLAGS_coherency_ll.o :=3D -Wa,-march=3Darmv7-a -CFLAGS_pmsu.o :=3D -march=3Darmv7-a - obj-$(CONFIG_MACH_MVEBU_ANY) +=3D system-controller.o mvebu-soc-id.o =20 ifeq ($(CONFIG_MACH_MVEBU_V7),y) diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coher= ency_ll.S index eb81656e32d4..35930e03d9c6 100644 --- a/arch/arm/mach-mvebu/coherency_ll.S +++ b/arch/arm/mach-mvebu/coherency_ll.S @@ -20,6 +20,7 @@ #include #include =20 + .arch armv7-a .text /* * Returns the coherency base address in r1 (r0 is untouched), or 0 if diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c index af27a7156675..6f366d8c4231 100644 --- a/arch/arm/mach-mvebu/pmsu.c +++ b/arch/arm/mach-mvebu/pmsu.c @@ -291,6 +291,7 @@ int armada_370_xp_pmsu_idle_enter(unsigned long deepidl= e) =20 /* Test the CR_C bit and set it if it was cleared */ asm volatile( + ".arch armv7-a\n\t" "mrc p15, 0, r0, c1, c0, 0 \n\t" "tst r0, %0 \n\t" "orreq r0, r0, #(1 << 2) \n\t" diff --git a/arch/arm/mach-npcm/Makefile b/arch/arm/mach-npcm/Makefile index 8d61fcd42fb1..ac83e1caf2ee 100644 --- a/arch/arm/mach-npcm/Makefile +++ b/arch/arm/mach-npcm/Makefile @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -AFLAGS_headsmp.o +=3D -march=3Darmv7-a - obj-$(CONFIG_ARCH_WPCM450) +=3D wpcm450.o obj-$(CONFIG_ARCH_NPCM7XX) +=3D npcm7xx.o obj-$(CONFIG_SMP) +=3D platsmp.o headsmp.o diff --git a/arch/arm/mach-npcm/headsmp.S b/arch/arm/mach-npcm/headsmp.S index c083fe09a07b..84d2b6daaf0b 100644 --- a/arch/arm/mach-npcm/headsmp.S +++ b/arch/arm/mach-npcm/headsmp.S @@ -6,6 +6,8 @@ #include #include =20 +.arch armv7-a + /* * The boot ROM does not start secondary CPUs in SVC mode, so we need to d= o that * here. diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 07572b5373b8..a2bb55bc0081 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -asflags-y +=3D -march=3Darmv7-a - obj-y +=3D io.o obj-y +=3D irq.o obj-y +=3D pm.o diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/rese= t-handler.S index 06ca44b09381..0ea456264f3e 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -19,6 +19,8 @@ =20 #define PMC_SCRATCH41 0x140 =20 +.arch armv7-a + #ifdef CONFIG_PM_SLEEP /* * tegra_resume diff --git a/arch/arm/mach-tegra/sleep-tegra20.S b/arch/arm/mach-tegra/slee= p-tegra20.S index a5a36cce142a..d8cd487a8f63 100644 --- a/arch/arm/mach-tegra/sleep-tegra20.S +++ b/arch/arm/mach-tegra/sleep-tegra20.S @@ -47,6 +47,8 @@ #define PLLM_STORE_MASK (1 << 1) #define PLLP_STORE_MASK (1 << 2) =20 +.arch armv7-a + .macro test_pll_state, rd, test_mask ldr \rd, tegra_pll_state tst \rd, #\test_mask diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/slee= p-tegra30.S index 0cc40b6b2ba3..134ea5fe49b2 100644 --- a/arch/arm/mach-tegra/sleep-tegra30.S +++ b/arch/arm/mach-tegra/sleep-tegra30.S @@ -78,6 +78,8 @@ #define PLLX_STORE_MASK (1 << 4) #define PLLM_PMC_STORE_MASK (1 << 5) =20 +.arch armv7-a + .macro emc_device_mask, rd, base ldr \rd, [\base, #EMC_ADR_CFG] tst \rd, #0x1 diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 8f88944831c5..945f2c1474f7 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -22,6 +22,8 @@ #define CLK_RESET_CCLK_BURST 0x20 #define CLK_RESET_CCLK_DIVIDER 0x24 =20 +.arch armv7-a + #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PM_SLEEP) /* * tegra_disable_clean_inv_dcache diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 3510503bc5e6..71b858c9b10c 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -33,9 +33,6 @@ obj-$(CONFIG_CPU_ABRT_EV5TJ) +=3D abort-ev5tj.o obj-$(CONFIG_CPU_ABRT_EV6) +=3D abort-ev6.o obj-$(CONFIG_CPU_ABRT_EV7) +=3D abort-ev7.o =20 -AFLAGS_abort-ev6.o :=3D-Wa,-march=3Darmv6k -AFLAGS_abort-ev7.o :=3D-Wa,-march=3Darmv7-a - obj-$(CONFIG_CPU_PABRT_LEGACY) +=3D pabort-legacy.o obj-$(CONFIG_CPU_PABRT_V6) +=3D pabort-v6.o obj-$(CONFIG_CPU_PABRT_V7) +=3D pabort-v7.o @@ -49,10 +46,6 @@ obj-$(CONFIG_CPU_CACHE_FA) +=3D cache-fa.o obj-$(CONFIG_CPU_CACHE_NOP) +=3D cache-nop.o obj-$(CONFIG_CPU_CACHE_V7M) +=3D cache-v7m.o =20 -AFLAGS_cache-v6.o :=3D-Wa,-march=3Darmv6 -AFLAGS_cache-v7.o :=3D-Wa,-march=3Darmv7-a -AFLAGS_cache-v7m.o :=3D-Wa,-march=3Darmv7-m - obj-$(CONFIG_CPU_COPY_V4WT) +=3D copypage-v4wt.o obj-$(CONFIG_CPU_COPY_V4WB) +=3D copypage-v4wb.o obj-$(CONFIG_CPU_COPY_FEROCEON) +=3D copypage-feroceon.o @@ -62,8 +55,6 @@ obj-$(CONFIG_CPU_XSCALE) +=3D copypage-xscale.o obj-$(CONFIG_CPU_XSC3) +=3D copypage-xsc3.o obj-$(CONFIG_CPU_COPY_FA) +=3D copypage-fa.o =20 -CFLAGS_copypage-feroceon.o :=3D -march=3Darmv5te - obj-$(CONFIG_CPU_TLB_V4WT) +=3D tlb-v4.o obj-$(CONFIG_CPU_TLB_V4WB) +=3D tlb-v4wb.o obj-$(CONFIG_CPU_TLB_V4WBI) +=3D tlb-v4wbi.o @@ -72,9 +63,6 @@ obj-$(CONFIG_CPU_TLB_V6) +=3D tlb-v6.o obj-$(CONFIG_CPU_TLB_V7) +=3D tlb-v7.o obj-$(CONFIG_CPU_TLB_FA) +=3D tlb-fa.o =20 -AFLAGS_tlb-v6.o :=3D-Wa,-march=3Darmv6 -AFLAGS_tlb-v7.o :=3D-Wa,-march=3Darmv7-a - obj-$(CONFIG_CPU_ARM7TDMI) +=3D proc-arm7tdmi.o obj-$(CONFIG_CPU_ARM720T) +=3D proc-arm720.o obj-$(CONFIG_CPU_ARM740T) +=3D proc-arm740.o @@ -101,9 +89,6 @@ obj-$(CONFIG_CPU_V6K) +=3D proc-v6.o obj-$(CONFIG_CPU_V7) +=3D proc-v7.o proc-v7-bugs.o obj-$(CONFIG_CPU_V7M) +=3D proc-v7m.o =20 -AFLAGS_proc-v6.o :=3D-Wa,-march=3Darmv6 -AFLAGS_proc-v7.o :=3D-Wa,-march=3Darmv7-a - obj-$(CONFIG_OUTER_CACHE) +=3D l2c-common.o obj-$(CONFIG_CACHE_B15_RAC) +=3D cache-b15-rac.o obj-$(CONFIG_CACHE_FEROCEON_L2) +=3D cache-feroceon-l2.o diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index c58bf8b43fea..836dc1299243 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S @@ -16,6 +16,7 @@ * abort here if the I-TLB and D-TLB aren't seeing the same * picture. Unfortunately, this does happen. We live with it. */ + .arch armv6k .align 5 ENTRY(v6_early_abort) mrc p15, 0, r1, c5, c0, 0 @ get FSR diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S index f81bceacc660..53fb41c24774 100644 --- a/arch/arm/mm/abort-ev7.S +++ b/arch/arm/mm/abort-ev7.S @@ -12,6 +12,7 @@ * * Purpose : obtain information about current aborted instruction. */ + .arch armv7-a .align 5 ENTRY(v7_early_abort) mrc p15, 0, r1, c5, c0, 0 @ get FSR diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S index f0f65eb073e4..250c83bf7158 100644 --- a/arch/arm/mm/cache-v6.S +++ b/arch/arm/mm/cache-v6.S @@ -19,6 +19,8 @@ #define D_CACHE_LINE_SIZE 32 #define BTB_FLUSH_SIZE 8 =20 +.arch armv6 + /* * v6_flush_icache_all() * diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index 7c9499b728c4..127afe2096ba 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -16,6 +16,8 @@ =20 #include "proc-macros.S" =20 +.arch armv7-a + #ifdef CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND .globl icache_size .data diff --git a/arch/arm/mm/cache-v7m.S b/arch/arm/mm/cache-v7m.S index 1bc3a0a50753..eb60b5e5e2ad 100644 --- a/arch/arm/mm/cache-v7m.S +++ b/arch/arm/mm/cache-v7m.S @@ -18,6 +18,8 @@ =20 #include "proc-macros.S" =20 +.arch armv7-m + /* Generic V7M read/write macros for memory mapped cache operations */ .macro v7m_cache_read, rt, reg movw \rt, #:lower16:BASEADDR_V7M_SCB + \reg diff --git a/arch/arm/mm/copypage-feroceon.c b/arch/arm/mm/copypage-feroceo= n.c index 064b19e63571..5fc8ef1e665f 100644 --- a/arch/arm/mm/copypage-feroceon.c +++ b/arch/arm/mm/copypage-feroceon.c @@ -15,6 +15,7 @@ static void feroceon_copy_user_page(void *kto, const void= *kfrom) int tmp; =20 asm volatile ("\ +.arch armv5te \n\ 1: ldmia %1!, {r2 - r7, ip, lr} \n\ pld [%1, #0] \n\ pld [%1, #32] \n\ diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index a0618f3e6836..203dff89ab1a 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -32,6 +32,8 @@ #define TTB_FLAGS_SMP TTB_RGN_WBWA|TTB_S #define PMD_FLAGS_SMP PMD_SECT_WBWA|PMD_SECT_S =20 +.arch armv6 + ENTRY(cpu_v6_proc_init) ret lr =20 diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S index 5db029c8f987..0a3083ad19c2 100644 --- a/arch/arm/mm/proc-v7-2level.S +++ b/arch/arm/mm/proc-v7-2level.S @@ -24,6 +24,8 @@ #define TTB_FLAGS_SMP TTB_IRGN_WBWA|TTB_S|TTB_NOS|TTB_RGN_OC_WBWA #define PMD_FLAGS_SMP PMD_SECT_WBWA|PMD_SECT_S =20 +.arch armv7-a + /* * cpu_v7_switch_mm(pgd_phys, tsk) * diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 26d726a08a34..6b4ef9539b68 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -24,6 +24,8 @@ #include "proc-v7-2level.S" #endif =20 +.arch armv7-a + ENTRY(cpu_v7_proc_init) ret lr ENDPROC(cpu_v7_proc_init) diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S index 74f4b383afe3..1d91e49b2c2d 100644 --- a/arch/arm/mm/tlb-v6.S +++ b/arch/arm/mm/tlb-v6.S @@ -17,6 +17,8 @@ =20 #define HARVARD_TLB =20 +.arch armv6 + /* * v6wbi_flush_user_tlb_range(start, end, vma) * diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S index 87bf4ab17721..35fd6d4f0d03 100644 --- a/arch/arm/mm/tlb-v7.S +++ b/arch/arm/mm/tlb-v7.S @@ -16,6 +16,8 @@ #include #include "proc-macros.S" =20 +.arch armv7-a + /* * v7wbi_flush_user_tlb_range(start, end, vma) * diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index e148f636c082..ae14ded464a8 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -33,8 +33,6 @@ obj-$(CONFIG_FPGA_DFL_EMIF) +=3D dfl-emif.o =20 ti-emif-sram-objs :=3D ti-emif-pm.o ti-emif-sram-pm.o =20 -AFLAGS_ti-emif-sram-pm.o :=3D-Wa,-march=3Darmv7-a - $(obj)/ti-emif-sram-pm.o: $(obj)/ti-emif-asm-offsets.h =20 $(obj)/ti-emif-asm-offsets.h: $(obj)/emif-asm-offsets.s FORCE diff --git a/drivers/memory/ti-emif-sram-pm.S b/drivers/memory/ti-emif-sram= -pm.S index 9bcac35c3304..d60a8cfd63f3 100644 --- a/drivers/memory/ti-emif-sram-pm.S +++ b/drivers/memory/ti-emif-sram-pm.S @@ -28,6 +28,7 @@ =20 .arm .align 3 + .arch armv7-a =20 ENTRY(ti_emif_sram) =20 diff --git a/drivers/soc/bcm/brcmstb/pm/Makefile b/drivers/soc/bcm/brcmstb/= pm/Makefile index 8e10abb14f8b..f849cfa69446 100644 --- a/drivers/soc/bcm/brcmstb/pm/Makefile +++ b/drivers/soc/bcm/brcmstb/pm/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_ARM) +=3D s2-arm.o pm-arm.o -AFLAGS_s2-arm.o :=3D -march=3Darmv7-a obj-$(CONFIG_BMIPS_GENERIC) +=3D s2-mips.o s3-mips.o pm-mips.o diff --git a/drivers/soc/bcm/brcmstb/pm/s2-arm.S b/drivers/soc/bcm/brcmstb/= pm/s2-arm.S index 5f0c4a8ae9df..0d693795de27 100644 --- a/drivers/soc/bcm/brcmstb/pm/s2-arm.S +++ b/drivers/soc/bcm/brcmstb/pm/s2-arm.S @@ -8,6 +8,7 @@ =20 #include "pm.h" =20 + .arch armv7-a .text .align 3 =20 --=20 2.38.0.413.g74048e4d9e-goog From nobody Thu May 7 23:18:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48B3BC4332F for ; Fri, 14 Oct 2022 20:14:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230139AbiJNUOX (ORCPT ); Fri, 14 Oct 2022 16:14:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231145AbiJNUOO (ORCPT ); Fri, 14 Oct 2022 16:14:14 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 208F32656F for ; Fri, 14 Oct 2022 13:14:13 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id t4-20020a635344000000b0045fe7baa222so3129447pgl.13 for ; Fri, 14 Oct 2022 13:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=g8mJKRUhkPO00K8I7nJ7lKtujFUxdFbhGR6doaLvrDA=; b=BYM366/GijWPTopDA+VEKZCw8lt94RZAa7uz9fHy13iIxLmF/SiRvm6EKXw4XkFrVC 0/AFpRSo+OkTcJcEowFM26R/wt2WYyUk++ENn0H40iFDFIrigMFwh8BWRUOE7iRYNd2P qKAY3+4ocVgvva99hRSjvPK9PZJ6zk4lV45RCTz0FkCeST3ME72YjlFgv3742PGmb+0j n7bXvVs99h6QQWxXId6qDWLzlfR0W5inoQJkEbJAKTb3U1mef5pUMKhTwlFV7xn8i8H5 VWMmkzgTvlXM/Le7Z9DDzVYzaw2o6i0FoK8vu+l/U+FukJtX932a+ixfNqPrxYRR+d0a XGFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=g8mJKRUhkPO00K8I7nJ7lKtujFUxdFbhGR6doaLvrDA=; b=h1ADXrqFHkjuLGFk/ibqUCSpfktmgIxF3tQHT8CI0zVWdHd+WDvbjSMazdwFrWlyc/ UMcBiNdPLpBxrfO/enZw22chba83183o9vhmr86dTWxafM89zBKEYFz6kyM/nO+3NeCU F7OYzj2l3OJAGLSiCyDPIX8PU8cZxWcEu78WDte4EvrF8OuSti4dSL2GGOvU6x94WBVh 40qlDYRcZKITMCpZU+1HNm5cDMLxsS/v/2Kp6qCT7DdgQ4m85Z1/2A8tlcb+MzommHqs xf/djs7wqk80sSpkYX6etnbHDpVHoZA09J9qADr3rVkGkhx4EROAlspSHmmld2RLLtv6 PGJw== X-Gm-Message-State: ACrzQf00Fkuy2silRZLDLE4HkWo/oVignwO5qg9wMEWlsOkbO+wGJ0bi jt7bLf1yV6aC1IZhG+5uRBJmAQzJv9lxRUPS8L0= X-Google-Smtp-Source: AMsMyM6+9zpr2T0LPT/BeZEh1rZWUcFwUjwPvlqA2QZ7aSFLVdSq53MFZ5X702ajJs3ldp0bupobvrmNpHPhBX3GB+E= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:0:100e:712:2ba5:63af:4077:4515]) (user=ndesaulniers job=sendgmr) by 2002:a63:f20a:0:b0:464:8c6:f27e with SMTP id v10-20020a63f20a000000b0046408c6f27emr5950038pgh.411.1665778452643; Fri, 14 Oct 2022 13:14:12 -0700 (PDT) Date: Fri, 14 Oct 2022 13:13:53 -0700 In-Reply-To: <20221014201354.3190007-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <20221014201354.3190007-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=UIrHvErwpgNbhCkRZAYSX0CFd/XFEwqX3D0xqtqjNug= X-Developer-Signature: v=1; a=ed25519-sha256; t=1665778434; l=938; i=ndesaulniers@google.com; s=20220923; h=from:subject; bh=ACjI4N5sTL9n0wpGEn6FRvgPw+8Rz09PIyJcQd9YCec=; b=sGDWzyqBWRtnFPlXYn6kJkJaWPxF/mHGnIFQ2BAlp1wGuBNBknNXQsLiZyXK2nnSLBk0d43jnQ3U fmzoIrnOCxUcdMi39cmhiVMeJKrVlAhtyIzU8eFJPCyQj5/IiRBo X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog Message-ID: <20221014201354.3190007-4-ndesaulniers@google.com> Subject: [PATCH v4 3/4] ARM: only use -mtp=cp15 for the compiler From: Nick Desaulniers To: Russell King Cc: Arnd Bergmann , Ard Biesheuvel , Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nathan Chancellor , Nick Desaulniers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Avoids an error from the assembler for CONFIG_THUMB2 kernels: clang-15: error: hardware TLS register is not supported for the thumbv4t sub-architecture This flag only makes sense to pass to the compiler, not the assembler. Perhaps CFLAGS_ABI can be renamed to CPPFLAGS_ABI to reflect that they will be passed to both the compiler and assembler for sources that require pre-processing. Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor --- arch/arm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8dd943b50b7d..ee888070b2ff 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -111,7 +111,7 @@ CFLAGS_ABI +=3D -meabi gnu endif =20 ifeq ($(CONFIG_CURRENT_POINTER_IN_TPIDRURO),y) -CFLAGS_ABI +=3D -mtp=3Dcp15 +KBUILD_CFLAGS +=3D -mtp=3Dcp15 endif =20 # Accept old syntax despite ".syntax unified" --=20 2.38.0.413.g74048e4d9e-goog From nobody Thu May 7 23:18:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2C7CC4332F for ; Fri, 14 Oct 2022 20:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbiJNUO3 (ORCPT ); Fri, 14 Oct 2022 16:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231211AbiJNUOQ (ORCPT ); Fri, 14 Oct 2022 16:14:16 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C74F7186FE for ; Fri, 14 Oct 2022 13:14:15 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id p5-20020a25bd45000000b006beafa0d110so5208441ybm.1 for ; Fri, 14 Oct 2022 13:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=s1u5FCYn8RsWrm4xJEN7PdURIEcHyxJb/9pj2n8isAA=; b=fhvrXFoWhZpC391txksgdYNhBWOVQCBl52aYSUmgLmhInb9/MtPSZeYIGNH/ys8YWI mQSvZiXV1v5iLGTGKg3WLOnb1cFS0+Th+kedZ2Q3zmcpiIRzT5RaNzsSxxtcaNVbbxQo 6C/ki/P9jwc6ECEEO3qyZ7BhL6tV27cjhxD/VeL/TfQ+p/pKemcqLqpJM6t6JMdBSclB h82uZmMBfbIJIfgs+0ai9YWmfThqceTYpj/4W8VtdRmM96JMViT3MmTw9mDdKQfv3xvt kEinfPe2PO+UwyaMeL2LurLmXdFoE/9L88IDkDSdt7gWv/6RRC+AabmHqrVrKTq57VGh UuKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s1u5FCYn8RsWrm4xJEN7PdURIEcHyxJb/9pj2n8isAA=; b=3S2nlx7JKYVzVjDo7mPfSqxM5pBb5R43VqxJHfsC68TcFd8HxUdNS4LU1W+Boh2WGh hq/7hBEuEKjSK/WswwftZLMEfqQMCcsxyZI+gjSxVQPNJiN43+DG6tQ8DjWKWPEG9+Ui rROqxV4Hkf2ZeUqvuCsW+BGweM1Q14OjHVIqrtT8h7mCbzJU0/CFvPRPwyOfqyzlffNs KgkbisXrYckU9CXpfr7t4UyBZjB+8mSniPirgssLygORVHfOpBq6z6b7RONHE4zd0z/p uGrq8qdARsroqAFYFvUfBotwsyQBwpZvxDGQTs3k4idgIstX7myv8rrbtCthbHgW5VfR OCCQ== X-Gm-Message-State: ACrzQf2EtC2oYpmxP09LfFQ0f0jxcDnXnPiO3u4ctTRo7W5y9nKgUZxw ZpNI1x1J9u1AxMWiV5pznPjjz52OGFhFoOLe9IU= X-Google-Smtp-Source: AMsMyM5LJchL6EFofTHHxs4MNR5XzLntxu/R6NAv2OzNylDOZxQp85yFrPbs85r8ne1/8BZAIoLHNBBM5axsYtLlCVM= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:0:100e:712:2ba5:63af:4077:4515]) (user=ndesaulniers job=sendgmr) by 2002:a0d:eb0d:0:b0:356:67be:73ca with SMTP id u13-20020a0deb0d000000b0035667be73camr6144943ywe.108.1665778454896; Fri, 14 Oct 2022 13:14:14 -0700 (PDT) Date: Fri, 14 Oct 2022 13:13:54 -0700 In-Reply-To: <20221014201354.3190007-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <20221014201354.3190007-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=UIrHvErwpgNbhCkRZAYSX0CFd/XFEwqX3D0xqtqjNug= X-Developer-Signature: v=1; a=ed25519-sha256; t=1665778434; l=4916; i=ndesaulniers@google.com; s=20220923; h=from:subject; bh=VxwVKVoT72n36JM/fgC34SDckwipa3adGbKwxRiCt2I=; b=rr6SNqvjfUP45yOE+YAm3SR9cD5RDQnj3V+GfQQxH8pSx9VoCaj7uytjS9DlnvEkq4VZJ0hzDBme Yv8fiIbkB02j4cJV0iSKr9y6pV5x0SIUrX0N5J9BqTNYul2wwy6r X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog Message-ID: <20221014201354.3190007-5-ndesaulniers@google.com> Subject: [PATCH v4 4/4] ARM: pass -march= only to compiler From: Nick Desaulniers To: Russell King Cc: Arnd Bergmann , Ard Biesheuvel , Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nathan Chancellor , Nick Desaulniers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When both -march=3D and -Wa,-march=3D are specified for assembler or assembler-with-cpp sources, GCC and Clang will prefer the -Wa,-march=3D value but Clang will warn that -march=3D is unused. warning: argument unused during compilation: '-march=3Darmv6k' [-Wunused-command-line-argument] This is the top group of warnings we observe when using clang to assemble the kernel via `ARCH=3Darm make LLVM=3D1`. Split the arch-y make variable into two, so that -march=3D 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. Clang is trying to warn that it doesn't support different values for -march=3D and -Wa,-march=3D (like GCC does, but the kernel doesn't need thi= s) though the value of the preprocessor define __thumb2__ is based on -march=3D. Make sure to re-set __thumb2__ via -D flag for assembler sources now that we're no longer passing -march=3D to the assembler. Set it to a different value than the preprocessor would for -march=3D in case -march=3D gets accidentally re-added to KBUILD_AFLAGS in the future. Thanks to Ard and Nathan for this suggestion. Link: https://github.com/ClangBuiltLinux/linux/issues/1315 Link: https://github.com/ClangBuiltLinux/linux/issues/1587 Link: https://github.com/llvm/llvm-project/issues/55656 Suggested-by: Ard Biesheuvel Suggested-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor --- Changes v3 -> v4: * Add -D__thumb2__=3D2 to KBUILD_AFLAGS as per in-person discussion with Ard and Nathan, and their SB tags. * Reword commit message. arch/arm/Makefile | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ee888070b2ff..b58998749ead 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -60,21 +60,34 @@ endif KBUILD_CFLAGS +=3D $(call cc-option,-fno-ipa-sra) =20 # This selects which instruction set is used. +arch-$(CONFIG_CPU_32v7M) :=3D-march=3Darmv7-m +arch-$(CONFIG_CPU_32v7) :=3D-march=3Darmv7-a +arch-$(CONFIG_CPU_32v6) :=3D-march=3Darmv6 +# Only override the compiler option if ARMv6. The ARMv6K extensions are +# always available in ARMv7 +ifeq ($(CONFIG_CPU_32v6),y) +arch-$(CONFIG_CPU_32v6K) :=3D-march=3Darmv6k +endif +arch-$(CONFIG_CPU_32v5) :=3D-march=3Darmv5te +arch-$(CONFIG_CPU_32v4T) :=3D-march=3Darmv4t +arch-$(CONFIG_CPU_32v4) :=3D-march=3Darmv4 +arch-$(CONFIG_CPU_32v3) :=3D-march=3Darmv3m + # 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) :=3D-D__LINUX_ARM_ARCH__=3D7 -march=3Darmv7-m -arch-$(CONFIG_CPU_32v7) :=3D-D__LINUX_ARM_ARCH__=3D7 -march=3Darmv7-a -arch-$(CONFIG_CPU_32v6) :=3D-D__LINUX_ARM_ARCH__=3D6 -march=3Darmv6 -# Only override the compiler opt:ion if ARMv6. The ARMv6K extensions are +cpp-$(CONFIG_CPU_32v7M) :=3D-D__LINUX_ARM_ARCH__=3D7 +cpp-$(CONFIG_CPU_32v7) :=3D-D__LINUX_ARM_ARCH__=3D7 +cpp-$(CONFIG_CPU_32v6) :=3D-D__LINUX_ARM_ARCH__=3D6 +# Only override the compiler option if ARMv6. The ARMv6K extensions are # always available in ARMv7 ifeq ($(CONFIG_CPU_32v6),y) -arch-$(CONFIG_CPU_32v6K) :=3D-D__LINUX_ARM_ARCH__=3D6 -march=3Darmv6k +cpp-$(CONFIG_CPU_32v6K) :=3D-D__LINUX_ARM_ARCH__=3D6 endif -arch-$(CONFIG_CPU_32v5) :=3D-D__LINUX_ARM_ARCH__=3D5 -march=3Darmv5te -arch-$(CONFIG_CPU_32v4T) :=3D-D__LINUX_ARM_ARCH__=3D4 -march=3Darmv4t -arch-$(CONFIG_CPU_32v4) :=3D-D__LINUX_ARM_ARCH__=3D4 -march=3Darmv4 -arch-$(CONFIG_CPU_32v3) :=3D-D__LINUX_ARM_ARCH__=3D3 -march=3Darmv3m +cpp-$(CONFIG_CPU_32v5) :=3D-D__LINUX_ARM_ARCH__=3D5 +cpp-$(CONFIG_CPU_32v4T) :=3D-D__LINUX_ARM_ARCH__=3D4 +cpp-$(CONFIG_CPU_32v4) :=3D-D__LINUX_ARM_ARCH__=3D4 +cpp-$(CONFIG_CPU_32v3) :=3D-D__LINUX_ARM_ARCH__=3D3 =20 # This selects how we optimise for the processor. tune-$(CONFIG_CPU_ARM7TDMI) :=3D-mtune=3Darm7tdmi @@ -119,15 +132,16 @@ AFLAGS_NOWARN :=3D$(call as-option,-Wa$(comma)-mno-wa= rn-deprecated,-Wa$(comma)-W) =20 ifeq ($(CONFIG_THUMB2_KERNEL),y) CFLAGS_ISA :=3D-mthumb -Wa,-mimplicit-it=3Dalways $(AFLAGS_NOWARN) -AFLAGS_ISA :=3D$(CFLAGS_ISA) -Wa$(comma)-mthumb +AFLAGS_ISA :=3D$(CFLAGS_ISA) -Wa$(comma)-mthumb -D__thumb2__=3D2 else CFLAGS_ISA :=3D$(call cc-option,-marm,) $(AFLAGS_NOWARN) AFLAGS_ISA :=3D$(CFLAGS_ISA) endif =20 # Need -Uarm for gcc < 3.x +KBUILD_CPPFLAGS +=3D$(cpp-y) KBUILD_CFLAGS +=3D$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call c= c-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-fl= oat -Uarm -KBUILD_AFLAGS +=3D$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include= asm/unified.h -msoft-float +KBUILD_AFLAGS +=3D$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -inc= lude asm/unified.h -msoft-float =20 CHECKFLAGS +=3D -D__arm__ =20 --=20 2.38.0.413.g74048e4d9e-goog