diff options
| author | Andreas Schwab <schwab@suse.de> | 2013-03-19 10:13:46 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2013-03-19 12:08:35 +0100 |
| commit | 446737706c186b33529a2c07fcb6f0cc10b2d1ea (patch) | |
| tree | b64d3efc2256a3d3eacacb08eda58294dd11010e | |
| parent | aaa8cb4b43511c62b11ac6f10e9beea3d5035a68 (diff) | |
| download | glibc-446737706c186b33529a2c07fcb6f0cc10b2d1ea.tar.gz glibc-446737706c186b33529a2c07fcb6f0cc10b2d1ea.tar.xz glibc-446737706c186b33529a2c07fcb6f0cc10b2d1ea.zip | |
s390x: Move rtld link to /lib
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/gnu/configure | 9 | ||||
| -rw-r--r-- | sysdeps/gnu/configure.in | 9 |
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 2fb09f6b3f..99d46ad0de 100644 --- 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 26327ca3b4..70aaa90191 100644 --- 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 b8fd74cffc..ce251df0c5 100644 --- 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 |