From patchwork Mon Oct 11 16:49:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 67446 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 6844FB6F10 for ; Tue, 12 Oct 2010 03:50:06 +1100 (EST) Received: (qmail 4169 invoked by alias); 11 Oct 2010 16:49:56 -0000 Received: (qmail 4154 invoked by uid 22791); 11 Oct 2010 16:49:54 -0000 X-SWARE-Spam-Status: No, hits=-1.9 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, 11 Oct 2010 16:49:48 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 660609FE; Mon, 11 Oct 2010 18:49:45 +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 45Wj4XVU1nbd; Mon, 11 Oct 2010 18:49:42 +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 991699FC; Mon, 11 Oct 2010 18:49:42 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id o9BGnfUU023250; Mon, 11 Oct 2010 18:49:41 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: "Joseph S. Myers" Subject: Fix Solaris 2/SPARC bootstrap Date: Mon, 11 Oct 2010 18:49:41 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (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 2/SPARC bootstrap is currently broken due to one of Joseph's recent patches: sparc/gmon-sol2.c doesn't compile since some headers now use bool without a definition being provided: /var/gcc/regression/trunk/10-gcc-gas/build/./gcc/xgcc -B/var/gcc/regression/trunk/10-gcc-gas/build/./gcc/ -B/vol/gcc/sparc-sun-solaris2.10/bin/ -B/vol/gcc/sparc-sun-solaris2.10/lib/ -isystem /vol/gcc/sparc-sun-solaris2.10/include -isystem /vol/gcc/sparc-sun-solaris2.10/sys-include -g -O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -I. -I/var/gcc/regression/trunk/10-gcc-gas/build/sparc-sun-solaris2.10/sparcv9/libgcc -I/vol/gcc/src/hg/trunk/local/gcc -I/vol/gcc/src/hg/trunk/local/gcc//var/gcc/regression/trunk/10-gcc-gas/build/sparc-sun-solaris2.10/sparcv9/libgcc -I/vol/gcc/src/hg/trunk/local/gcc/../include -I./../intl -I/vol/gcc/src/hg/trunk/local/gcc/../libcpp/include -I/vol/gcc/include -I/vol/gcc/include -I/vol/gcc/include -I/vol/gcc/src/hg/trunk/local/gcc/../libdecnumber -I/vol/gcc/src/hg/trunk/local/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf -g -O2 -m64 \ -c /vol/gcc/src/hg/trunk/local/gcc/config/sparc/gmon-sol2.c -o /var/gcc/regression/trunk/10-gcc-gas/build/sparc-sun-solaris2.10/sparcv9/libgcc/gmon.o In file included from ./tm.h:14:0, from /vol/gcc/src/hg/trunk/local/gcc/config/sparc/gmon-sol2.c:39: /vol/gcc/src/hg/trunk/local/gcc/flags.h:74:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'should_emit_struct_debug' /vol/gcc/src/hg/trunk/local/gcc/flags.h:79:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'use_gnu_debug_info_extensions' /vol/gcc/src/hg/trunk/local/gcc/flags.h:116:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'in_lto_p' /vol/gcc/src/hg/trunk/local/gcc/flags.h:135:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'warn_larger_than' /vol/gcc/src/hg/trunk/local/gcc/flags.h:136:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'larger_than_size' /vol/gcc/src/hg/trunk/local/gcc/flags.h:141:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'warn_frame_larger_than' /vol/gcc/src/hg/trunk/local/gcc/flags.h:142:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'frame_larger_than_size' /vol/gcc/src/hg/trunk/local/gcc/flags.h:161:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'final_insns_dump_p' /vol/gcc/src/hg/trunk/local/gcc/flags.h:303:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'flag_instrument_functions_exclude_p' In file included from /vol/gcc/src/hg/trunk/local/gcc/flags.h:361:0, from ./tm.h:14, from /vol/gcc/src/hg/trunk/local/gcc/config/sparc/gmon-sol2.c:39: ./options.h:14:3: error: expected specifier-qualifier-list before 'bool' In the case at hand, the includes of coretypes.h and tm.h are simply superfluous and can be removed. i386/gmon-sol2.c doesn't have this problem, and I long meant to merge those two files. Will probably do so when moving Solaris 2 libgcc files to toplevel libgcc. Bootstrap now continues (well into building target libs), so installed on mainline. Rainer 2010-10-11 Rainer Orth * config/sparc/gmon-sol2.c: Don't include coretypes.h, tm.h. diff -r a6ebd063d3e0 gcc/config/sparc/gmon-sol2.c --- a/gcc/config/sparc/gmon-sol2.c Mon Oct 11 11:31:36 2010 +0200 +++ b/gcc/config/sparc/gmon-sol2.c Mon Oct 11 18:40:48 2010 +0200 @@ -35,8 +35,6 @@ #include "tconfig.h" #include "tsystem.h" #include /* for creat() */ -#include "coretypes.h" -#include "tm.h" #if 0 #include "sparc/gmon.h"