From patchwork Mon Jun 27 16:15:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 102215 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 5A20AB6F65 for ; Tue, 28 Jun 2011 02:16:03 +1000 (EST) Received: (qmail 17968 invoked by alias); 27 Jun 2011 16:16:00 -0000 Received: (qmail 17959 invoked by uid 22791); 27 Jun 2011 16:15:59 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_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; Mon, 27 Jun 2011 16:15:37 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id EAB2AF37; Mon, 27 Jun 2011 18:15:35 +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 KoMpIntDZZ6I; Mon, 27 Jun 2011 18:15:33 +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 C3FCDF35; Mon, 27 Jun 2011 18:15:33 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p5RGFRem022108; Mon, 27 Jun 2011 18:15:27 +0200 (MEST) From: Rainer Orth To: Eric Botcazou Cc: gcc-patches@gcc.gnu.org Subject: Re: Simplify Solaris configuration References: <201106251309.27475.ebotcazou@adacore.com> Date: Mon, 27 Jun 2011 18:15:27 +0200 In-Reply-To: <201106251309.27475.ebotcazou@adacore.com> (Eric Botcazou's message of "Sat, 25 Jun 2011 13:09:27 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (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 Eric, >> All bootstraps completed without regressions, so I've installed the >> patch. I'll address eventual issues and further simplifications as a >> followup. > > I cannot bootstrap SPARC64/Solaris anymore though: [...] > from /nile.build/botcazou/gcc-head/src/libgcc/../gcc/libgcc2.c:29: > /usr/include/sys/isa_defs.h:280:2: error: #error "SPARC Versions 8 and 9 are > mutually exclusive choices" > /usr/include/sys/isa_defs.h:376:2: error: #error "Both _ILP32 and _LP64 are > defined" sorry about that: I don't test the 64-bit default configurations so far, and didn't even have the necessary support libs around to do so. The problem was that sparc/sol2-64.h was included too late and DEFAULT_ARCH32_P was wrong for those configurations. The following patch should fix this: 2011-06-27 Rainer Orth * config.gcc (sparc*-*-solaris2*): Move sol2-bi.h after sparc/sol2-64.h. At least I can build the 64-bit libgcc now, but the 32-bit one fails for unrelated reasons: configure:3247: checking for suffix of object files configure:3269: /var/gcc/gcc-4.7.0-20110622/11-gcc/./gcc/xgcc -B/var/gcc/gcc-4.7.0-20110622/11-gcc/./gcc/ -B/usr/local/sparcv9-sun-solaris2.11/bin/ -B/usr/local/sparcv9-sun-solaris2.11/lib/ -isystem /usr/local/sparcv9-sun-solaris2.11/include -isystem /usr/local/sparcv9-sun-solaris2.11/sys-include -m32 -c -g -O2 conftest.c >&5 conftest.c:16:1: internal compiler error: in simplify_subreg, at simplify-rtx.c:5362 Rainer diff --git a/gcc/config.gcc b/gcc/config.gcc --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2476,7 +2476,7 @@ sparc-*-netbsdelf*) extra_options="${extra_options} sparc/long-double-switch.opt" ;; sparc*-*-solaris2*) - tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h" + tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file}" case ${target} in sparc64-*-* | sparcv9-*-*) tm_file="${tm_file} sparc/sol2-64.h" @@ -2485,6 +2485,7 @@ sparc*-*-solaris2*) test x$with_cpu != x || with_cpu=v9 ;; esac + tm_file="${tm_file} sol2-bi.h" tmake_file="${tmake_file} sparc/t-sol2-64" ;; sparc-wrs-vxworks)