Skip to content

Commit 1488e23

Browse files
committed
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.
1 parent 4205650 commit 1488e23

4 files changed

Lines changed: 33 additions & 1 deletion

File tree

ChangeLog

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2012-09-14 David Edelsohn <dje.gcc@gmail.com>
2+
3+
PR target/38607
4+
Merge upstream change.
5+
* libtool.m4 (_LT_COMPILER_PIC): Add -fPIC to GCC and GXX for AIX.
6+
7+
* configure.ac: Add target-libquadmath to noconfigdirs for AIX.
8+
Add libgomp*.o to compare_exclusions for AIX.
9+
* configure: Regenerate.
10+
111
2012-09-12 Mike Wrighton <wrighton@codesourcery.com>
212

313
* gdb/remote.c (remote_insert_hw_breakpoint): Throw exception if
@@ -6,7 +16,7 @@
616

717
* gdb/breakpoint.c (insert_bp_location, insert_breakpoint_locations):
818
Catch this exception and print the error message contained within. Do not
9-
print the default hardware error breakpoint message in this case.
19+
print the default hardware error breakpoint message in this case.
1020

1121
2012-08-26 H.J. Lu <hongjiu.lu@intel.com>
1222

configure

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3136,6 +3136,15 @@ $as_echo "yes" >&6; }
31363136
fi
31373137
fi
31383138

3139+
# Disable libquadmath for some systems.
3140+
case "${target}" in
3141+
# libquadmath is unused on AIX and libquadmath build process use of
3142+
# LD_LIBRARY_PATH can break AIX bootstrap.
3143+
powerpc-*-aix* | rs6000-*-aix*)
3144+
noconfigdirs="$noconfigdirs target-libquadmath"
3145+
;;
3146+
esac
3147+
31393148
# Disable libssp for some systems.
31403149
case "${target}" in
31413150
avr-*-*)
@@ -14227,6 +14236,7 @@ compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
1422714236
case "$target" in
1422814237
hppa*64*-*-hpux*) ;;
1422914238
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
14239+
powerpc*-ibm-aix*) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | *libgomp*\$(objext)" ;;
1423014240
esac
1423114241

1423214242

configure.ac

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,15 @@ if test -d ${srcdir}/libitm; then
527527
fi
528528
fi
529529

530+
# Disable libquadmath for some systems.
531+
case "${target}" in
532+
# libquadmath is unused on AIX and libquadmath build process use of
533+
# LD_LIBRARY_PATH can break AIX bootstrap.
534+
powerpc-*-aix* | rs6000-*-aix*)
535+
noconfigdirs="$noconfigdirs target-libquadmath"
536+
;;
537+
esac
538+
530539
# Disable libssp for some systems.
531540
case "${target}" in
532541
avr-*-*)
@@ -3146,6 +3155,7 @@ compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
31463155
case "$target" in
31473156
hppa*64*-*-hpux*) ;;
31483157
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
3158+
powerpc*-ibm-aix*) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | *libgomp*\$(objext)" ;;
31493159
esac
31503160
AC_SUBST(compare_exclusions)
31513161

libtool.m4

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3580,6 +3580,7 @@ m4_if([$1], [CXX], [
35803580
# AIX 5 now supports IA64 processor
35813581
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
35823582
fi
3583+
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
35833584
;;
35843585
35853586
amigaos*)
@@ -3891,6 +3892,7 @@ m4_if([$1], [CXX], [
38913892
# AIX 5 now supports IA64 processor
38923893
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
38933894
fi
3895+
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
38943896
;;
38953897
38963898
amigaos*)

0 commit comments

Comments
 (0)