aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-09-06 05:44:57 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-09-06 11:50:21 -0700
commitf5fce0629a6a75e2e5969a87b01c37e8c45c1f4d (patch)
tree6150e9689cfd88f301aaabe9f2eb9408819390ef
parenta5055ad15a4cb063627653d0a2109f66ead63c33 (diff)
downloadglibc-f5fce0629a6a75e2e5969a87b01c37e8c45c1f4d.zip
glibc-f5fce0629a6a75e2e5969a87b01c37e8c45c1f4d.tar.gz
glibc-f5fce0629a6a75e2e5969a87b01c37e8c45c1f4d.tar.bz2
Add tst-cancel21-static.c
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/Makefile5
-rw-r--r--nptl/tst-cancel21-static.c1
3 files changed, 11 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f4b7ff3..34b3698 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #14545]
+ * Makefile (tests-static): Add tst-cancel21-static.
+ (tests): Likewise.
+ * tst-cancel21-static.c: New file.
+
2012-09-01 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/pthread_getcpuclockid.c
diff --git a/nptl/Makefile b/nptl/Makefile
index 614f0ce..ad7ac05 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -348,8 +348,9 @@ CFLAGS-funlockfile.c = $(libio-mtsafe)
link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
$(common-objpfx)libc.a
-tests-static += tst-locale1 tst-locale2 tst-stackguard1-static
-tests += tst-stackguard1-static
+tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \
+ tst-cancel21-static
+tests += tst-stackguard1-static tst-cancel21-static
xtests-static += tst-setuid1-static
# These tests are linked with libc before libpthread
diff --git a/nptl/tst-cancel21-static.c b/nptl/tst-cancel21-static.c
new file mode 100644
index 0000000..2a01061
--- /dev/null
+++ b/nptl/tst-cancel21-static.c
@@ -0,0 +1 @@
+#include "tst-cancel21.c"