summaryrefslogtreecommitdiff
path: root/libitm
diff options
context:
space:
mode:
Diffstat (limited to 'libitm')
-rw-r--r--libitm/ChangeLog6
-rw-r--r--libitm/configure2
-rw-r--r--libitm/configure.ac2
-rw-r--r--libitm/testsuite/lib/libitm.exp1
4 files changed, 8 insertions, 3 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 2bcb5ebaeb6..9ce9ba71a9a 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-11 Eric Botcazou <ebotcazou@adacore.com>
+
+ * configure.ac (link_itm): Fix comment.
+ * configure: Regenerate.
+ * testsuite/lib/libitm.exp: Do not pass -litm for the link.
+
2012-01-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libitm/51822
diff --git a/libitm/configure b/libitm/configure
index 5fc8703cd9c..47c7b0cd484 100644
--- a/libitm/configure
+++ b/libitm/configure
@@ -17463,7 +17463,7 @@ else
fi
# Set up the set of libraries that we need to link against for libitm.
-# Note that the GOMP_SELF_SPEC in gcc.c will force -pthread for -fopenmp,
+# Note that the GTM_SELF_SPECS in gcc.c will force -pthread for -fgnu-tm,
# which will force linkage against -lpthread (or equivalent for the system).
# That's not 100% ideal, but about the best we can do easily.
if test $enable_shared = yes; then
diff --git a/libitm/configure.ac b/libitm/configure.ac
index 7b54371fa88..2cce2b102f5 100644
--- a/libitm/configure.ac
+++ b/libitm/configure.ac
@@ -268,7 +268,7 @@ else
fi
# Set up the set of libraries that we need to link against for libitm.
-# Note that the GOMP_SELF_SPEC in gcc.c will force -pthread for -fopenmp,
+# Note that the GTM_SELF_SPECS in gcc.c will force -pthread for -fgnu-tm,
# which will force linkage against -lpthread (or equivalent for the system).
# That's not 100% ideal, but about the best we can do easily.
if test $enable_shared = yes; then
diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
index 74f7f80859a..b2556d14091 100644
--- a/libitm/testsuite/lib/libitm.exp
+++ b/libitm/testsuite/lib/libitm.exp
@@ -140,7 +140,6 @@ proc libitm_init { args } {
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs"
}
lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.."
- lappend ALWAYS_CFLAGS "ldflags=-litm"
# We use atomic operations in the testcases to validate results.
if { ([istarget i?86-*-*] || [istarget x86_64-*-*])