2b8232ce51
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>
26 lines
623 B
Text
26 lines
623 B
Text
# Copyright 2003 - 2004 Pathscale, Inc
|
|
# Released under the GPL
|
|
|
|
core-y += arch/um/sys-x86_64/ arch/x86/crypto/
|
|
START := 0x60000000
|
|
|
|
_extra_flags_ = -fno-builtin -m64
|
|
|
|
#We #undef __x86_64__ for kernelspace, not for userspace where
|
|
#it's needed for headers to work!
|
|
ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__
|
|
CFLAGS += $(_extra_flags_)
|
|
|
|
CHECKFLAGS += -m64
|
|
AFLAGS += -m64
|
|
LDFLAGS += -m elf_x86_64
|
|
CPPFLAGS += -m64
|
|
|
|
ELF_ARCH := i386:x86-64
|
|
ELF_FORMAT := elf64-x86-64
|
|
HEADER_ARCH := x86
|
|
|
|
# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
|
|
LINK-y += -m64
|