s390x: Move rtld link to /lib

diff --git a/ChangeLog b/ChangeLog
index 2fb09f6b3f3dffbd4b4e35f64cff306c31811fca..99d46ad0de0b3e1839be66acd172c5870333964f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-03-19  Andreas Schwab  <schwab@suse.de>
 
+       * sysdeps/gnu/configure.in: Set libc_cv_rtldir for s390x.
+       * sysdeps/gnu/configure: Regenerate.
+
        * configure.in: Substitute libc_cv_rtlddir.
        * configure: Regenerate.
        * config.make.in (rtlddir): Set from libc_cv_rtlddir.

diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
index 26327ca3b4f3e505c9f797b8df1e7d856007e3e5..70aaa901915cbcaab4302abf782c4311c3542066 100644 (file)
--- a/sysdeps/gnu/configure
+++ b/sysdeps/gnu/configure
@@ -9,12 +9,17 @@
 case "$prefix" in
 /usr | /usr/)
   # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
-  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
-  # and libc_cv_localedir.
+  # Allow earlier configure scripts to handle libc_cv_slibdir,
+  # libc_cv_rtlddir, libdir, and libc_cv_localedir.
   test -n "$libc_cv_slibdir" || \
   case $machine in
   sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
     libc_cv_slibdir=/lib64
+    case $machine in
+    s390/s390-64)
+      libc_cv_rtlddir=/lib
+      ;;
+    esac
     if test "$libdir" = '${exec_prefix}/lib'; then
       libdir='${exec_prefix}/lib64';
       # Locale data can be shared between 32bit and 64bit libraries

diff --git a/sysdeps/gnu/configure.in b/sysdeps/gnu/configure.in
index b8fd74cffc9d39b164305dc469c8be7ee3947bc6..ce251df0c5277b24e303b9a218a6f234ba21c33c 100644 (file)
--- a/sysdeps/gnu/configure.in
+++ b/sysdeps/gnu/configure.in
@@ -9,12 +9,17 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 case "$prefix" in
 /usr | /usr/)
   # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
-  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
-  # and libc_cv_localedir.
+  # Allow earlier configure scripts to handle libc_cv_slibdir,
+  # libc_cv_rtlddir, libdir, and libc_cv_localedir.
   test -n "$libc_cv_slibdir" || \
   case $machine in
   sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
     libc_cv_slibdir=/lib64
+    case $machine in
+    s390/s390-64)
+      libc_cv_rtlddir=/lib
+      ;;
+    esac
     if test "$libdir" = '${exec_prefix}/lib'; then
       libdir='${exec_prefix}/lib64';
       # Locale data can be shared between 32bit and 64bit libraries