From: Daniel Jacobowitz Date: Sat, 11 Mar 2006 16:18:41 +0000 (+0000) Subject: * sysdeps/unix/sysv/linux/mips/configure.in: Set libc_cv_slibdir, X-Git-Tag: glibc-2.16-ports-before-merge~892 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aea6074434ba3619b86a6ab2ea6bcb6b7b726758;p=thirdparty%2Fglibc.git * sysdeps/unix/sysv/linux/mips/configure.in: Set libc_cv_slibdir, libc_cv_localedir, libdir, arch_minimum_kernel, and libc_cv_gcc_unwind_find_fde. * sysdeps/unix/sysv/linux/mips/mips64/configure.in: New file. * sysdeps/unix/sysv/linux/mips/configure: Regenerated. * sysdeps/unix/sysv/linux/mips/mips64/configure: Generated. --- diff --git a/ChangeLog.mips b/ChangeLog.mips index 7debe9d0202..24124294b07 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,12 @@ +2006-03-11 Daniel Jacobowitz + + * sysdeps/unix/sysv/linux/mips/configure.in: Set libc_cv_slibdir, + libc_cv_localedir, libdir, arch_minimum_kernel, and + libc_cv_gcc_unwind_find_fde. + * sysdeps/unix/sysv/linux/mips/mips64/configure.in: New file. + * sysdeps/unix/sysv/linux/mips/configure: Regenerated. + * sysdeps/unix/sysv/linux/mips/mips64/configure: Generated. + 2006-03-02 Lior Balkohen * sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure index 4d9568f001e..cad59b5f7fa 100644 --- a/sysdeps/unix/sysv/linux/mips/configure +++ b/sysdeps/unix/sysv/linux/mips/configure @@ -76,3 +76,37 @@ mips*) echo '#include ' > asm-unistd.h ;; esac + +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. + test -n "$libc_cv_slibdir" || \ + case $machine in + mips/mips64/n64/* ) + libc_cv_slibdir="/lib64" + if test "$libdir" = '${exec_prefix}/lib'; then + libdir='${exec_prefix}/lib64'; + # Locale data can be shared between 32bit and 64bit libraries + libc_cv_localedir='${exec_prefix}/lib/locale' + fi + ;; + mips/mips64/n32/* ) + 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" + ;; + esac +esac + +if test -z "$arch_minimum_kernel"; then + arch_minimum_kernel=2.4.0 + libc_cv_gcc_unwind_find_fde=yes +fi diff --git a/sysdeps/unix/sysv/linux/mips/configure.in b/sysdeps/unix/sysv/linux/mips/configure.in index e2e5d16c55f..7248e1f3f53 100644 --- a/sysdeps/unix/sysv/linux/mips/configure.in +++ b/sysdeps/unix/sysv/linux/mips/configure.in @@ -76,3 +76,37 @@ mips*) echo '#include ' > asm-unistd.h ;; esac + +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. + test -n "$libc_cv_slibdir" || \ + case $machine in + mips/mips64/n64/* ) + libc_cv_slibdir="/lib64" + if test "$libdir" = '${exec_prefix}/lib'; then + libdir='${exec_prefix}/lib64'; + # Locale data can be shared between 32bit and 64bit libraries + libc_cv_localedir='${exec_prefix}/lib/locale' + fi + ;; + mips/mips64/n32/* ) + 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" + ;; + esac +esac + +if test -z "$arch_minimum_kernel"; then + arch_minimum_kernel=2.4.0 + libc_cv_gcc_unwind_find_fde=yes +fi diff --git a/sysdeps/unix/sysv/linux/mips/mips64/configure b/sysdeps/unix/sysv/linux/mips/mips64/configure new file mode 100644 index 00000000000..c331f982991 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips64/configure @@ -0,0 +1,4 @@ +# This file is generated from configure.in by Autoconf. DO NOT EDIT! + # Local configure fragment for sysdeps/unix/sysv/linux/mips/mips64. + +ldd_rewrite_script=$dest/ldd-rewrite.sed diff --git a/sysdeps/unix/sysv/linux/mips/mips64/configure.in b/sysdeps/unix/sysv/linux/mips/mips64/configure.in new file mode 100644 index 00000000000..a28638ad886 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips64/configure.in @@ -0,0 +1,5 @@ +sinclude(./aclocal.m4)dnl Autoconf lossage +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/unix/sysv/linux/mips/mips64. + +ldd_rewrite_script=$dest/ldd-rewrite.sed