fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / um / Makefile-x86_64

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 705df73..69ecea6 100644 (file)
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -1 +1,25 @@
-ARCH_USER_CFLAGS := -D__x86_64__
+# Copyright 2003 - 2004 Pathscale, Inc
+# Released under the GPL
+
+core-y += arch/um/sys-x86_64/ arch/x86_64/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
+
+# 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