From patchwork Wed Aug 22 12:54:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 179314 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 8E57B2C0094 for ; Wed, 22 Aug 2012 22:55:34 +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=1346244935; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Cc:Subject:References:Date:In-Reply-To: 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=fZtJh80kzFDX6IylYkKWi1VyZug=; b=CktptWrd/IPVH18Gh+cwfD3jSpHm4FMO/TCW3TSS6I4qxUXsPBTwfa85mOw7lb Adfb2f3kdppdQhVdWEGJGuWWlSZSDst4FtHQXAWFfRogq4FAIuPzv7kKbAsueT1g c1k9gjOYQMGzJVwjfM3JOYJ7T9gfGH1/57U2oyTPuwdn4= 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:Cc:Subject:References:Date:In-Reply-To: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=vjXl9Xr2gBTFkCkkV6gt+JRq31650JBV1kpGNuXvgv7AFm09j0NDzVEONE7tfm FnolUoc46bIgF8eV8Ez9hSPuv9tb7GoulsxruDExiSljSZXRPLMpcXWluImYeF3E p9hrfxukPmVxig+xaCQ1qWWRR3ChKSmGoxKFRY7ihIFIc=; Received: (qmail 27446 invoked by alias); 22 Aug 2012 12:55:21 -0000 Received: (qmail 27428 invoked by uid 22791); 22 Aug 2012 12:55:19 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD 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; Wed, 22 Aug 2012 12:54:45 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id AB57A958; Wed, 22 Aug 2012 14:54:42 +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 QkSEu+iRqXXD; Wed, 22 Aug 2012 14:54:40 +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 BFA8F957; Wed, 22 Aug 2012 14:54:40 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id q7MCse9L001864; Wed, 22 Aug 2012 14:54:40 +0200 (MEST) From: Rainer Orth To: Richard Guenther Cc: gcc-patches@gcc.gnu.org Subject: Re: Fix Solaris 9/x86 bootstrap References: Date: Wed, 22 Aug 2012 14:54:39 +0200 In-Reply-To: (Richard Guenther's message of "Tue, 21 Aug 2012 10:55:30 +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 Richard Guenther writes: > Doesn't that belong in system.h instead? And removed from rtl.h? Fine with me. The following patch does just that, moving the #undefs as far down in system.h as seemed reasonable. Bootstrapped without regressions on i386-pc-solaris2.10 and x86_64-unknown-linux-gnu; i386-pc-solaris2.9 build just started running the testsuite. Ok for mainline? Rainer 2012-08-22 Rainer Orth * rtl.h (FFS, FLOAT, ABS, PC): Don't undef. * system.h (FFS, FLOAT, ABS, PC): Undef. # HG changeset patch # Parent 4cd1f4bc7b3c2901830dde3d7ace137718eae0e4 Fix Solaris 9/x86 bootstrap * rtl.h (FFS, FLOAT, ABS, PC): Don't undef. * system.h (FFS, FLOAT, ABS, PC): Undef. diff --git a/gcc/rtl.h b/gcc/rtl.h --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -33,11 +33,6 @@ along with GCC; see the file COPYING3. #include "hashtab.h" #include "flags.h" -#undef FFS /* Some systems predefine this symbol; don't let it interfere. */ -#undef FLOAT /* Likewise. */ -#undef ABS /* Likewise. */ -#undef PC /* Likewise. */ - /* Value used by some passes to "recognize" noop moves as valid instructions. */ #define NOOP_MOVE_INSN_CODE INT_MAX diff --git a/gcc/system.h b/gcc/system.h --- a/gcc/system.h +++ b/gcc/system.h @@ -638,6 +638,11 @@ extern int vsnprintf(char *, size_t, con /* Get libiberty declarations. */ #include "libiberty.h" +#undef FFS /* Some systems predefine this symbol; don't let it interfere. */ +#undef FLOAT /* Likewise. */ +#undef ABS /* Likewise. */ +#undef PC /* Likewise. */ + /* Provide a default for the HOST_BIT_BUCKET. This suffices for POSIX-like hosts. */