diff options
| author | Richard Henderson <rth@redhat.com> | 2011-11-08 18:23:33 +0000 |
|---|---|---|
| committer | Richard Henderson <rth@redhat.com> | 2011-11-08 18:23:33 +0000 |
| commit | be55faf6997fc63e2f39ad7fd70d2856ab0d45c9 (patch) | |
| tree | 312edfe6fb5393a2760ed4781645be26ea037d33 | |
| parent | 2d3a6c2df4d24329adf7060cb4f65cc61ce007ce (diff) | |
| download | gdb-be55faf6997fc63e2f39ad7fd70d2856ab0d45c9.tar.gz | |
Merge libitm changes to configure.ac from gcc master.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 17 |
3 files changed, 46 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 912f793cf5c..005e875415b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-11-08 Richard Henderson <rth@redhat.com> + + * configure.ac: Test for libitm directory present first. + + * configure.ac: Adjust srcdir for running libitm/configure.tgt. + + * configure.ac: Test libitm/configure.tgt to disable libitm. + * configure: Rebuild. + 2011-11-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * Makefile.tpl (EXTRA_GCC_FLAGS): Remove LIBGCC2_CFLAGS, diff --git a/configure b/configure index c2a51275443..40922de5d22 100755 --- a/configure +++ b/configure @@ -2681,6 +2681,7 @@ target_libraries="target-libgcc \ target-libgloss \ target-newlib \ target-libgomp \ + target-libitm \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ @@ -3056,6 +3057,25 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libitm on unsupported systems. +if test -d ${srcdir}/libitm; then + if test x$enable_libitm = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5 +$as_echo_n "checking for libitm support... " >&6; } + if (srcdir=${srcdir}/libitm; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + noconfigdirs="$noconfigdirs target-libitm" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi + fi +fi + # Disable libssp for some systems. case "${target}" in avr-*-*) diff --git a/configure.ac b/configure.ac index 2745bd7d812..ea697d3932b 100644 --- a/configure.ac +++ b/configure.ac @@ -154,6 +154,7 @@ target_libraries="target-libgcc \ target-libgloss \ target-newlib \ target-libgomp \ + target-libitm \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ @@ -492,6 +493,22 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libitm on unsupported systems. +if test -d ${srcdir}/libitm; then + if test x$enable_libitm = x; then + AC_MSG_CHECKING([for libitm support]) + if (srcdir=${srcdir}/libitm; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libitm" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + # Disable libssp for some systems. case "${target}" in avr-*-*) |