[PATCH 2/2] uml: fix dynamic linking on some 64-bit distros

From: Paolo 'Blaisorblade' Giarrusso
Date: Sun Nov 20 2005 - 15:03:21 EST

From: Rob Landley <rob@xxxxxxxxxxx>, Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>

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@xxxxxxxxxxx>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>

arch/um/Makefile-x86_64 | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 4f118d5..38df311 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

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/