diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7bf78c0175b..dfce3a7726a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-02  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* config/fr30/fr30.h: Update to new CPP macros.
+
 2002-06-02  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* config/dsp16xx/dsp16xx.h: Update to new CPP macros.
diff --git a/gcc/config/fr30/fr30.h b/gcc/config/fr30/fr30.h
index 33ba6ca31ac..1b0dd067947 100644
--- a/gcc/config/fr30/fr30.h
+++ b/gcc/config/fr30/fr30.h
@@ -40,7 +40,13 @@ Boston, MA 02111-1307, USA.  */
    predefined macros that identify this machine and system.  These macros will
    be predefined unless the `-ansi' option is specified. */
 
-#define CPP_PREDEFINES "-Dfr30 -D__fr30__ -Amachine=fr30"
+#define TARGET_CPU_CPP_BUILTINS()		\
+  do						\
+    {						\
+      builtin_define_std ("fr30");		\
+      builtin_assert ("machine=fr30");		\
+    }						\
+   while (0)
 
 /* Use LDI:20 instead of LDI:32 to load addresses.  */
 #define TARGET_SMALL_MODEL_MASK	(1 << 0)