From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-return-42896-listarch-gcc=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 6801 invoked by alias); 15 Dec 2001 20:23:40 -0000
Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Archive: <http://gcc.gnu.org/ml/gcc/>
List-Post: <mailto:gcc@gcc.gnu.org>
List-Help: <http://gcc.gnu.org/ml/>
Sender: gcc-owner@gcc.gnu.org
Received: (qmail 6684 invoked from network); 15 Dec 2001 20:22:23 -0000
Received: from unknown (HELO devserv.devel.redhat.com) (199.183.24.200)
  by sources.redhat.com with SMTP; 15 Dec 2001 20:22:23 -0000
Received: (from jakub@localhost)
	by devserv.devel.redhat.com (8.11.0/8.11.0) id fBFKMGZ17704;
	Sat, 15 Dec 2001 15:22:16 -0500
Date: Sat, 15 Dec 2001 12:58:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Zack Weinberg <zack@codesourcery.com>
Cc: Andreas Jaeger <aj@suse.de>, gcc@gcc.gnu.org
Subject: Re: GCC Bootstrap currently broken
Message-ID: <20011215152216.Z4087@devserv.devel.redhat.com>
Reply-To: Jakub Jelinek <jakub@redhat.com>
References: <u84rmswplh.fsf@gromit.moeb> <20011215190908.GA14890@codesourcery.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20011215190908.GA14890@codesourcery.com>; from zack@codesourcery.com on Sat, Dec 15, 2001 at 11:09:08AM -0800
X-SW-Source: 2001-12/txt/msg00832.txt.bz2

On Sat, Dec 15, 2001 at 11:09:08AM -0800, Zack Weinberg wrote:
> On Sat, Dec 15, 2001 at 03:00:10PM +0100, Andreas Jaeger wrote:
> > 
> > Jakub,
> > Bootstrap of GCC on i686-linux currently fails with the following
> > messages.  We include some files twice there.
> 
> Appended patch seems to cure it.  Jakub must have only tested with CVS
> glibc.

Yes, I only have glibc-2.2.4 on my box.
Sorry.

It can be fixed either like you've done, or by using a different define
for skipping #includes in unwind-dw2-fde.c which would be unconditionally
defined in unwind-dw2-fde.c. Your patch is shorter...

> 	* unwind-dw2-fde-glibc.c: #define _Unwind_Find_FDE to itself
> 	before including unwind-dw2-fde.c, if we are not using the
> 	special code in this file.
> 
> ===================================================================
> Index: unwind-dw2-fde-glibc.c
> --- unwind-dw2-fde-glibc.c	2001/12/15 11:49:18	1.1
> +++ unwind-dw2-fde-glibc.c	2001/12/15 19:07:31
> @@ -287,5 +287,6 @@ _Unwind_Find_FDE (void *pc, struct dwarf
>  }
>  
>  #else
> +#define _Unwind_Find_FDE _Unwind_Find_FDE
>  #include "unwind-dw2-fde.c"
>  #endif

	Jakub