diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/Makefile | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ce13e85838..9d96be03d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-01-16 Florian Weimer <fweimer@redhat.com> + + * nptl/Makefile [$(have-cxx-thread_local)] (tests-unsupported): + Move tst-thread-exit-clobber ... + [$(CXX)] (tests-unsupported): ... to here. + 2018-01-16 Szabolcs Nagy <szabolcs.nagy@arm.com> * sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h (HWCAP_SHA3): Define. diff --git a/nptl/Makefile b/nptl/Makefile index a11a25bbff..7940b3d26b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -461,11 +461,11 @@ endif ifeq (,$(CXX)) # These tests require a C++ compiler and runtime. tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5 \ - tst-minstack-throw + tst-thread-exit-clobber tst-minstack-throw endif # These tests require a C++ compiler and runtime with thread_local support. ifneq ($(have-cxx-thread_local),yes) -tests-unsupported += tst-thread_local1 tst-thread-exit-clobber +tests-unsupported += tst-thread_local1 endif include ../Rules |