From fe7a679e8c4ce1a50afad508e094377bab365ea4 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 20 Aug 2018 23:31:18 +0000 Subject: [PATCH] [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 From-SVN: r263677 --- gcc/ChangeLog | 6 ++++++ gcc/config/s390/s390-c.c | 2 +- gcc/config/spu/spu-c.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 515ea8a087a..ca49dba4437 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-08-20 Nathan Sidwell + Jeff Law + + * 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 PR other/84889 diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c index 77f3abb664b..286b8c392ff 100644 --- 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 a148c5c2729..166f91d9426 100644 --- 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); -- 2.30.2