aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/Makefile-i386
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-13 03:16:04 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 12:57:15 -0400
commit2b8232ce512105e28453f301d1510de8363bccd1 (patch)
tree13e15a4f629c72b8737e20221998cb1e55e98d58 /arch/um/Makefile-i386
parentc4ea43c552ecc9ccc564e11e70d397dbdf09484b (diff)
minimal build fixes for uml (fallout from x86 merge)
a) include/asm-um/arch can't just point to include/asm-$(SUBARCH) now b) arch/{i386,x86_64}/crypto are merged now c) subarch-obj needed changes d) cpufeature_64.h should pull "cpufeature_32.h", not <asm/cpufeature_32.h> since it can be included from asm-um/cpufeature.h e) in case of uml-i386 we need CONFIG_X86_32 for make and gcc, but not for Kconfig f) sysctl.c shouldn't do vdso_enabled for uml-i386 (actually, that one should be registered from corresponding arch/*/kernel/*, with ifdef going away; that's a separate patch, though). With that and with Stephen's patch ("[PATCH net-2.6] uml: hard_header fix") we have uml allmodconfig building both on i386 and amd64. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/Makefile-i386')
-rw-r--r--arch/um/Makefile-i3868
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index c9f1c5b24c9a..60107ed4905b 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -1,4 +1,4 @@
1core-y += arch/um/sys-i386/ arch/i386/crypto/ 1core-y += arch/um/sys-i386/ arch/x86/crypto/
2 2
3TOP_ADDR := $(CONFIG_TOP_ADDR) 3TOP_ADDR := $(CONFIG_TOP_ADDR)
4 4
@@ -12,6 +12,7 @@ LDFLAGS += -m elf_i386
12ELF_ARCH := $(SUBARCH) 12ELF_ARCH := $(SUBARCH)
13ELF_FORMAT := elf32-$(SUBARCH) 13ELF_FORMAT := elf32-$(SUBARCH)
14OBJCOPYFLAGS := -O binary -R .note -R .comment -S 14OBJCOPYFLAGS := -O binary -R .note -R .comment -S
15HEADER_ARCH := x86
15 16
16ifeq ("$(origin SUBARCH)", "command line") 17ifeq ("$(origin SUBARCH)", "command line")
17ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)") 18ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
@@ -24,6 +25,11 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
24endif 25endif
25endif 26endif
26 27
28CFLAGS += -DCONFIG_X86_32
29AFLAGS += -DCONFIG_X86_32
30CONFIG_X86_32 := y
31export CONFIG_X86_32
32
27ARCH_KERNEL_DEFINES += -U__$(SUBARCH)__ -U$(SUBARCH) 33ARCH_KERNEL_DEFINES += -U__$(SUBARCH)__ -U$(SUBARCH)
28 34
29# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. 35# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.