uml: fx command-line CFLAGS and LDFLAGS support (260c0cb8) · Commits · 戴 / test

UML still needed some work in order to allow CFLAGS to be passed in from the command line. USER_CFLAGS is produced from KBUILD_CFLAGS in part by removing all the -I switches. This is so that kernel headers don't accidentally get pulled into libc files. However, a common use of command-line CFLAGS would be to add -I switches to the build. This patch specifically adds any command-line -I flags back to USER_CFLAGS. I also corrected the spelling of LFLAGS to LDFLAGS. Signed-off-by:

Jeff Dike <jdike@linux.intel.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/um/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH)
		#
		# These apply to USER_CFLAGS to.

		KBUILD_CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
		KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
		$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \
		-Din6addr_loopback=kernel_in6addr_loopback \
		-Din6addr_any=kernel_in6addr_any
		@@ -58,7 +58,7 @@ KBUILD_AFLAGS += $(ARCH_INCLUDE)

		USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
		$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
		-D_FILE_OFFSET_BITS=64
		$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64

		include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)

		@@ -130,7 +130,7 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
		# The wrappers will select whether using "malloc" or the kernel allocator.
		LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc

		LD_FLAGS_CMDLINE = $(foreach opt,$(LFLAGS),-Wl,$(opt))
		LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt))

		CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
		define cmd_vmlinux__

Admin message