From: Jakub Jelinek <ja...@redhat.com>
Date: Thu, 3 Nov 2011 09:22:51 +0100
> I think much better would be to handle sparc*/s390*/powerpc* differently
> here, just using #ifdef __LP64__ test. i?86/x86_64 is different because
> of the third weirdo multilib option.
I just tested and committed the following, it seemed to make no sense
to keep the case statement there and now the host_address should be
available to anyone who wants to make use of it in config.host
--------------------
[PATCH] Tweak libgcc configure test for 64-bit.
libgcc/
* configure.ac: Test for 64-bit addresses on !x86 using __LP64__.
* configure: Rebuild.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181000
138bc75d-0d04-0410-961f-82ee72b054a4
---
libgcc/ChangeLog | 5 +++++
libgcc/configure | 15 +++++----------
libgcc/configure.ac | 15 +++++----------
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index ec06a09..d3f091e 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04 David S. Miller <da...@davemloft.net>
+
+ * configure.ac: Test for 64-bit addresses on !x86 using __LP64__.
+ * configure: Rebuild.
+
2011-11-04 Andreas Krebbel <andreas.kreb...@de.ibm.com>
* config/s390/t-crtstuff: Add -fPIC to CRTSTUFF_T_CFLAGS_S
diff --git a/libgcc/configure b/libgcc/configure
index 0f18037..1895a76 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4609,21 +4609,16 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgcc_cv_cfi" >&5
$as_echo "$libgcc_cv_cfi" >&6; }
-# Check 32bit or 64bit for x86 and sparc.
-case ${host} in
-i?86*-*-* | x86_64*-*-* | sparc*-*-*)
- cat > conftest.c <<EOF
-#if defined(__x86_64__) || \
- (defined(__sparc__) && defined(__arch64__))
+# Check 32bit or 64bit
+cat > conftest.c <<EOF
+#if defined(__x86_64__) || (!defined(__i386__) && defined(__LP64__))
host_address=64
#else
host_address=32
#endif
EOF
- eval `${CC-cc} -E conftest.c | grep host_address=`
- rm -f conftest.c
- ;;
-esac
+eval `${CC-cc} -E conftest.c | grep host_address=`
+rm -f conftest.c
# Collect host-machine-specific information.
. ${srcdir}/config.host
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index 5250be3..308038c 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -255,21 +255,16 @@ AC_CACHE_CHECK([whether assembler supports CFI
directives], [libgcc_cv_cfi],
[libgcc_cv_cfi=yes],
[libgcc_cv_cfi=no])])
-# Check 32bit or 64bit for x86 and sparc.
-case ${host} in
-i?86*-*-* | x86_64*-*-* | sparc*-*-*)
- cat > conftest.c <<EOF
-#if defined(__x86_64__) || \
- (defined(__sparc__) && defined(__arch64__))
+# Check 32bit or 64bit
+cat > conftest.c <<EOF
+#if defined(__x86_64__) || (!defined(__i386__) && defined(__LP64__))
host_address=64
#else
host_address=32
#endif
EOF
- eval `${CC-cc} -E conftest.c | grep host_address=`
- rm -f conftest.c
- ;;
-esac
+eval `${CC-cc} -E conftest.c | grep host_address=`
+rm -f conftest.c
# Collect host-machine-specific information.
. ${srcdir}/config.host
--
1.7.6.401.g6a319
