Skip to content

Commit 97282e6

Browse files
t-8chmasahir0y
authored andcommitted
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 9e2276f ("arch/x86/boot: Use prefix map to avoid embedded paths") but has since become unnecessary in commit a716bd7 ("kbuild: use -fmacro-prefix-map for .S sources"). Drop the now unnecessary custom prefix map configuration. Signed-off-by: Thomas Weißschuh <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent a7a05b1 commit 97282e6

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

arch/x86/boot/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ targets += cpustr.h
5454

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

arch/x86/boot/compressed/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ KBUILD_CFLAGS += -fno-stack-protector
3838
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
3939
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
4040
KBUILD_CFLAGS += -Wno-pointer-sign
41-
KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
4241
KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
4342
KBUILD_CFLAGS += -D__DISABLE_EXPORTS
4443
# Disable relocation relaxation in case the link is not PIE.

0 commit comments

Comments
 (0)