diff --git a/ChangeLog b/ChangeLog
index 855b42f717..aac916aa81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makerules: Use cppflags-iterator.mk to add defines for all test
+	source files.
+
 2002-04-08  kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* elf/elf.h: Define R_SH_TLS_xxx macros.
diff --git a/Makerules b/Makerules
index 155466b889..7ef49ba83a 100644
--- a/Makerules
+++ b/Makerules
@@ -1035,6 +1035,12 @@ ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(..)config.h
 # Support the GNU standard name for this target.
 .PHONY: check
 check: tests
+
+ifneq (,$(tests))
+cpp-srcs-left = $(tests)
+lib = tests
+include $(patsubst %,$(..)cppflags-iterator.mk,$(tests))
+endif
 
 .PHONY: TAGS
 TAGS: $(objpfx)distinfo $(..)MakeTAGS
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index cfcfe4c872..36820a4369 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-08  kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/sh/pt-machine.h: Define _PT_MACHINE_H
+	if it isn't defined yet.
+	(FLOATING_STACKS, EARCH_STACK_MAX_SIZE): Defined.
+	(THREAD_GETMEM, THREAD_GETMEM_NC, THREAD_SETMEM, THREAD_SETMEM_NC):
+	Likewise.
+	* sysdeps/sh/tls.h: New file.
+
 2002-04-08  Jakub Jelinek  <jakub@redhat.com>
 
 	* manager.c (__pthread_manager_event): Use self instead of arg