From patchwork Tue Aug 21 08:53:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 179002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id EEFCD2C0091 for ; Tue, 21 Aug 2012 18:53:49 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1346144030; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=cmHsYQm66+GsWIXSf5wzNJK9Oh4=; b=SHy410qDjfpNx1t zRnkVxt1Svd5BwYTAcqZ7b6DCn6VFz6eLhYoxm+LGOAQPEdlCxE6yIONYszcRgco TTL7UBxg8h9/ngRyvEVTRHOujyvHUy1NzD5qIvRRLfM2Ke6fOX/BLTRqXnHNj7rV rYGiQ9lEO7w8sYnMpK/iHkednbGE= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=H1WoNrGsemUZ2UXj4+G0Bgbg232PGHdfsAf3fDR6EwnZU717T3N30f3HRg+M8r AIGQ3qHpfxLNI3482kMXb+BFQ62MAdFcgq8EhS+XWZkhes32cbI2md/VA+zk6wrd U0fixqAg20fb2OPaS58Io3UHpapT4/7jFPcGtrFxRbDlw=; Received: (qmail 2165 invoked by alias); 21 Aug 2012 08:53:41 -0000 Received: (qmail 2152 invoked by uid 22791); 21 Aug 2012 08:53:39 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, TW_CX X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 21 Aug 2012 08:53:21 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 914926A9 for ; Tue, 21 Aug 2012 10:53:19 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id y2-GYiH9b3sg for ; Tue, 21 Aug 2012 10:53:18 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 05C106A8 for ; Tue, 21 Aug 2012 10:53:18 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id q7L8rHRS018634; Tue, 21 Aug 2012 10:53:17 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Subject: Fix Solaris 9/x86 bootstrap Date: Tue, 21 Aug 2012 10:53:17 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes 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 Solaris 9/x86 bootstrap was broken after the cxx-conversion merge: In file included from /vol/gcc/src/hg/trunk/local/gcc/gengtype.c:957: /vol/gcc/src/hg/trunk/local/gcc/rtl.def:347: error: expected identifier before n umeric constant /vol/gcc/src/hg/trunk/local/gcc/rtl.def:347: error: expected '}' before numeric constant This happens since g++, unlike gcc, defines __EXTENSIONS__, which exposes the equivalent of #define PC 14 Initially I tried to avoid this by having gengtype.c include rtl.h, which already has the #undef, but this produced so much fallout that I decided it's better to just replicate it here. The patch allowed an i386-pc-solaris2.9 bootstrap to finish. I think this counts as obvious unless someone prefers the rtl.h route nonetheless. Ok for mainline? Rainer 2012-08-20 Rainer Orth * gengtype.c (PC): Undef. # HG changeset patch # Parent cf74f0e72cab4965ba20bf236eac2fac2b87064e Fix Solaris 9 bootstrap diff --git a/gcc/gengtype.c b/gcc/gengtype.c --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -35,6 +35,8 @@ #include "gengtype.h" #include "filenames.h" +#undef PC /* Some systems predefine this symbol; don't let it interfere. */ + /* Data types, macros, etc. used only in this file. */