diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 343d785ed6b5..e1bdcb7962b1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-25  Paul Brook  <paul@codesourcery.com>
+
+	* config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Define __ARM_EABI__.
+
 2004-06-25  Richard Earnshaw  <rearnsha@arm.com>
 
 	* arm.c (arm_arch4t): New variable.
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index d6d07e672194..4b4ddedf483f 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -76,6 +76,8 @@ extern char arm_arch_name[];
 	  builtin_define ("__XSCALE__");		\
 	if (arm_arch_iwmmxt)				\
 	  builtin_define ("__IWMMXT__");		\
+	if (TARGET_AAPCS_BASED)				\
+	  builtin_define ("__ARM_EABI__");		\
     } while (0)
 
 /* The various ARM cores.  */