[PATCH 19/31] build: Merge libstdthreads/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am               | 11 ++++++++++-
 cpukit/configure.ac              |  1 -
 cpukit/libstdthreads/Makefile.am | 16 ----------------
 cpukit/libstdthreads/cnd.c       |  4 ++--
 cpukit/libstdthreads/mtx.c       |  2 +-
 cpukit/wrapup/Makefile.am        |  2 --
 6 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 cpukit/libstdthreads/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 3bfaa6b38b..2e0298f46a 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -364,6 +364,10 @@ libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-trace.c
 libcpukit_a_SOURCES += libi2c/libi2c.c
 libcpukit_a_SOURCES += libmd/md4.c
 libcpukit_a_SOURCES += libmd/md5.c
+libcpukit_a_SOURCES += libstdthreads/call_once.c
+libcpukit_a_SOURCES += libstdthreads/cnd.c
+libcpukit_a_SOURCES += libstdthreads/mtx.c
+libcpukit_a_SOURCES += libstdthreads/tss.c
 libcpukit_a_SOURCES += sapi/src/chainappendnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetwait.c
@@ -402,6 +406,12 @@ libcpukit_a_SOURCES += sapi/src/sapirbtreeinsert.c
 libcpukit_a_SOURCES += sapi/src/tcsimpleinstall.c
 libcpukit_a_SOURCES += sapi/src/version.c
 
+if HAS_PTHREADS
+
+libcpukit_a_SOURCES += libstdthreads/thrd.c
+
+endif
+
 if LIBDL
 
 libcpukit_a_SOURCES += libdl/dlfcn.c
@@ -614,7 +624,6 @@ all-local: generate-vc-key
 _SUBDIRS = . score rtems posix
 _SUBDIRS += libnetworking
 _SUBDIRS += libmisc
-_SUBDIRS += libstdthreads
 _SUBDIRS += wrapup
 
 # other libraries
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 30b498ff3c..25b1d0c1a8 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -499,7 +499,6 @@ score/cpu/no_cpu/Makefile
 posix/Makefile
 libnetworking/Makefile
 libmisc/Makefile
-libstdthreads/Makefile
 zlib/Makefile
 telnetd/Makefile
 pppd/Makefile
diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am
deleted file mode 100644
index 1cb1bf0381..0000000000
--- a/cpukit/libstdthreads/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-noinst_LIBRARIES = libstdthreads.a
-
-libstdthreads_a_CFLAGS = -std=c11
-
-libstdthreads_a_SOURCES =
-libstdthreads_a_SOURCES += call_once.c
-libstdthreads_a_SOURCES += cnd.c
-libstdthreads_a_SOURCES += mtx.c
-if HAS_PTHREADS
-libstdthreads_a_SOURCES += thrd.c
-endif
-libstdthreads_a_SOURCES += tss.c
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libstdthreads/cnd.c b/cpukit/libstdthreads/cnd.c
index 7ed750aee4..ac7b0a6073 100644
--- a/cpukit/libstdthreads/cnd.c
+++ b/cpukit/libstdthreads/cnd.c
@@ -62,8 +62,8 @@ cnd_signal(cnd_t *cond)
 }
 
 int
-cnd_timedwait(cnd_t *restrict cond, mtx_t *restrict mtx,
-    const struct timespec *restrict ts)
+cnd_timedwait(cnd_t *__restrict cond, mtx_t *__restrict mtx,
+    const struct timespec *__restrict ts)
 {
 
 	switch (_Condition_Wait_recursive_timed(cond, mtx, ts)) {
diff --git a/cpukit/libstdthreads/mtx.c b/cpukit/libstdthreads/mtx.c
index 48369c2ed0..27c6ee93c7 100644
--- a/cpukit/libstdthreads/mtx.c
+++ b/cpukit/libstdthreads/mtx.c
@@ -56,7 +56,7 @@ mtx_lock(mtx_t *mtx)
 }
 
 int
-mtx_timedlock(mtx_t *restrict mtx, const struct timespec *restrict ts)
+mtx_timedlock(mtx_t *__restrict mtx, const struct timespec *__restrict ts)
 {
 
 	switch (_Mutex_recursive_Acquire_timed(mtx, ts)) {
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 6002cae21e..a878a27dde 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -19,8 +19,6 @@ TMP_LIBS += ../libcpukit.a
 TMP_LIBS += ../rtems/librtems.a
 TMP_LIBS += ../posix/libposix.a
 
-TMP_LIBS += ../libstdthreads/libstdthreads.a
-
 TMP_LIBS += ../libmisc/libmonitor.a
 TMP_LIBS += ../libmisc/libuntar.a
 TMP_LIBS += ../libmisc/libstackchk.a
-- 
2.16.4