From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22406 invoked by alias); 15 Mar 2002 21:33:05 -0000 Mailing-List: contact java-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-owner@gcc.gnu.org Received: (qmail 22351 invoked from network); 15 Mar 2002 21:33:04 -0000 Received: from unknown (HELO gemma.TechFak.Uni-Bielefeld.DE) (129.70.136.103) by sources.redhat.com with SMTP; 15 Mar 2002 21:33:04 -0000 Received: from xayide.TechFak.Uni-Bielefeld.DE.TechFak.Uni-Bielefeld.DE (xayide.TechFak.Uni-Bielefeld.DE [129.70.137.35]) by gemma.TechFak.Uni-Bielefeld.DE (8.9.1/8.9.1/TechFak/pk+ro20010720) with ESMTP id WAA28583; Fri, 15 Mar 2002 22:32:54 +0100 (MET) Received: by xayide.TechFak.Uni-Bielefeld.DE.TechFak.Uni-Bielefeld.DE (8.11.4+Sun/pk19971205) id g2FLWrp14853; Fri, 15 Mar 2002 22:32:53 +0100 (MET) From: Rainer Orth Message-ID: <15506.26755.691929.593580@xayide.TechFak.Uni-Bielefeld.DE> Date: Fri, 15 Mar 2002 13:33:00 -0000 To: tromey@redhat.com Cc: Anthony Green , Adam Megacz , java@gcc.gnu.org Subject: Re: gnu/gcj/io/shs.cc doesn't compile on Solaris 2.5.1 (bootstrap failure) In-Reply-To: <87adt9y0jd.fsf@creche.redhat.com> References: <200203132014.VAA27030@tamarinde.TechFak.Uni-Bielefeld.DE> <86henk3xp5.fsf@megacz.com> <15503.54620.761421.899604@xayide.TechFak.Uni-Bielefeld.DE> <867kog3vv5.fsf@megacz.com> <1016062833.12572.595.camel@dhcppc2> <15504.33266.2722.237598@xayide.TechFak.Uni-Bielefeld.DE> <87adt9y0jd.fsf@creche.redhat.com> X-Mailer: VM 6.62 under Emacs 19.34.1 Mime-Version: 1.0 (generated by tm-edit 7.106) Content-Type: text/plain; charset=US-ASCII X-SW-Source: 2002-03/txt/msg00327.txt.bz2 Tom Tromey writes: > Could you try this patch? close :-) After fixing the #else/#endif nesting, the initial version failed on Solaris 2.5.1: /vol/gnu/src/gcc/gcc-3.1-branch-dist/libjava/gnu/gcj/io/shs.h:24: conflicting types for `typedef unsigned int uint32_t' /vol/gcc/obj/gcc-3.1-20020313/2.5.1-gcc/gcc/include/pthread.h:40: previous declaration as `typedef long unsigned int uint32_t' Taking the whole section from java/lang/mprec.h works on both sparc-sun-solaris2.5.1 (where the bootstrap completes now; I'll run the testsuite and post results soon) and alpha-dec-osf4.0f (where shs.c compiles, but I get the same ICE compiling java/lang/Character.java, details follow). Rainer Index: gnu/gcj/io/shs.h =================================================================== RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/io/shs.h,v retrieving revision 1.2 diff -u -p -r1.2 shs.h --- shs.h 2002/02/07 05:01:29 1.2 +++ shs.h 2002/03/15 21:28:02 @@ -20,6 +20,14 @@ #else # if HAVE_STDINT_H # include +# else +typedef unsigned int uint8_t __attribute__((mode(QI))); +/* This is a blatant hack: on Solaris 2.5, pthread.h defines uint32_t + in pthread.h, which we sometimes include. We protect our + definition the same way Solaris 2.5 does, to avoid redefining it. */ +# ifndef _UINT32_T +typedef unsigned int uint32_t __attribute__((mode(SI))); +# endif # endif #endif