aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rwxr-xr-xconfigure10
-rw-r--r--configure.ac10
-rw-r--r--libtool.m42
4 files changed, 33 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8029883..c996b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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-12 Mike Wrighton <wrighton@codesourcery.com>
* gdb/remote.c (remote_insert_hw_breakpoint): Throw exception if
@@ -6,7 +16,7 @@
* gdb/breakpoint.c (insert_bp_location, insert_breakpoint_locations):
Catch this exception and print the error message contained within. Do not
- print the default hardware error breakpoint message in this case.
+ print the default hardware error breakpoint message in this case.
2012-08-26 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/configure b/configure
index 60e269e..c637c91 100755
--- a/configure
+++ b/configure
@@ -3136,6 +3136,15 @@ $as_echo "yes" >&6; }
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-*-*)
@@ -14227,6 +14236,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
diff --git a/configure.ac b/configure.ac
index 27692b4..aaf3df3 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-*-*)
@@ -3146,6 +3155,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 a7f99ac..8a14e2b 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*)