projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../scsi-misc-2.6
[powerpc.git]
/
arch
/
um
/
Makefile-x86_64
diff --git
a/arch/um/Makefile-x86_64
b/arch/um/Makefile-x86_64
index
4f118d5
..
dffd118
100644
(file)
--- a/
arch/um/Makefile-x86_64
+++ b/
arch/um/Makefile-x86_64
@@
-1,14
+1,21
@@
# Copyright 2003 - 2004 Pathscale, Inc
# Released under the GPL
# Copyright 2003 - 2004 Pathscale, Inc
# Released under the GPL
-
libs
-y += arch/um/sys-x86_64/
+
core
-y += arch/um/sys-x86_64/
START := 0x60000000
#We #undef __x86_64__ for kernelspace, not for userspace where
#it's needed for headers to work!
START := 0x60000000
#We #undef __x86_64__ for kernelspace, not for userspace where
#it's needed for headers to work!
-CFLAGS += -U__$(SUBARCH)__ -fno-builtin
-USER_CFLAGS += -fno-builtin
+CFLAGS += -U__$(SUBARCH)__ -fno-builtin
-m64
+USER_CFLAGS += -fno-builtin
-m64
CHECKFLAGS += -m64
CHECKFLAGS += -m64
+AFLAGS += -m64
+LDFLAGS += -m elf_x86_64
ELF_ARCH := i386:x86-64
ELF_FORMAT := elf64-x86-64
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