diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/configure.in')
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 43681f3251..e3fccb4c9b 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -75,6 +75,10 @@ case "$machine" in arch_minimum_kernel=2.0.10 libc_cv_gcc_unwind_find_fde=yes ;; + mips*) + arch_minimum_kernel=2.4.0 + libc_cv_gcc_unwind_find_fde=yes + ;; powerpc/powerpc32) libc_cv_gcc_unwind_find_fde=yes arch_minimum_kernel=2.0.10 @@ -94,10 +98,6 @@ case "$machine" in arch_minimum_kernel=2.3.99 libc_cv_gcc_unwind_find_fde=yes ;; - sparc/sparc64*) - libc_cv_gcc_unwind_find_fde=yes - arch_minimum_kernel=2.4.21 - ;; sparc*) libc_cv_gcc_unwind_find_fde=yes arch_minimum_kernel=2.0.10 @@ -159,12 +159,10 @@ fi # in /lib and /etc. 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" || \ + # 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/* ) libc_cv_slibdir="/lib64" if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; @@ -172,6 +170,14 @@ case "$prefix" in 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" ;; @@ -186,29 +192,38 @@ case "$prefix" in ;; esac -# Under Linux the NPTL add-on should be available. +# Under Linux the LinuxThreads or NPTL add-on should be available. case $add_ons in + # Only one of the add-ons should be available. + *linuxthreads*nptl*|*nptl*linuxthreads*) + echo "\ +*** LinuxThreads and NPTL add-ons are both available. Only one must be used." + exit 1 + ;; # It is available. Good. + *linuxthreads*) + linuxthreads_missing= + ;; *nptl*) - nptl_missing= + linuxthreads_missing= ;; *) - nptl_missing=yes + linuxthreads_missing=yes ;; esac -if test "$nptl_missing"; then +if test "$linuxthreads_missing"; then if test $enable_sanity = yes; then echo "\ *** On GNU/Linux systems it is normal to compile GNU libc with the -*** \`nptl' add-on. Without that, the library will be +*** \`linuxthreads' add-on. Without that, the library will be *** incompatible with normal GNU/Linux systems. *** If you really mean to not use this add-on, run configure again *** using the extra parameter \`--disable-sanity-checks'." exit 1 else echo "\ -*** WARNING: Are you sure you do not want to use the \`nptl' +*** WARNING: Are you sure you do not want to use the \`linuxthreads' *** add-on?" fi fi @@ -242,6 +257,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 ;; |