[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

gcc/ChangeLog

+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

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.  */

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);