From patchwork Wed Aug 3 10:39:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 108104 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 32AB2B712A for ; Wed, 3 Aug 2011 20:40:17 +1000 (EST) Received: (qmail 23603 invoked by alias); 3 Aug 2011 10:40:13 -0000 Received: (qmail 23593 invoked by uid 22791); 3 Aug 2011 10:40:13 -0000 X-SWARE-Spam-Status: No, hits=-2.2 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, 03 Aug 2011 10:39:58 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 59CB0B5A; Wed, 3 Aug 2011 12:39:56 +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 bSn+E63A55Gt; Wed, 3 Aug 2011 12:39:54 +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 94156B59; Wed, 3 Aug 2011 12:39:54 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id p73Adrgi011967; Wed, 3 Aug 2011 12:39:53 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Arnaud Charlet Subject: Fix Solaris Ada bootstrap Date: Wed, 03 Aug 2011 12:39:53 +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 Two of the latest Ada patches broke bootstrap on Solaris: In file included from /vol/gcc/src/hg/trunk/local/gcc/ada/link.c:42:0: ./auto-host.h:1829:0: error: "_FILE_OFFSET_BITS" redefined [-Werror] /var/gcc/regression/trunk/10-gcc/build/./prev-gcc/include-fixed/sys/feature_tests.h:197:0: note: this is the location of the previous definition cc1plus: all warnings being treated as errors auto-host.h has /* Number of bits in a file offset, on hosts where this is settable. */ #ifndef USED_FOR_TARGET #define _FILE_OFFSET_BITS 64 #endif while defaults to 32 if undefined. This can easily be fixed by including auto-host.h before any system header. i386-pc-solaris2.10 bootstrap is just in progress, but already past the point of the previous failure. Ok for mainline? Thanks. Rainer 2011-08-03 Rainer Orth * link.c: Include "auto-host.h" before system headers. diff --git a/gcc/ada/link.c b/gcc/ada/link.c --- a/gcc/ada/link.c +++ b/gcc/ada/link.c @@ -36,12 +36,12 @@ extern "C" { #endif -#include - #ifdef IN_GCC #include "auto-host.h" #endif +#include + /* objlist_file_supported is set to 1 when the system linker allows */ /* response file, that is a file that contains the list of object files. */ /* This is useful on systems where the command line length is limited, */