Commit dc5be20a authored Feb 11, 2012 by Al Viro Committed by Richard Weinberger Mar 25, 2012

um: most of the SUBARCH uses can be killed



Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[richard@nod.at: Re-export SUBARCH in arch/um/Makefile]
Signed-off-by: Richard Weinberger <richard@nod.at>

parent 199eebba

arch/um/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um
		#
		# These apply to USER_CFLAGS to.

		KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
		KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \
		$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \
		-Din6addr_loopback=kernel_in6addr_loopback \
		-Din6addr_any=kernel_in6addr_any -Dstrrchr=kernel_strrchr
		@@ -99,7 +99,7 @@ KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig

		archheaders:
		$(Q)$(MAKE) -C '$(srctree)' KBUILD_SRC= \
		ARCH=$(SUBARCH) O='$(objtree)' archheaders
		ARCH=$(HEADER_ARCH) O='$(objtree)' archheaders

		archprepare: include/generated/user_constants.h

arch/um/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# Licensed under the GPL
		#

		CPPFLAGS_vmlinux.lds := -U$(SUBARCH) -DSTART=$(LDS_START) \
		CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \
		-DELF_ARCH=$(LDS_ELF_ARCH) \
		-DELF_FORMAT=$(LDS_ELF_FORMAT)
		extra-y := vmlinux.lds

arch/x86/Makefile.um

+0 −4

Original line number	Diff line number	Diff line
		@@ -8,15 +8,11 @@ ELF_ARCH := i386
		ELF_FORMAT := elf32-i386
		CHECKFLAGS += -D__i386__

		ifeq ("$(origin SUBARCH)", "command line")
		ifneq ("$(shell uname -m \| sed -e s/i.86/i386/)", "$(SUBARCH)")
		KBUILD_CFLAGS += $(call cc-option,-m32)
		KBUILD_AFLAGS += $(call cc-option,-m32)
		LINK-y += $(call cc-option,-m32)

		export LDFLAGS
		endif
		endif

		# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
		include $(srctree)/arch/x86/Makefile_32.cpu