From patchwork Mon Aug 20 23:29:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 960028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-484041-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XqTvVmnz"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vVQ34Q1sz9s4c for ; Tue, 21 Aug 2018 09:29:29 +1000 (AEST) Received: (qmail 42441 invoked by alias); 20 Aug 2018 23:29:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 42429 invoked by uid 89); 20 Aug 2018 23:29:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=alerted, He's, Hes X-HELO: mail-yw1-f42.google.com Received: from mail-yw1-f42.google.com (HELO mail-yw1-f42.google.com) (209.85.161.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Aug 2018 23:29:21 +0000 Received: by mail-yw1-f42.google.com with SMTP id x83-v6so106550ywd.4 for ; Mon, 20 Aug 2018 16:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:cc:from:subject:message-id:date:user-agent:mime-version :content-language; bh=U5o5D8uPy5gqhrO71KzLEHAC5WYqWnOHxHAULSv1l70=; b=XqTvVmnzBvrYL20wXPTzdoN1c7VdfojAOHKNsG6d6SA/18QsvZh8HBZeUkDcFZp/Js mGTNEMP78eO+fzaRmnpfMYWaDl2OLyYq7WcPlJ5QnVFU3F4V0UKdENHx9uvrg5pQtfkq tONMR+ZmLy8wlXe90PovyaM1/XKZOoiRQHXXRiK6EzVa3OPTTTd1jNEMFkH6xO7/2Ab+ gY7feFrugclGiez8n5rgXu9JlZEayG31A0ab0krDEqd1BLfaQXAVEIesxK29hdglrVO2 0HBYTkKCM0M5/azg/3DLjGZmOvqYAZCXlopSMu0I49gQPBd6uMreBUo3diZj9vCs3GKb H48g== Received: from ?IPv6:2601:181:c400:1050::4? ([2601:181:c400:1050::4]) by smtp.googlemail.com with ESMTPSA id q8-v6sm5304306ywc.86.2018.08.20.16.29.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 16:29:19 -0700 (PDT) Sender: Nathan Sidwell To: GCC Patches Cc: Jeffrey Law From: Nathan Sidwell Subject: [PATCH] fix some build breakage Message-ID: <14744462-97b2-f92b-46ff-e93f6225f241@acm.org> Date: Mon, 20 Aug 2018 19:29:18 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Jeff alerted me to some build breakage on s390 and spu targets. He's confirmed this patch unbreaks s390, so I expect spu is also good. Committing to trunk. Sorry for not deploying grep earlier. nathan. 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. Index: s390/s390-c.c =================================================================== --- s390/s390-c.c (revision 263673) +++ s390/s390-c.c (working copy) @@ -233,7 +233,7 @@ s390_macro_to_expand (cpp_reader *pfile, 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. */ Index: spu/spu-c.c =================================================================== --- spu/spu-c.c (revision 263673) +++ spu/spu-c.c (working copy) @@ -64,7 +64,7 @@ spu_macro_to_expand (cpp_reader *pfile, 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);