Commit 97282e6d authored Mar 22, 2025 by Thomas Weißschuh Committed by Masahiro Yamada Mar 22, 2025

x86: drop unnecessary prefix map configuration



The toplevel Makefile already provides -fmacro-prefix-map as part of
KBUILD_CPPFLAGS. In contrast to the KBUILD_CFLAGS and KBUILD_AFLAGS
variables, KBUILD_CPPFLAGS is not redefined in the architecture specific
Makefiles. Therefore the toplevel KBUILD_CPPFLAGS do apply just fine, to
both C and ASM sources.

The custom configuration was necessary when it was added in
commit 9e2276fa ("arch/x86/boot: Use prefix map to avoid embedded
paths") but has since become unnecessary in commit a716bd74
("kbuild: use -fmacro-prefix-map for .S sources").

Drop the now unnecessary custom prefix map configuration.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

parent a7a05b1b

arch/x86/boot/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ targets += cpustr.h

		KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP
		KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
		KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
		KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
		KBUILD_CFLAGS += $(CONFIG_CC_IMPLICIT_FALLTHROUGH)

arch/x86/boot/compressed/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ KBUILD_CFLAGS += -fno-stack-protector
		KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
		KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
		KBUILD_CFLAGS += -Wno-pointer-sign
		KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
		KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
		KBUILD_CFLAGS += -D__DISABLE_EXPORTS
		# Disable relocation relaxation in case the link is not PIE.