summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2007-11-12 20:14:19 +0100
committerSam Ravnborg <sam@ravnborg.org>2007-11-12 21:02:20 +0100
commitd746d647f31bd3664f4a23985b78654129ffc1db (patch)
tree6caa461f889220551adb460e2f74b00d51c0e076 /arch/x86/Makefile
parent2a113281f5cd2febbab21a93c8943f8d3eece4d3 (diff)
downloadop-kernel-dev-d746d647f31bd3664f4a23985b78654129ffc1db.zip
op-kernel-dev-d746d647f31bd3664f4a23985b78654129ffc1db.tar.gz
x86: do not use $(ARCH) when not needed
For x86 ARCH may say i386 or x86_64 and soon x86. Rely on CONFIG_X64_32 to select between 32/64 or just hardcode the value as appropriate. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r--arch/x86/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 3095973..116b03a 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -1,12 +1,16 @@
# Unified Makefile for i386 and x86_64
# select defconfig based on actual architecture
-KBUILD_DEFCONFIG := $(ARCH)_defconfig
+ifeq ($(ARCH),x86)
+ KBUILD_DEFCONFIG := i386_defconfig
+else
+ KBUILD_DEFCONFIG := $(ARCH)_defconfig
+endif
-# # No need to remake these files
+# No need to remake these files
$(srctree)/arch/x86/Makefile%: ;
-ifeq ($(ARCH),i386)
+ifeq ($(CONFIG_X86_32),y)
include $(srctree)/arch/x86/Makefile_32
else
include $(srctree)/arch/x86/Makefile_64
OpenPOWER on IntegriCloud