about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-04 19:53:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-04 19:53:08 +0000
commitc4a6d859943d9f35bad48b82530fae2ff3a323e7 (patch)
tree7ff03e4957370ea5cfd32ed5cfd33d058ab9d456 /nptl
parented6e8c2e68f772834938692027587d5692d4e34d (diff)
downloadglibc-c4a6d859943d9f35bad48b82530fae2ff3a323e7.tar.gz
glibc-c4a6d859943d9f35bad48b82530fae2ff3a323e7.tar.xz
glibc-c4a6d859943d9f35bad48b82530fae2ff3a323e7.zip
Update.
2002-12-04  Ulrich Drepper  <drepper@redhat.com>

	* argp/Makefile (tests): Add tst-argp1.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/Makefile4
-rw-r--r--nptl/tst-locale2.c13
3 files changed, 19 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a6c5a2f35b..00a96f4b71 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,9 @@
 2002-12-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makefile (tests): Add tst-locale2.
+	(tests-static): Likewise.
+	* tst-locale2.c: New file.
+
 	* sysdeps/unix/sysv/linux/i386/lowlevellock.h: Mark asms as
 	volatile and add memory clobbers to lock operations.
 
diff --git a/nptl/Makefile b/nptl/Makefile
index 777311a258..9393698f2d 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -134,7 +134,7 @@ tests = tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
 	tst-stack1 \
 	tst-unload \
 	tst-sysconf \
-	tst-locale1
+	tst-locale1 tst-locale2
 
 LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
 
@@ -156,7 +156,7 @@ CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions
 endif
 
 ifeq ($(build-static),yes)
-tests-static += tst-locale1
+tests-static += tst-locale1 tst-locale2
 endif
 
 include ../Rules
diff --git a/nptl/tst-locale2.c b/nptl/tst-locale2.c
new file mode 100644
index 0000000000..2c803e3ef0
--- /dev/null
+++ b/nptl/tst-locale2.c
@@ -0,0 +1,13 @@
+/* Test that the thread-local locale works right in the main thread
+   when statically linked.  */
+
+#include "../argp/tst-argp1.c"
+
+#include <pthread.h>
+
+/* This is never called, just here to get pthreads linked in.  */
+void
+useless (void)
+{
+  pthread_create (0, 0, 0, 0);
+}