diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e69a20568b3..87181b40b1f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* fixinc/inclhack.def (winidss_valist): Limit applicability.
+	* fixinc/fixincl.x: Regenerated.
+	* fixinc/tests/base/math.h: Update.
+	* fixinc/tests/base/testing.h: Likewise.
+
 2002-05-13  Zack Weinberg  <zack@codesourcery.com>
 
 	* genattr.c (gen_attr): Don't emit a comma after the last
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index a7a3ce91187..589687f3860 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -5484,8 +5484,16 @@ tSCC zWindiss_ValistName[] =
 tSCC* apzWindiss_ValistMachs[] = {
         "*-*-windiss",
         (const char*)NULL };
-#define WINDISS_VALIST_TEST_CT  0
-#define aWindiss_ValistTests   (tTestDesc*)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zWindiss_ValistSelect0[] =
+       "(#include.*)diab/va_list.h";
+
+#define    WINDISS_VALIST_TEST_CT  1
+static tTestDesc aWindiss_ValistTests[] = {
+  { TT_EGREP,    zWindiss_ValistSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Windiss_Valist
@@ -5664,7 +5672,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          151
+#define REGEX_COUNT          152
 #define MACH_LIST_SIZE_LIMIT 279
 #define FIX_COUNT            145
 
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 09e6bd7ab08..d5b5eec7f9f 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -3337,6 +3337,7 @@ fix = {
  * WindISS headers include "diab/va_list.h" instead of "stdarg.h"
  */
 fix = {
+    select    = '(#include.*)diab/va_list.h';
     hackname  = windiss_valist;
     sed       = "s|diab/va_list.h|stdarg.h|";
     mach      = "*-*-windiss";
diff --git a/gcc/fixinc/tests/base/math.h b/gcc/fixinc/tests/base/math.h
index 8cd8c224da4..4d9907c3910 100644
--- a/gcc/fixinc/tests/base/math.h
+++ b/gcc/fixinc/tests/base/math.h
@@ -130,6 +130,16 @@ extern int matherr();
 extern double atof(const char *__nptr);
 
 #endif  /* ULTRIX_ATOF_PARAM_CHECK */
+
+
+#if defined( WINDISS_MATH1_CHECK )
+#ifndef __GNUC__
+#endif  /* WINDISS_MATH1_CHECK */
+
+
+#if defined( WINDISS_MATH2_CHECK )
+#endif /* __GNUC__ */
+#endif  /* WINDISS_MATH2_CHECK */
 #ifdef __cplusplus
 #undef exception
 #endif
diff --git a/gcc/fixinc/tests/base/testing.h b/gcc/fixinc/tests/base/testing.h
index d58d61117dd..d2393adcc4a 100644
--- a/gcc/fixinc/tests/base/testing.h
+++ b/gcc/fixinc/tests/base/testing.h
@@ -121,3 +121,8 @@ extern size_t
 #endif
 
 #endif  /* UNDEFINE_NULL_CHECK */
+
+
+#if defined( WINDISS_VALIST_CHECK )
+#include <stdarg.h>
+#endif  /* WINDISS_VALIST_CHECK */