diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18b5a0b9a47..d37b42b60ed 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-24  Jie Zhang  <jie.zhang@analog.com>
+
+	* config/bfin/bfin.h (TARGET_CPU_CPP_BUILTINS): Define
+	__NO_BUILTIN if -fno-builtin.
+
 2007-08-24  Jie Zhang  <jie.zhang@analog.com>
 
 	* config/bfin/bfin.c (print_operand): Report error instead of
diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index b78d39def9a..fa6eed349c2 100644
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -76,6 +76,8 @@ extern int target_flags;
 	builtin_define ("__BFIN_FDPIC__");	\
       if (TARGET_ID_SHARED_LIBRARY)		\
 	builtin_define ("__ID_SHARED_LIB__");	\
+      if (flag_no_builtin)			\
+	builtin_define ("__NO_BUILTIN");	\
     }                                           \
   while (0)
 #endif