re PR preprocessor/61977 (powerpc preprocessor breaks on lines that end with "vector")

	PR preprocessor/61977
	* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Don't
	predefine __vector/__bool/__pixel macros nor context sensitive
	macros for CLK_ASM.
	* config/spu/spu-c.c (spu_cpu_cpp_builtins): Similarly.

From-SVN: r221838

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0ab5c364b623a32190eba88736d65652fe03820..119b4038531cb76b5d206a720915ad0f948fce73 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-04-02  Jakub Jelinek  <jakub@redhat.com>
+
+       PR preprocessor/61977
+       * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Don't
+       predefine __vector/__bool/__pixel macros nor context sensitive
+       macros for CLK_ASM.
+       * config/spu/spu-c.c (spu_cpu_cpp_builtins): Similarly.
+
 2015-04-02  John David Anglin  <danglin@gcc.gnu.org>
 
        * config/pa/pa.c (pa_output_move_double): Directly handle register

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 10071996e96a33e79dd3c2ab8577f1351dda21b7..9f22b4c428f052301854ffdce04561a2fb7fd67f 100644 (file)
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -420,7 +420,7 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
   if (TARGET_FRSQRTES)
     builtin_define ("__RSQRTEF__");
 
-  if (TARGET_EXTRA_BUILTINS)
+  if (TARGET_EXTRA_BUILTINS && cpp_get_options (pfile)->lang != CLK_ASM)
     {
       /* Define the AltiVec syntactic elements.  */
       builtin_define ("__vector=__attribute__((altivec(vector__)))");

diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 739fa67127e2f5e7c4682c2e67db6becdf4cb40a..03b818c4a3187f6ab2ce81895633ab250f2a0f30 100644 (file)
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -203,7 +203,8 @@ spu_cpu_cpp_builtins (struct cpp_reader *pfile)
   cpp_assert (pfile, "machine=spu");
   if (spu_arch == PROCESSOR_CELLEDP)
     cpp_define (pfile, "__SPU_EDP__");
-  cpp_define (pfile, "__vector=__attribute__((__spu_vector__))");
+  if (cpp_get_options (pfile)->lang != CLK_ASM)
+    cpp_define (pfile, "__vector=__attribute__((__spu_vector__))");
   switch (spu_ea_model)
     {
     case 32:
@@ -216,7 +217,7 @@ spu_cpu_cpp_builtins (struct cpp_reader *pfile)
        gcc_unreachable ();
     }
 
-  if (!flag_iso)
+  if (!flag_iso && cpp_get_options (pfile)->lang != CLK_ASM)
     {
       /* Define this when supporting context-sensitive keywords.  */
       cpp_define (pfile, "__VECTOR_KEYWORD_SUPPORTED__");