Commit 46427f65 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

x86: remove unneeded (CONFIG_AS_)CFI_SIGNAL_FRAME 



Commit 131484c8 ("x86/debug: Remove perpetually broken,
unmaintainable dwarf annotations") removes all the users of
CFI_SIGNAL_FRAME.

Remove the CFI_SIGNAL_FRAME and CONFIG_AS_CFI_SIGNAL_FRAME.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0f2661c4

arch/x86/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) 
	KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)

endif



# is .cfi_signal_frame supported too?

cfi-sigframe := $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1)

cfi-sections := $(call as-instr,.cfi_sections .debug_frame,-DCONFIG_AS_CFI_SECTIONS=1)



# does binutils support specific instructions?
@@ -190,8 +188,8 @@ sha1_ni_instr :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA1_NI= 
sha256_ni_instr :=$(call as-instr,sha256msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA256_NI=1)

adx_instr := $(call as-instr,adox %r10$(comma)%r10,-DCONFIG_AS_ADX=1)



KBUILD_AFLAGS += $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)

KBUILD_CFLAGS += $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)

KBUILD_AFLAGS += $(cfi-sections) $(asinstr) $(avx_instr) $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)

KBUILD_CFLAGS += $(cfi-sections) $(asinstr) $(avx_instr) $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)



KBUILD_LDFLAGS := -m elf_$(UTS_MACHINE)

arch/x86/include/asm/dwarf2.h

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ 
#define CFI_UNDEFINED		.cfi_undefined

#define CFI_ESCAPE		.cfi_escape



#ifdef CONFIG_AS_CFI_SIGNAL_FRAME

#define CFI_SIGNAL_FRAME	.cfi_signal_frame

#else

#define CFI_SIGNAL_FRAME

#endif



#if defined(CONFIG_AS_CFI_SECTIONS)

#ifndef BUILD_VDSO

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE