diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 553c778558..40ddc2504e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-25  Roland McGrath  <roland@hack.frob.com>
+
+	* tst-cond-except.c (TEST_FUNCTION): New macro.
+
 2012-10-25  Joseph Myers  <joseph@codesourcery.com>
 
 	* Makefile ($(objpfx)tst-tls6.out): Use $(BASH) not $(SHELL) to
diff --git a/nptl/tst-cond-except.c b/nptl/tst-cond-except.c
index be9c4ef70a..c294a41b2e 100644
--- a/nptl/tst-cond-except.c
+++ b/nptl/tst-cond-except.c
@@ -105,5 +105,6 @@ out:
   return ret;
 }
 
+#define TEST_FUNCTION do_test ()
 #define TIMEOUT 5
 #include "../test-skeleton.c"