tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 9e2276fa6eb3 ("arch/x86/boot: Use prefix map to avoid embedded
paths") but has since become unnecessary in commit a716bd743210
("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>

authored by

Thomas Weißschuh and committed by
Masahiro Yamada 97282e6d a7a05b1b

-2
-1
arch/x86/boot/Makefile
··· 54 54 55 55 KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP 56 56 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ 57 - KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) 58 57 KBUILD_CFLAGS += -fno-asynchronous-unwind-tables 59 58 KBUILD_CFLAGS += $(CONFIG_CC_IMPLICIT_FALLTHROUGH) 60 59
-1
arch/x86/boot/compressed/Makefile
··· 38 38 KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) 39 39 KBUILD_CFLAGS += $(call cc-disable-warning, gnu) 40 40 KBUILD_CFLAGS += -Wno-pointer-sign 41 - KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) 42 41 KBUILD_CFLAGS += -fno-asynchronous-unwind-tables 43 42 KBUILD_CFLAGS += -D__DISABLE_EXPORTS 44 43 # Disable relocation relaxation in case the link is not PIE.