diff options
| author | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-14 23:23:41 +0000 |
|---|---|---|
| committer | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-14 23:23:41 +0000 |
| commit | 286256c74902fd811fce123244b2ad5fca3978b8 (patch) | |
| tree | ef5c7293796cf843a220f574e7239b1f722e3ac3 | |
| parent | c4b1a13a1269a7648fd073413fa3571007f9c07e (diff) | |
| download | gcc-286256c74902fd811fce123244b2ad5fca3978b8.tar.gz | |
PR target/38607
Merge upstream change.
* libtool.m4 (_LT_COMPILER_PIC): Add -fPIC to GCC and GXX for AIX.
* configure.ac: Add target-libquadmath to noconfigdirs for AIX.
Add libgomp*.o to compare_exclusions for AIX.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@191316 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | libtool.m4 | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ceb5d48e38f..ac75547844c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,14 @@ -2012-09-06 Diego Novillo <dnovillo@google.com> +2012-09-14 David Edelsohn <dje.gcc@gmail.com> + + PR target/38607 + Merge upstream change. + * libtool.m4 (_LT_COMPILER_PIC): Add -fPIC to GCC and GXX for AIX. + + * configure.ac: Add target-libquadmath to noconfigdirs for AIX. + Add libgomp*.o to compare_exclusions for AIX. + * configure: Regenerate. + +2012-09-06 Diego Novillo <dnovillo@google.com> * configure.ac: Bump minimum GMP version to 4.2.3. * configure: Re-generate. diff --git a/configure.ac b/configure.ac index a6f58280439..0eac6a4f13e 100644 --- a/configure.ac +++ b/configure.ac @@ -527,6 +527,15 @@ if test -d ${srcdir}/libitm; then fi fi +# Disable libquadmath for some systems. +case "${target}" in + # libquadmath is unused on AIX and libquadmath build process use of + # LD_LIBRARY_PATH can break AIX bootstrap. + powerpc-*-aix* | rs6000-*-aix*) + noconfigdirs="$noconfigdirs target-libquadmath" + ;; +esac + # Disable libssp for some systems. case "${target}" in avr-*-*) @@ -3187,6 +3196,7 @@ compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" case "$target" in hppa*64*-*-hpux*) ;; hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;; + powerpc*-ibm-aix*) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | *libgomp*\$(objext)" ;; esac AC_SUBST(compare_exclusions) diff --git a/libtool.m4 b/libtool.m4 index a7f99ac7dbc..8a14e2b22f9 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -3580,6 +3580,7 @@ m4_if([$1], [CXX], [ # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3891,6 +3892,7 @@ m4_if([$1], [CXX], [ # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) |