diff options
author | Jakub Jelinek <jakub@redhat.com> | 2015-04-02 13:54:58 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-04-02 13:54:58 +0200 |
commit | 860f8be450a169917f899c603581c6839327766e (patch) | |
tree | 82efdc3c51c1534274085e6cb195e2938959d8f8 | |
parent | 166d826fdcb51cb30cb358b1e90b4ff454111801 (diff) | |
download | gcc-860f8be450a169917f899c603581c6839327766e.zip gcc-860f8be450a169917f899c603581c6839327766e.tar.gz gcc-860f8be450a169917f899c603581c6839327766e.tar.bz2 |
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
-rw-r--r-- | gcc/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/config/rs6000/rs6000-c.c | 2 | ||||
-rw-r--r-- | gcc/config/spu/spu-c.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d0ab5c3..119b403 100644 --- 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 1007199..9f22b4c 100644 --- 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 739fa67..03b818c 100644 --- 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__"); |