Commit a2faac39 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Russell King (Oracle)
Browse files

ARM: 9263/1: use .arch directives instead of assembler command line flags 

Similar to commit a6c30873 ("ARM: 8989/1: use .fpu assembler
directives instead of assembler arguments").

GCC and GNU binutils support setting the "sub arch" via -march=,
-Wa,-march, target function attribute, and .arch assembler directive.

Clang was missing support for -Wa,-march=, but this was implemented in
clang-13.

The behavior of both GCC and Clang is to
prefer -Wa,-march= over -march= for assembler and assembler-with-cpp
sources, but Clang will warn about the -march= being unused.

clang: warning: argument unused during compilation: '-march=armv6k'
[-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/1d51c699b9e2ebc5bcfdbe85c74cc871426333d4
Link: https://bugs.llvm.org/show_bug.cgi?id=48894
Link: https://github.com/ClangBuiltLinux/linux/issues/1195
Link: https://github.com/ClangBuiltLinux/linux/issues/1315



Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Suggested-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent 5aa4860e

arch/arm/boot/compressed/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -164,4 +164,3 @@ $(obj)/piggy_data: $(obj)/../Image FORCE 
$(obj)/piggy.o: $(obj)/piggy_data



CFLAGS_font.o := -Dstatic=
 
AFLAGS_hyp-stub.o := -Wa,-march=armv7-a

arch/arm/common/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,5 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o 
obj-$(CONFIG_CPU_V7)		+= secure_cntvoff.o

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_BL_SWITCHER)	+= bL_switcher.o

obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o

arch/arm/common/mcpm_head.S

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


#include "vlock.h"



.arch armv7-a



.if MCPM_SYNC_CLUSTER_CPUS

.error "cpus must be the first member of struct mcpm_sync_struct"

.endif

arch/arm/common/vlock.S

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/linkage.h>

#include "vlock.h"



.arch armv7-a



/* Select different code if voting flags  can fit in a single word. */

#if VLOCK_VOTING_SIZE > 4

#define FEW(x...)

arch/arm/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ obj-$(CONFIG_HAVE_TCM) += tcm.o 
obj-$(CONFIG_OF)		+= devtree.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_SWP_EMULATE)	+= swp_emulate.o

CFLAGS_swp_emulate.o		:= -Wa,-march=armv7-a

obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o



obj-$(CONFIG_CPU_XSCALE)	+= xscale-cp0.o
@@ -100,7 +99,6 @@ CFLAGS_head-inflate-data.o := $(call cc-option,-Wframe-larger-than=10240) 
obj-$(CONFIG_XIP_DEFLATED_DATA) += head-inflate-data.o



obj-$(CONFIG_ARM_VIRT_EXT)	+= hyp-stub.o

AFLAGS_hyp-stub.o		:=-Wa,-march=armv7-a

ifeq ($(CONFIG_ARM_PSCI),y)

obj-$(CONFIG_SMP)		+= psci_smp.o

endif