aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile.um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-02-11 05:39:56 -0500
committerRichard Weinberger <richard@nod.at>2012-03-24 19:29:56 -0400
commitdc5be20a6454312d395dbf07eb2218090a03ae24 (patch)
tree4569a1f70e868604f4d92af11dba4009ceb64934 /arch/x86/Makefile.um
parent199eebbae45791af0f37184dd495f16a6cf5c34a (diff)
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>
Diffstat (limited to 'arch/x86/Makefile.um')
-rw-r--r--arch/x86/Makefile.um4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index 36ddec6a41c..4be406abeef 100644
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -8,15 +8,11 @@ ELF_ARCH := i386
8ELF_FORMAT := elf32-i386 8ELF_FORMAT := elf32-i386
9CHECKFLAGS += -D__i386__ 9CHECKFLAGS += -D__i386__
10 10
11ifeq ("$(origin SUBARCH)", "command line")
12ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
13KBUILD_CFLAGS += $(call cc-option,-m32) 11KBUILD_CFLAGS += $(call cc-option,-m32)
14KBUILD_AFLAGS += $(call cc-option,-m32) 12KBUILD_AFLAGS += $(call cc-option,-m32)
15LINK-y += $(call cc-option,-m32) 13LINK-y += $(call cc-option,-m32)
16 14
17export LDFLAGS 15export LDFLAGS
18endif
19endif
20 16
21# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. 17# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
22include $(srctree)/arch/x86/Makefile_32.cpu 18include $(srctree)/arch/x86/Makefile_32.cpu