4 files changed, 84 insertions, 0 deletions
diff --git a/lib/libc/tests/tls/Makefile b/lib/libc/tests/tls/Makefile
new file mode 100644
index 000000000000..6d53493f56f5
--- /dev/null
+++ b/lib/libc/tests/tls/Makefile
@@ -0,0 +1,31 @@
+.include <bsd.own.mk>
+
+.if !defined(NO_PIC)
+SUBDIR+=	dso
+.endif
+
+# TODO: doesn't link properly (for some odd reason it's trying to link in
+#       libatf.so)
+#NETBSD_ATF_TESTS_C=	tls_static_test
+.if !defined(NO_PIC)
+NETBSD_ATF_TESTS_C+=	tls_dlopen_test
+NETBSD_ATF_TESTS_C+=	tls_dynamic_test
+.endif
+
+.include "../Makefile.netbsd-tests"
+
+DSODIR=		${.OBJDIR:H}/tls_dso
+
+LIBADD.tls_static_test+=	pthread
+LDFLAGS.tls_static_test+=	-static
+SRCS.tls_static_test=		t_tls_static.c t_tls_static_helper.c
+
+DPADD.tls_dynamic_test+=	${DSODIR}/libh_tls_dynamic.so
+LDADD.tls_dynamic_test+=	-lh_tls_dynamic
+LDFLAGS.tls_dynamic_test+=	-Wl,-rpath,${TESTSDIR} -L${DSODIR}
+LIBADD.tls_dynamic_test+=	pthread
+
+LIBADD.tls_dlopen_test+=	pthread
+LDFLAGS.tls_dlopen_test+=	-Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic
+
+.include <bsd.test.mk>
diff --git a/lib/libc/tests/tls/Makefile.depend b/lib/libc/tests/tls/Makefile.depend
new file mode 100644
index 000000000000..e53b1a169e02
--- /dev/null
+++ b/lib/libc/tests/tls/Makefile.depend
@@ -0,0 +1,20 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/libc \
+	lib/libc/tests/tls_dso \
+	lib/libcompiler_rt \
+	lib/libnetbsd \
+	lib/libthr \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libc/tests/tls/dso/Makefile b/lib/libc/tests/tls/dso/Makefile
new file mode 100644
index 000000000000..783534ff7aae
--- /dev/null
+++ b/lib/libc/tests/tls/dso/Makefile
@@ -0,0 +1,16 @@
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
+
+LIB=		h_tls_dlopen
+SHLIB_NAME=	h_tls_dlopen.so
+SRCS=		h_tls_dlopen.c
+
+MAN=
+PACKAGE=	tests
+NO_DEV_PACKAGE=
+
+LIBDIR=		${TESTSBASE}/lib/libc/tls
+SHLIB_MAJOR=	1
+
+.include "../../Makefile.netbsd-tests"
+
+.include <bsd.lib.mk>
diff --git a/lib/libc/tests/tls/dso/Makefile.depend b/lib/libc/tests/tls/dso/Makefile.depend
new file mode 100644
index 000000000000..1af0c88e099c
--- /dev/null
+++ b/lib/libc/tests/tls/dso/Makefile.depend
@@ -0,0 +1,17 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif