diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 01da5efb8aecea3916d40f34e61c20b1c429e281..86761d3d479d951a7f5d403767d86f50bbb59600 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 06ee115ece92581d2e288a156e902a7a75abd1ed..4790a31e394903489a63385afc5c9da4f3c49bfd 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 21035c05b8c1016ef0e558d6c2491c43a54432df..53085d1bc1405011d9056e2402edbfd7ab809fd7 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 eea865d6aa3b1dff5aedccbfde88fac029eae895..0bdca1123ccb167e7b019180888bb0f52e08c9cc 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.