summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2005-12-18 17:50:35 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-18 11:19:44 -0800
commit53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb (patch)
treec7f38309bbfc57353df29821b7d7bd41cc69a44d /arch
parent9ce7677cfd7cd871adb457c80bea3b581b839641 (diff)
downloadlinux-3.10-53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb.tar.gz
linux-3.10-53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb.tar.bz2
linux-3.10-53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb.zip
[PATCH] uml: fix dynamic linking on some 64-bit distros
With Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> The current UML build assumes that on x86-64 systems, /lib is a symlink to /lib64, but in some distributions (like PLD and CentOS) they are separate directories, so the 64 bit library loader isn't found. This patch inserts /lib64 at the start of the rpath on x86-64 UML builds. Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Makefile-x86_644
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 4f118d5cc2e..38df311e75d 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -12,3 +12,7 @@ CHECKFLAGS += -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