[PATCH] fix some build breakage

https://gcc.gnu.org/ml/gcc-patches/2018-08/msg01214.html
	* config/s390/s390-c (s390_macro_to_expand): Use cpp_macro_p.
	* config/spu/spu-c.c (spu_macro_to_expand): Likewise.

Co-Authored-By: Jeff Law <law@redhat.com>
From-SVN: r263677

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 515ea8a087a21bf568c37ca851552342d9a712f9..ca49dba4437b7f430bbc863fb9b38a745784b9a4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-20  Nathan Sidwell  <nathan@acm.org>
+           Jeff Law <law@redhat.com>
+
+       * config/s390/s390-c (s390_macro_to_expand): Use cpp_macro_p.
+       * config/spu/spu-c.c (spu_macro_to_expand): Likewise.
+
 2018-08-20  David Malcolm  <dmalcolm@redhat.com>
 
        PR other/84889

diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index 77f3abb664b5b47332653c2357048209a5cc3615..286b8c392ffd9ed201ddd3acdc051736752f86ae 100644 (file)
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -233,7 +233,7 @@ s390_macro_to_expand (cpp_reader *pfile, const cpp_token *tok)
 
   rid_code = (enum rid)(ident->rid_code);
 
-  if (ident->type == NT_MACRO)
+  if (cpp_macro_p (ident))
     {
       /* Now actually fetch the tokens we "peeked" before and do a
         lookahead for the next.  */

diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index a148c5c272940757cdd0a2305855d721c4dc70ca..166f91d942610023cf05c85192dbc9ece4ae2335 100644 (file)
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -64,7 +64,7 @@ spu_macro_to_expand (cpp_reader *pfile, const cpp_token *tok)
       if (ident)
        {
          enum rid rid_code = (enum rid)(ident->rid_code);
-         if (ident->type == NT_MACRO)
+         if (cpp_macro_p (ident))
            {
              (void) cpp_get_token (pfile);
              tok = cpp_peek_token (pfile, 0);