diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 020768fefed..122e0a86957 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-11  Jie Zhang  <jie.zhang@analog.com>
+
+	* config/bfin/bfin.h (TARGET_CPU_CPP_BUILTINS): Define __bfin__
+	and __BFIN__.
+
 2006-11-11  Jan Hubicka  <jh@suse.cz>
 
 	* extended.texi (__builtin_expect): We no longer require second argument
diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index bd4d9c2b548..71a598af62f 100644
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -41,6 +41,8 @@ extern int target_flags;
     {                                           \
       builtin_define ("bfin");                  \
       builtin_define ("BFIN");                  \
+      builtin_define ("__bfin__");              \
+      builtin_define ("__BFIN__");              \
       builtin_define ("__ADSPBLACKFIN__");	\
       if (TARGET_FDPIC)				\
 	builtin_define ("__BFIN_FDPIC__");	\