diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 26 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/Dist | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed | 1 |
5 files changed, 45 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index a9a2786a86..77bf01bb83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2003-03-17 Alexandre Oliva <aoliva@redhat.com> + * sysdeps/unix/sysv/linux/configure.in (libc_cv_slibdir): Use + lib64 for mips64/n64 and lib32 for mips64/n32. + (ldd_rewrite_script): Needed for all mips64 configurations. + * sysdeps/unix/sysv/linux/configure: Rebuilt. + * sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed: New file. + * sysdeps/unix/sysv/linux/mips/mips64/Dist: New file. + * sysdeps/mips/machine-gmon.h (MCOUNT): Define for N32 and N64 as well. diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 721d6e7264..569b373b6c 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -44,7 +44,11 @@ if test "${libc_cv_linux2010+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <linux/version.h> #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 10) /* 2.0.10 */ eat flaming death @@ -165,7 +169,11 @@ echo $ECHO_N "checking for kernel header at least $minimum_kernel... $ECHO_C" >& abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <linux/version.h> #if LINUX_VERSION_CODE < $decnum eat flaming death @@ -216,7 +224,8 @@ case "$prefix" in /usr | /usr/) # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib case $machine in - sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 ) + sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 | \ + mips/mips64/n64 | mips/mips64/n64/el ) libc_cv_slibdir="/lib64" if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; @@ -224,6 +233,14 @@ case "$prefix" in libc_cv_localedir='${exec_prefix}/lib/locale' fi ;; + mips/mips64/n32 | mips/mips64/n32/el ) + libc_cv_slibdir="/lib32" + if test "$libdir" = '${exec_prefix}/lib'; then + libdir='${exec_prefix}/lib32'; + # Locale data can be shared between 32bit and 64bit libraries + libc_cv_localedir='${exec_prefix}/lib/locale' + fi + ;; *) libc_cv_slibdir="/lib" ;; @@ -303,6 +320,9 @@ case "$machine" in ia64*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ;; + mips/*64*) + ldd_rewrite_script=../sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed + ;; s390*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed ;; diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 462965f4f6..c42b53aeed 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -157,7 +157,8 @@ case "$prefix" in /usr | /usr/) # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib case $machine in - sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 ) + sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 | \ + mips/mips64/n64 | mips/mips64/n64/el ) libc_cv_slibdir="/lib64" if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; @@ -165,6 +166,14 @@ case "$prefix" in libc_cv_localedir='${exec_prefix}/lib/locale' fi ;; + mips/mips64/n32 | mips/mips64/n32/el ) + libc_cv_slibdir="/lib32" + if test "$libdir" = '${exec_prefix}/lib'; then + libdir='${exec_prefix}/lib32'; + # Locale data can be shared between 32bit and 64bit libraries + libc_cv_localedir='${exec_prefix}/lib/locale' + fi + ;; *) libc_cv_slibdir="/lib" ;; @@ -244,6 +253,9 @@ case "$machine" in ia64*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ;; + mips/*64*) + ldd_rewrite_script=../sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed + ;; s390*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed ;; diff --git a/sysdeps/unix/sysv/linux/mips/mips64/Dist b/sysdeps/unix/sysv/linux/mips/mips64/Dist new file mode 100644 index 0000000000..b8fa28f0a4 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips64/Dist @@ -0,0 +1 @@ +ldd-rewrite.sed diff --git a/sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed new file mode 100644 index 0000000000..2c327327e0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed @@ -0,0 +1 @@ +s_^\(RTLDLIST=\)\(.*lib\)\(\|32\|64\)\(/[^/]*\.so\.[0-9.]*\)[ ]*$_\1"\232\4 \264\4 \2\4"_ |