aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2002-03-11 11:01:07 +0000
committerAndreas Jaeger <aj@suse.de>2002-03-11 11:01:07 +0000
commitb7effebca04984dde8cfc90cc8b486a1401c62e1 (patch)
tree7213bd9986d4ef595eb350d6a39ca0ebbd0d3ffe
parentd372f89a4c09559862055b9a59654f1a1a6d76b7 (diff)
downloadglibc-b7effebca04984dde8cfc90cc8b486a1401c62e1.zip
glibc-b7effebca04984dde8cfc90cc8b486a1401c62e1.tar.gz
glibc-b7effebca04984dde8cfc90cc8b486a1401c62e1.tar.bz2
Fix for bi-arch support.
-rw-r--r--sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed16
1 files changed, 15 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
index 28e46fe..6b4f1bf 100644
--- a/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
@@ -1 +1,15 @@
-s_^\(RTLDLIST=\)\([^ ]*\)\(\|64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4 \264\4"_
+/LD_TRACE_LOADED_OBJECTS=1/a\
+add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
+
+# ldd is generated from elf/ldd.bash.in with the name
+# of ld.so as generated in Makeconfig
+
+# that name is replaced by a pair referring to both
+# the 32bit and 64bit dynamic linker.
+
+# /lib(64|)/*(64|).so* is replaced with /lib/*.so* and /lib/*64.so*
+# this works for /lib64/ld64.so.x and /lib/ld.so.x as input
+s_lib64_lib_
+s_64\.so_\.so_
+s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \1\264\3"_
+