summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2019-12-03 11:13:38 +0000
committerSzabolcs Nagy <nsz@gcc.gnu.org>2019-12-03 11:13:38 +0000
commit004843655a9f2c9ef4de56d43184adf0ae5095c9 (patch)
tree0c150fe2aefd8c793ed44a51fbcb9c56691eed0e
parent89ee3a872fdf460402d1fc137e5cdce20f62bc8e (diff)
musl: Fix invalid tls model in libgomp and libitm PR91938
Musl does not support initial-exec tls in dynamically loaded shared libraries. libgomp/ChangeLog: 2019-12-03 Szabolcs Nagy <szabolcs.nagy@arm.com> PR libgomp/91938 * configure.tgt: Avoid IE tls on *-*-musl*. libitm/ChangeLog: 2019-12-03 Szabolcs Nagy <szabolcs.nagy@arm.com> PR libgomp/91938 * configure.tgt: Avoid IE tls on *-*-musl*. From-SVN: r278932
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/configure.tgt3
-rw-r--r--libitm/ChangeLog5
-rw-r--r--libitm/configure.tgt3
4 files changed, 16 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 01da5efb8ae..86761d3d479 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-03 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ PR libgomp/91938
+ * configure.tgt: Avoid IE tls on *-*-musl*.
+
2019-11-29 Tobias Burnus <tobias@codesourcery.com>
* testsuite/libgomp.oacc-fortran/declare-5.f90: Extend by
diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index 06ee115ece9..4790a31e394 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -17,6 +17,9 @@ if test $gcc_cv_have_tls = yes ; then
*-*-k*bsd*-gnu*)
;;
+ *-*-musl*)
+ ;;
+
*-*-linux* | *-*-gnu*)
XCFLAGS="${XCFLAGS} -ftls-model=initial-exec -DUSING_INITIAL_EXEC_TLS"
;;
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 21035c05b8c..53085d1bc14 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-03 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ PR libgomp/91938
+ * configure.tgt: Avoid IE tls on *-*-musl*.
+
2019-09-27 Maciej W. Rozycki <macro@wdc.com>
* configure: Regenerate.
diff --git a/libitm/configure.tgt b/libitm/configure.tgt
index eea865d6aa3..0bdca1123cc 100644
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
@@ -31,6 +31,9 @@
if test "$gcc_cv_have_tls" = yes ; then
case "${target}" in
+ *-*-musl*)
+ ;;
+
# For x86, we use slots in the TCB head for most of our TLS.
# The setup of those slots in beginTransaction can afford to
# use the global-dynamic model.