Fix C11 conformance issues

Remove conformace assumption of NPTL implementation for ISO C threads
and revert wrong libcrypt addition on linknamespace-libs-XPG4.

The i686-gnu target now shows two new conformance failures:

FAIL: conform/ISO11/threads.h/conform
FAIL: conform/ISO11/threads.h/linknamespace

It is expected due missing HTL ISO C threads support and both conformance
.out files indicates the reason ("#error "HTL does not implement ISO C
threads").

Checked on i686-linux-gnu and i686-gnu.

	* include/threads.h: Move to ...
	* sysdeps/nptl/threads.h: ... here.
	* sysdeps/htl/threads.h: New file.
	* conform/Makefile (linknamespace-libs-ISO11): Use
	static-thread-library instead of linking libpthread.
	(linknamespace-libs-XPG4): Revert wrong libcrypt.a addition.

diff --git a/ChangeLog b/ChangeLog
index a7fcb6dfb2fbe585e03e43c4ca5bdec23467a336..f6aa73550b65b9f739a1e817fcf1d9c10f00b29f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-07-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+       * include/threads.h: Move to ...
+       * sysdeps/nptl/threads.h: ... here.
+       * sysdeps/htl/threads.h: New file.
+       * conform/Makefile (linknamespace-libs-ISO11): Use
+       static-thread-library instead of linking libpthread.
+       (linknamespace-libs-XPG4): Revert wrong libcrypt.a addition.
+
 2018-07-25  Florian Weimer  <fweimer@redhat.com>
 
        * nptl/tst-mtx-timedlock.c (do_test): Implement carry from

diff --git a/conform/Makefile b/conform/Makefile
index a0ab70e30260cd45152fceeb4ffa7f0ea93838e8..d43093171b4daf8b1df0c2ec1fffc775f1c8f59b 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -197,9 +197,8 @@ linknamespace-libs-xsi = $(linknamespace-libs-posix)
 linknamespace-libs-ISO = $(linknamespace-libs-isoc)
 linknamespace-libs-ISO99 = $(linknamespace-libs-isoc)
 linknamespace-libs-ISO11 = $(linknamespace-libs-isoc) \
-                          $(common-objpfx)nptl/libpthread.a
-linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) \
-                         $(common-objpfx)crypt/libcrypt.a
+                          $(static-thread-library)
+linknamespace-libs-XPG4 = $(linknamespace-libs-isoc)
 linknamespace-libs-XPG42 = $(linknamespace-libs-XPG4)
 linknamespace-libs-POSIX = $(linknamespace-libs-thr)
 linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi)

diff --git a/sysdeps/htl/threads.h b/sysdeps/htl/threads.h
new file mode 100644 (file)
index 0000000..3c04fbc
--- /dev/null
+++ b/sysdeps/htl/threads.h
@@ -0,0 +1 @@
+#error "HTL does not implement ISO C threads"

diff --git a/include/threads.h b/sysdeps/nptl/threads.h
similarity index 100%
rename from include/threads.h
rename to sysdeps/nptl/threads.h