From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30523 invoked by alias); 18 Mar 2009 11:46:53 -0000 Received: (qmail 30509 invoked by uid 22791); 18 Mar 2009 11:46:52 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,HK_OBFDOM X-Spam-Check-By: sourceware.org Received: from nskntmtas04p.mx.bigpond.com (HELO nskntmtas04p.mx.bigpond.com) (61.9.168.146) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 18 Mar 2009 11:46:47 +0000 Received: from nskntotgx01p.mx.bigpond.com ([121.209.33.16]) by nskntmtas04p.mx.bigpond.com with ESMTP id <20090318114644.HKPE1877.nskntmtas04p.mx.bigpond.com@nskntotgx01p.mx.bigpond.com>; Wed, 18 Mar 2009 11:46:44 +0000 Received: from bubble.grove.modra.org ([121.209.33.16]) by nskntotgx01p.mx.bigpond.com with ESMTP id <20090318114644.GZYJ4598.nskntotgx01p.mx.bigpond.com@bubble.grove.modra.org>; Wed, 18 Mar 2009 11:46:44 +0000 Received: by bubble.grove.modra.org (Postfix, from userid 1000) id D9AC7170C391; Wed, 18 Mar 2009 22:16:43 +1030 (CST) Date: Wed, 18 Mar 2009 13:05:00 -0000 From: Alan Modra To: Pierre Muller , gdb-patches@sourceware.org, binutils@sourceware.org Subject: Re: [RFA] fix bfd multi-arch compilation failure Message-ID: <20090318114643.GK2440@bubble.grove.modra.org> Mail-Followup-To: Pierre Muller , gdb-patches@sourceware.org, binutils@sourceware.org References: <005001c9a757$db6bacb0$92430610$@u-strasbg.fr> <20090318110516.GJ2440@bubble.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090318110516.GJ2440@bubble.grove.modra.org> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) X-RPD-ScanID: Class unknown; VirusThreatLevel unknown, RefID str=0001.0A150204.49C0DF24.0072,ss=1,fgs=0 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-03/txt/msg00372.txt.bz2 On Wed, Mar 18, 2009 at 09:35:16PM +1030, Alan Modra wrote: > tweaked. This patch gets us back to just one file with alloca magic. Missed a couple. bfd/ * vms-hdr.c: Don't include alloca.h. opcodes/ * cgen-opc.c: Include alloca-conf.h rather than alloca.h. * Makefile.am: Run "make dep-am". * Makefile.in: Regenerate. Index: bfd/vms-hdr.c =================================================================== RCS file: /cvs/src/src/bfd/vms-hdr.c,v retrieving revision 1.23 diff -u -p -r1.23 vms-hdr.c --- bfd/vms-hdr.c 23 Feb 2009 09:28:43 -0000 1.23 +++ bfd/vms-hdr.c 18 Mar 2009 11:42:36 -0000 @@ -52,10 +52,6 @@ #include "vms.h" -#ifdef HAVE_ALLOCA_H -#include -#endif - static struct module *new_module (bfd *); static void parse_module (bfd *, struct module *, unsigned char *, unsigned int); Index: opcodes/cgen-opc.c =================================================================== RCS file: /cvs/src/src/opcodes/cgen-opc.c,v retrieving revision 1.18 diff -u -p -r1.18 cgen-opc.c --- opcodes/cgen-opc.c 5 Jul 2007 09:49:00 -0000 1.18 +++ opcodes/cgen-opc.c 18 Mar 2009 11:42:37 -0000 @@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "alloca-conf.h" #include "sysdep.h" #include #include "ansidecl.h" @@ -28,10 +29,6 @@ #include "symcat.h" #include "opcode/cgen.h" -#ifdef HAVE_ALLOCA_H -#include -#endif - static unsigned int hash_keyword_name (const CGEN_KEYWORD *, const char *, int); static unsigned int hash_keyword_value Index: opcodes/Makefile.am =================================================================== RCS file: /cvs/src/src/opcodes/Makefile.am,v retrieving revision 1.134 diff -u -p -r1.134 Makefile.am --- opcodes/Makefile.am 18 Mar 2009 11:27:18 -0000 1.134 +++ opcodes/Makefile.am 18 Mar 2009 11:42:37 -0000 @@ -715,9 +715,10 @@ cgen-bitset.lo: cgen-bitset.c $(INCDIR)/ cgen-dis.lo: cgen-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/opcode/cgen.h \ $(INCDIR)/opcode/cgen-bitset.h -cgen-opc.lo: cgen-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(BFD_H) \ - $(INCDIR)/symcat.h $(INCDIR)/opcode/cgen.h $(INCDIR)/opcode/cgen-bitset.h +cgen-opc.lo: cgen-opc.c $(INCDIR)/alloca-conf.h config.h \ + sysdep.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ + $(INCDIR)/safe-ctype.h $(BFD_H) $(INCDIR)/symcat.h \ + $(INCDIR)/opcode/cgen.h $(INCDIR)/opcode/cgen-bitset.h cr16-dis.lo: cr16-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h sysdep.h config.h \ $(INCDIR)/opcode/cr16.h $(INCDIR)/libiberty.h -- Alan Modra Australia Development Lab, IBM