From 3889c459bbe9826d419b59e6a0fa57aa078122ec Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 18 Mar 2009 11:47:18 +0000 Subject: [PATCH] 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. --- bfd/ChangeLog | 1 + bfd/vms-hdr.c | 4 ---- opcodes/ChangeLog | 1 + opcodes/Makefile.am | 7 ++++--- opcodes/Makefile.in | 7 ++++--- opcodes/cgen-opc.c | 7 ++----- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c2dd2079dda..341eae1a2b2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,6 @@ 2009-03-18 Alan Modra + * vms-hdr.c: Don't include alloca.h. * elf32-m68hc1x.c: Include alloca-conf.h. * xsym.c: Likewise. * elf64-hppa.c: Likewise. Remove existing #if's handling alloca. diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c index 6ad84ddd2a5..8c10df6222f 100644 --- a/bfd/vms-hdr.c +++ b/bfd/vms-hdr.c @@ -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); diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 8a8a7869e49..15ea3919e84 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,6 @@ 2009-03-18 Alan Modra + * cgen-opc.c: Include alloca-conf.h rather than alloca.h. * Makefile.am: Run "make dep-am". * Makefile.in: Regenerate. * openrisc-opc.c: Regenerate. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index a7e9a04834f..f6b575019d9 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -715,9 +715,10 @@ cgen-bitset.lo: cgen-bitset.c $(INCDIR)/libiberty.h \ 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 diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 578b38c04e2..afbaf2d1f38 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -1280,9 +1280,10 @@ cgen-bitset.lo: cgen-bitset.c $(INCDIR)/libiberty.h \ 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 diff --git a/opcodes/cgen-opc.c b/opcodes/cgen-opc.c index 9c1e302cb5c..7d522846319 100644 --- a/opcodes/cgen-opc.c +++ b/opcodes/cgen-opc.c @@ -1,6 +1,6 @@ /* CGEN generic opcode support. - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2007 + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2009 Free Software Foundation, Inc. This file is part of libopcodes. @@ -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 -- 2.30.2