Commit 8bf9284d authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Will Deacon
Browse files

arm64: Turn "broken gas inst" into real config option 



Use the new 'as-instr' Kconfig macro to define CONFIG_BROKEN_GAS_INST
directly, making it available everywhere.

Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
[will: Drop redundant 'y if' logic]
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 395af861

arch/arm64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,9 @@ config ARCH_SUPPORTS_UPROBES 
config ARCH_PROC_KCORE_TEXT

	def_bool y



config BROKEN_GAS_INST

	def_bool !$(as-instr,1:\n.inst 0\n.rept . - 1b\n\nnop\n.endr\n)



config KASAN_SHADOW_OFFSET

	hex

	depends on KASAN

arch/arm64/Makefile

+3 −7
Original line number Diff line number Diff line
@@ -42,19 +42,15 @@ cc_has_k_constraint := $(call try-run,echo \ 
		return 0;						\

	}' | $(CC) -S -x c -o "$$TMP" -,,-DCONFIG_CC_HAS_K_CONSTRAINT=1)



ifeq ($(CONFIG_ARM64), y)

brokengasinst := $(call as-instr,1:\n.inst 0\n.rept . - 1b\n\nnop\n.endr\n,,-DCONFIG_BROKEN_GAS_INST=1)



  ifneq ($(brokengasinst),)

ifeq ($(CONFIG_BROKEN_GAS_INST),y)

$(warning Detected assembler with broken .inst; disassembly will be unreliable)

endif

endif



KBUILD_CFLAGS	+= -mgeneral-regs-only $(brokengasinst)	\

KBUILD_CFLAGS	+= -mgeneral-regs-only	\

		   $(compat_vdso) $(cc_has_k_constraint)

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables

KBUILD_CFLAGS	+= $(call cc-disable-warning, psabi)

KBUILD_AFLAGS	+= $(brokengasinst) $(compat_vdso)

KBUILD_AFLAGS	+= $(compat_vdso)



KBUILD_CFLAGS	+= $(call cc-option,-mabi=lp64)

KBUILD_AFLAGS	+= $(call cc-option,-mabi=lp64)

CRA Git | Maintained and supported by SUSTech CRA and CCSE