From 7785fe5a0b10dad81155f9db67634e84f51f5113 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 21 Mar 2012 12:37:38 -0700 Subject: [PATCH] Check x86_64* instead of x86_64 --- ChangeLog | 7 +++++++ sysdeps/unix/sysv/linux/configure | 2 +- sysdeps/unix/sysv/linux/configure.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1822dfd72..b7ba9f57fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-03-21 H.J. Lu + + * sysdeps/unix/sysv/linux/configure.in: Check x86_64* instead + of x86_64 when setting libc_cv_slibdir, libdir and + libc_cv_localedir. + * sysdeps/unix/sysv/linux/configure: Regenerated. + 2012-03-21 Joseph Myers * manual/lang.texi (Old Varargs): Remove section. diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 33821c0bb6..31031613d3 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -393,7 +393,7 @@ case "$prefix" in # and libc_cv_localedir. test -n "$libc_cv_slibdir" || \ 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" if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 59a13112b2..556ca84517 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -132,7 +132,7 @@ case "$prefix" in # and libc_cv_localedir. test -n "$libc_cv_slibdir" || \ 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" if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64';