diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-07-25 13:20:15 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-07-25 12:02:32 -0300 |
| commit | 9faaf9385034ac71f308643de1afc91b5dd731aa (patch) | |
| tree | ffd93d4a7113e1aacecc8de0d7ec4c320587d9fa | |
| parent | d6b8f8470990db2d36b8e50f1055a673fdf1cea0 (diff) | |
| download | glibc-9faaf9385034ac71f308643de1afc91b5dd731aa.tar glibc-9faaf9385034ac71f308643de1afc91b5dd731aa.tar.gz glibc-9faaf9385034ac71f308643de1afc91b5dd731aa.tar.bz2 glibc-9faaf9385034ac71f308643de1afc91b5dd731aa.zip | |
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | conform/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/htl/threads.h | 1 | ||||
| -rw-r--r-- | sysdeps/nptl/threads.h (renamed from include/threads.h) | 0 |
4 files changed, 12 insertions, 3 deletions
@@ -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 a0ab70e302..d43093171b 100644 --- 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 index 0000000000..3c04fbcc79 --- /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 index 1090612837..1090612837 100644 --- a/include/threads.h +++ b/sysdeps/nptl/threads.h |