[RFA] fix bfd multi-arch compilation failure
Alan Modra
amodra@bigpond.net.au
Wed Mar 18 11:46:00 GMT 2009
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 <alloca.h>
-#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 <stdio.h>
#include "ansidecl.h"
@@ -28,10 +29,6 @@
#include "symcat.h"
#include "opcode/cgen.h"
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#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
More information about the Binutils
mailing list