qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: Move rtld link to /lib

This commit is contained in:
Andreas Schwab 2013-03-19 10:13:46 +01:00
parent aaa8cb4b43
commit 446737706c
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2013-03-19 Andreas Schwab <schwab@suse.de> 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.in: Substitute libc_cv_rtlddir.
* configure: Regenerate. * configure: Regenerate.
* config.make.in (rtlddir): Set from libc_cv_rtlddir. * config.make.in (rtlddir): Set from libc_cv_rtlddir.

9
sysdeps/gnu/configure vendored
View File

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

9
sysdeps/gnu/configure.in
View File

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