[uml-devel] [PATCH 8/8] Makefile: Remove SUBARCH

[Richard W. <ri...@no...>]

As all users of SUBARCH have been removed we can finally get
rid of it.

Signed-off-by: Richard Weinberger <ri...@no...>
---
 Makefile         | 15 +++------------
 arch/um/Makefile |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a5a55f4..48bd8fe 100644
--- a/Makefile
+++ b/Makefile
@@ -159,13 +159,7 @@ VPATH		:= $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
 export srctree objtree VPATH
 
 
-# SUBARCH tells the usermode build what the underlying arch is.  That is set
-# first, and if a usermode build is happening, the "ARCH=um" on the command
-# line overrides the setting of ARCH below.  If a native build is happening,
-# then ARCH is assigned, getting whatever value it gets normally, and 
-# SUBARCH is subsequently ignored.
-
-SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
 				  -e s/sun4u/sparc64/ \
 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
@@ -192,7 +186,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
 # "make" in the configured kernel build directory always uses that.
 # Default value for CROSS_COMPILE is not to prefix executables
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
-ARCH		?= $(SUBARCH)
 CROSS_COMPILE	?= $(CONFIG_CROSS_COMPILE:"%"=%)
 
 # Architecture as present in compile.h
@@ -1314,11 +1307,9 @@ endif #ifeq ($(mixed-targets),1)
 PHONY += checkstack kernelrelease kernelversion image_name
 
 # UML needs a little special treatment here.  It wants to use the host
-# toolchain, so needs $(SUBARCH) passed to checkstack.pl.  Everyone
-# else wants $(ARCH), including people doing cross-builds, which means
-# that $(SUBARCH) doesn't work here.
+# toolchain, so needs $(OS_ARCH) passed to checkstack.pl.
 ifeq ($(ARCH), um)
-CHECKSTACK_ARCH := $(SUBARCH)
+CHECKSTACK_ARCH := $(OS_ARCH)
 else
 CHECKSTACK_ARCH := $(ARCH)
 endif
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 5bc7892..c1b6a9b 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -156,4 +156,4 @@ endef
 include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s
 	$(call filechk,gen-asm-offsets)
 
-export USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
+export USER_CFLAGS CFLAGS_NO_HARDENING OS OS_ARCH DEV_NULL_PATH
-- 
1.8.1.4