diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f324a4562f28..f5229e59a685 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-10  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* i386.h (CPP_CPU_SPEC): Allow for -std=c* and -std=i* as
+	equivalent to -ansi in disabling -Di386.
+
 Wed Jan 10 16:38:31 MET 2001  Jan Hubicka  <jh@suse.cz>
 
 	* i386.c (ix86_fp_compare_code_to_integer, ix86_fp_comparison_codes):
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 104b34441659..b1dc65f7045d 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -411,7 +411,7 @@ extern int ix86_arch;
 #ifndef CPP_CPU_SPEC
 #define CPP_CPU_SPEC "\
 -Acpu=i386 -Amachine=i386 \
-%{!ansi:-Di386} -D__i386 -D__i386__ \
+%{!ansi:%{!std=c*:%{!std=i*:-Di386}}} -D__i386 -D__i386__ \
 %{march=i386:%{!mcpu*:-D__tune_i386__ }}\
 %{march=i486:-D__i486 -D__i486__ %{!mcpu*:-D__tune_i486__ }}\
 %{march=pentium|march=i586:-D__i586 -D__i586__ -D__pentium -D__pentium__ \