x86/build: Don't pass in -D__KERNEL__ multiple times (d6289f36) · Commits · 戴 / test

Some .<target>.cmd files under arch/x86 are showing two instances of -D__KERNEL__, like arch/x86/boot/ and arch/x86/realmode/rm/. __KERNEL__ is already defined in KBUILD_CPPFLAGS in the top Makefile, so it can be dropped safely. Signed-off-by:

Cao jin <caoj.fnst@cn.fujitsu.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Michal Marek <michal.lkml@markovi.net> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kbuild@vger.kernel.org Link: http://lkml.kernel.org/r/20180316084944.3997-1-caoj.fnst@cn.fujitsu.com Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,7 @@ endif
		CODE16GCC_CFLAGS := -m32 -Wa,$(srctree)/arch/x86/boot/code16gcc.h
		M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS))

		REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \
		-DDISABLE_BRANCH_PROFILING \
		REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \
		-Wall -Wstrict-prototypes -march=i386 -mregparm=3 \
		-fno-strict-aliasing -fomit-frame-pointer -fno-pic \
		-mno-mmx -mno-sse

arch/x86/boot/compressed/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ KCOV_INSTRUMENT := n
		targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \
		vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4

		KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ -O2
		KBUILD_CFLAGS := -m$(BITS) -O2
		KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC)
		KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
		cflags-$(CONFIG_X86_32) := -march=i386

Admin message