* config/spu/spu-c.c (spu_resolve_overloaded_builtin): Don't use

	define_builtin_std where it's unnecessary.
	* config/i386/nto.h (TARGET_OS_CPP_BUILTINS): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165065 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a195c3c..76c2691 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-06  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+       * config/spu/spu-c.c (spu_resolve_overloaded_builtin): Don't use
+       define_builtin_std where it's unnecessary.
+       * config/i386/nto.h (TARGET_OS_CPP_BUILTINS): Likewise.
+
 2010-10-06  Anatoly Sokolov  <aesok@post.ru>
 
        * doc/tm.texi.in (CLASS_LIKELY_SPILLED_P): Remove documentation.

diff --git a/gcc/config/i386/nto.h b/gcc/config/i386/nto.h
index 8963d46..bc83a25 100644 (file)
--- a/gcc/config/i386/nto.h
+++ b/gcc/config/i386/nto.h
@@ -27,11 +27,11 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-        builtin_define_std ("__X86__");                \
-        builtin_define_std ("__QNXNTO__");     \
-        builtin_define_std ("__QNX__");                \
-        builtin_define_std ("__ELF__");                \
-        builtin_define_std ("__LITTLEENDIAN__");\
+        builtin_define ("__X86__");            \
+        builtin_define ("__QNXNTO__");         \
+        builtin_define ("__QNX__");            \
+        builtin_define ("__ELF__");            \
+        builtin_define ("__LITTLEENDIAN__");   \
         builtin_assert ("system=qnx");         \
         builtin_assert ("system=qnxnto");      \
         builtin_assert ("system=nto");         \

diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index b8ac433..905030d 100644 (file)
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -188,19 +188,19 @@ spu_resolve_overloaded_builtin (location_t loc, tree fndecl, void *passed_args)
 void
 spu_cpu_cpp_builtins (struct cpp_reader *pfile)
 {
-  builtin_define_std ("__SPU__");
+  cpp_define (pfile, "__SPU__");
   cpp_assert (pfile, "cpu=spu");
   cpp_assert (pfile, "machine=spu");
   if (spu_arch == PROCESSOR_CELLEDP)
-    builtin_define_std ("__SPU_EDP__");
-  builtin_define_std ("__vector=__attribute__((__spu_vector__))");
+    cpp_define (pfile, "__SPU_EDP__");
+  cpp_define (pfile, "__vector=__attribute__((__spu_vector__))");
   switch (spu_ea_model)
     {
     case 32:
-      builtin_define_std ("__EA32__");
+      cpp_define (pfile, "__EA32__");
       break;
     case 64:
-      builtin_define_std ("__EA64__");
+      cpp_define (pfile, "__EA64__");
       break;
     default:
        gcc_unreachable ();