diff options
| author | davem <davem@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-05 02:46:21 +0000 |
|---|---|---|
| committer | davem <davem@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-05 02:46:21 +0000 |
| commit | f3223c0b7fc7d70d76d2120ac59f217c8706ffa2 (patch) | |
| tree | 95bb323443a705cc4d0625ac7d5ea2b25a391b43 | |
| parent | 40b8b5483f217627890bd1e10c732b8be60ed02e (diff) | |
| download | gcc-f3223c0b7fc7d70d76d2120ac59f217c8706ffa2.tar.gz | |
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
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/configure | 15 | ||||
| -rw-r--r-- | libgcc/configure.ac | 15 |
3 files changed, 15 insertions, 20 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index ec06a097bf7..d3f091e0918 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2011-11-04 David S. Miller <davem@davemloft.net> + + * configure.ac: Test for 64-bit addresses on !x86 using __LP64__. + * configure: Rebuild. + 2011-11-04 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> * config/s390/t-crtstuff: Add -fPIC to CRTSTUFF_T_CFLAGS_S diff --git a/libgcc/configure b/libgcc/configure index 0f18037e796..1895a769582 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 5250be3b59e..308038c5763 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 |