From ebd1c8757cf3f32daffe2615cbb778e495ebe412 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 7 Jun 2006 11:27:58 +0000 Subject: [PATCH] remove some duplicate #include's. --- gas/ChangeLog | 73 +++++++++++++++++++++++++++++++++++++++ gas/app.c | 5 ++- gas/as.c | 5 +-- gas/atof-generic.c | 4 +-- gas/cgen.c | 9 ++--- gas/cond.c | 3 +- gas/config/bfin-defs.h | 5 +-- gas/config/bfin-lex.l | 6 ++-- gas/config/bfin-parse.y | 5 ++- gas/config/obj-coff.h | 4 +-- gas/config/obj-elf.h | 6 +--- gas/config/obj-som.h | 3 +- gas/config/tc-arc.c | 2 -- gas/config/tc-arm.c | 8 +---- gas/config/tc-avr.c | 2 -- gas/config/tc-bfin.c | 7 +--- gas/config/tc-cris.c | 4 +-- gas/config/tc-d10v.c | 3 +- gas/config/tc-d30v.c | 3 +- gas/config/tc-dlx.h | 6 +--- gas/config/tc-fr30.c | 3 +- gas/config/tc-frv.c | 1 - gas/config/tc-h8300.c | 4 +-- gas/config/tc-hppa.c | 2 -- gas/config/tc-i370.c | 1 - gas/config/tc-i860.c | 6 ++-- gas/config/tc-i960.c | 4 +-- gas/config/tc-ip2k.c | 3 +- gas/config/tc-iq2000.c | 4 +-- gas/config/tc-m32c.c | 5 +-- gas/config/tc-m32r.c | 5 ++- gas/config/tc-maxq.c | 6 +--- gas/config/tc-mcore.c | 5 +-- gas/config/tc-mips.c | 4 +-- gas/config/tc-mmix.c | 5 ++- gas/config/tc-mn10200.c | 1 - gas/config/tc-mn10300.c | 1 - gas/config/tc-msp430.c | 5 +-- gas/config/tc-mt.c | 3 +- gas/config/tc-ns32k.c | 4 +-- gas/config/tc-openrisc.c | 3 +- gas/config/tc-ppc.c | 1 - gas/config/tc-s390.c | 3 +- gas/config/tc-sh.c | 4 +-- gas/config/tc-sh64.c | 4 +-- gas/config/tc-sparc.c | 4 +-- gas/config/tc-tic30.c | 3 +- gas/config/tc-tic4x.c | 5 +-- gas/config/tc-tic54x.c | 2 -- gas/config/tc-v850.c | 1 - gas/config/tc-vax.c | 2 -- gas/config/tc-xc16x.c | 2 -- gas/config/tc-xstormy16.c | 4 +-- gas/config/tc-xtensa.c | 2 -- gas/config/tc-z80.c | 6 +--- gas/config/tc-z8k.c | 5 +-- gas/dwarf2dbg.c | 1 - gas/expr.c | 1 - gas/input-file.c | 5 +-- gas/input-scrub.c | 3 +- gas/itbl-lex.l | 8 ++--- gas/itbl-ops.c | 8 ++--- gas/itbl-ops.h | 10 +----- gas/itbl-parse.y | 4 +-- gas/macro.c | 38 +------------------- gas/macro.h | 5 +-- gas/output-file.c | 6 +--- gas/read.c | 1 - gas/sb.c | 15 ++------ gas/sb.h | 5 +-- 70 files changed, 143 insertions(+), 253 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 2690c5b9a90..c660064fa30 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,76 @@ +2006-06-07 Alan Modra + Ladislav Michl + + * app.c: Don't include headers already included by as.h. + * as.c: Likewise. + * atof-generic.c: Likewise. + * cgen.c: Likewise. + * dwarf2dbg.c: Likewise. + * expr.c: Likewise. + * input-file.c: Likewise. + * input-scrub.c: Likewise. + * macro.c: Likewise. + * output-file.c: Likewise. + * read.c: Likewise. + * sb.c: Likewise. + * config/bfin-lex.l: Likewise. + * config/obj-coff.h: Likewise. + * config/obj-elf.h: Likewise. + * config/obj-som.h: Likewise. + * config/tc-arc.c: Likewise. + * config/tc-arm.c: Likewise. + * config/tc-avr.c: Likewise. + * config/tc-bfin.c: Likewise. + * config/tc-cris.c: Likewise. + * config/tc-d10v.c: Likewise. + * config/tc-d30v.c: Likewise. + * config/tc-dlx.h: Likewise. + * config/tc-fr30.c: Likewise. + * config/tc-frv.c: Likewise. + * config/tc-h8300.c: Likewise. + * config/tc-hppa.c: Likewise. + * config/tc-i370.c: Likewise. + * config/tc-i860.c: Likewise. + * config/tc-i960.c: Likewise. + * config/tc-ip2k.c: Likewise. + * config/tc-iq2000.c: Likewise. + * config/tc-m32c.c: Likewise. + * config/tc-m32r.c: Likewise. + * config/tc-maxq.c: Likewise. + * config/tc-mcore.c: Likewise. + * config/tc-mips.c: Likewise. + * config/tc-mmix.c: Likewise. + * config/tc-mn10200.c: Likewise. + * config/tc-mn10300.c: Likewise. + * config/tc-msp430.c: Likewise. + * config/tc-mt.c: Likewise. + * config/tc-ns32k.c: Likewise. + * config/tc-openrisc.c: Likewise. + * config/tc-ppc.c: Likewise. + * config/tc-s390.c: Likewise. + * config/tc-sh.c: Likewise. + * config/tc-sh64.c: Likewise. + * config/tc-sparc.c: Likewise. + * config/tc-tic30.c: Likewise. + * config/tc-tic4x.c: Likewise. + * config/tc-tic54x.c: Likewise. + * config/tc-v850.c: Likewise. + * config/tc-vax.c: Likewise. + * config/tc-xc16x.c: Likewise. + * config/tc-xstormy16.c: Likewise. + * config/tc-xtensa.c: Likewise. + * config/tc-z80.c: Likewise. + * config/tc-z8k.c: Likewise. + * macro.h: Don't include sb.h or ansidecl.h. + * sb.h: Don't include stdio.h or ansidecl.h. + * cond.c: Include sb.h. + * itbl-lex.l: Include as.h instead of other system headers. + * itbl-parse.y: Likewise. + * itbl-ops.c: Similarly. + * itbl-ops.h: Don't include as.h or ansidecl.h. + * config/bfin-defs.h: Don't include bfd.h or as.h. + * config/bfin-parse.y: Include as.h instead of other system headers. + 2006-06-06 Ben Elliston Anton Blanchard diff --git a/gas/app.c b/gas/app.c index 882a128b1aa..b4041153708 100644 --- a/gas/app.c +++ b/gas/app.c @@ -1,6 +1,6 @@ /* This is the Assembler Pre-Processor Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -26,8 +26,7 @@ # into a .line \n.file pair. This needs better error-handling. */ -#include -#include "as.h" /* For BAD_CASE() only. */ +#include "as.h" #if (__STDC__ != 1) #ifndef const diff --git a/gas/as.c b/gas/as.c index 727a1dd40ee..e1bfb868997 100644 --- a/gas/as.c +++ b/gas/as.c @@ -1,6 +1,6 @@ /* as.c - GAS main program. Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -31,8 +31,6 @@ Since no-one else says they will support them in future: I don't support them now. */ -#include "ansidecl.h" - #define COMMON #include "as.h" @@ -42,7 +40,6 @@ #include "macro.h" #include "dwarf2dbg.h" #include "dw2gencfi.h" -#include "hash.h" #include "bfdver.h" #ifdef HAVE_ITBL_CPU diff --git a/gas/atof-generic.c b/gas/atof-generic.c index 6a5c2f15b3c..3021c4c861b 100644 --- a/gas/atof-generic.c +++ b/gas/atof-generic.c @@ -1,6 +1,6 @@ /* atof_generic.c - turn a string of digits into a Flonum Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, - 2001, 2003, 2005 Free Software Foundation, Inc. + 2001, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,8 +19,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include - #include "as.h" #include "safe-ctype.h" diff --git a/gas/cgen.c b/gas/cgen.c index 363c05e5318..5a537899959 100644 --- a/gas/cgen.c +++ b/gas/cgen.c @@ -1,6 +1,6 @@ /* GAS interface for targets using CGEN: Cpu tools GENerator. - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,12 +19,9 @@ Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include "ansidecl.h" -#include "libiberty.h" -#include "bfd.h" +#include "as.h" #include "symcat.h" #include "cgen-desc.h" -#include "as.h" #include "subsegs.h" #include "cgen.h" #include "dwarf2dbg.h" diff --git a/gas/cond.c b/gas/cond.c index d6c32acc253..d76e4d98d9a 100644 --- a/gas/cond.c +++ b/gas/cond.c @@ -1,6 +1,6 @@ /* cond.c - conditional assembly pseudo-ops, and .include Copyright 1990, 1991, 1992, 1993, 1995, 1997, 1998, 2000, 2001, 2002, - 2003 Free Software Foundation, Inc. + 2003, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -20,6 +20,7 @@ 02110-1301, USA. */ #include "as.h" +#include "sb.h" #include "macro.h" #include "obstack.h" diff --git a/gas/config/bfin-defs.h b/gas/config/bfin-defs.h index 3c6b3b22729..f94107136cf 100644 --- a/gas/config/bfin-defs.h +++ b/gas/config/bfin-defs.h @@ -1,5 +1,5 @@ /* bfin-defs.h ADI Blackfin gas header file - Copyright 2005 + Copyright 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -22,9 +22,6 @@ #ifndef BFIN_PARSE_H #define BFIN_PARSE_H -#include -#include "as.h" - #define PCREL 1 #define CODE_FRAG_SIZE 4096 /* 1 page. */ diff --git a/gas/config/bfin-lex.l b/gas/config/bfin-lex.l index 3a0077cd985..21f28454132 100644 --- a/gas/config/bfin-lex.l +++ b/gas/config/bfin-lex.l @@ -1,5 +1,5 @@ /* bfin-lex.l ADI Blackfin lexer - Copyright 2005 + Copyright 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -20,11 +20,9 @@ 02110-1301, USA. */ %{ -#include -#include +#include "as.h" #include "bfin-defs.h" #include "bfin-parse.h" -#include "as.h" static long parse_int (char **end); static int parse_halfreg (Register *r, int cl, char *hr); diff --git a/gas/config/bfin-parse.y b/gas/config/bfin-parse.y index 35c4c8103f0..609c282d497 100644 --- a/gas/config/bfin-parse.y +++ b/gas/config/bfin-parse.y @@ -1,5 +1,5 @@ /* bfin-parse.y ADI Blackfin parser - Copyright 2005 + Copyright 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -20,8 +20,7 @@ 02110-1301, USA. */ %{ -#include -#include +#include "as.h" #include #include "bfin-aux.h" // opcode generating auxiliaries diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h index 6fcbc9f06cb..8d10b4d59b1 100644 --- a/gas/config/obj-coff.h +++ b/gas/config/obj-coff.h @@ -1,6 +1,6 @@ /* coff object file format Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS. @@ -27,8 +27,6 @@ #include "targ-cpu.h" -#include "bfd.h" - /* This internal_lineno crap is to stop namespace pollution from the bfd internal coff headerfile. */ #define internal_lineno bfd_internal_lineno diff --git a/gas/config/obj-elf.h b/gas/config/obj-elf.h index 7792f799df3..6fc08d4b663 100644 --- a/gas/config/obj-elf.h +++ b/gas/config/obj-elf.h @@ -1,6 +1,6 @@ /* ELF object file format. Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004 Free Software Foundation, Inc. + 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -34,8 +34,6 @@ #define OUTPUT_FLAVOR bfd_target_elf_flavour #endif -#include "bfd.h" - #define BYTES_IN_WORD 4 /* for now */ #include "bfd/elf-bfd.h" @@ -90,8 +88,6 @@ struct elf_obj_sy #define TARGET_SYMBOL_FIELDS ELF_TARGET_SYMBOL_FIELDS #endif -/* #include "targ-cpu.h" */ - #ifndef FALSE #define FALSE 0 #define TRUE !FALSE diff --git a/gas/config/obj-som.h b/gas/config/obj-som.h index 85f3f72bb40..16ca21e1c6e 100644 --- a/gas/config/obj-som.h +++ b/gas/config/obj-som.h @@ -1,5 +1,5 @@ /* SOM object file format. - Copyright 1993, 1994, 1995, 1998, 2000, 2004, 2005 + Copyright 1993, 1994, 1995, 1998, 2000, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -27,7 +27,6 @@ #define OBJ_SOM 1 -#include "bfd.h" #include "bfd/som.h" #include "targ-cpu.h" diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c index 525b54083fb..490f327efd4 100644 --- a/gas/config/tc-arc.c +++ b/gas/config/tc-arc.c @@ -20,8 +20,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include "libiberty.h" #include "as.h" #include "struc-symbol.h" #include "safe-ctype.h" diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 375064c4aa2..2a7e9044128 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -1,6 +1,6 @@ /* tc-arm.c -- Assemble for the ARM Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 + 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org) Modified by David Taylor (dtaylor@armltd.co.uk) @@ -25,18 +25,12 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include #define NO_RELOC 0 #include "as.h" #include "safe-ctype.h" - -/* Need TARGET_CPU. */ -#include "config.h" #include "subsegs.h" #include "obstack.h" -#include "symbols.h" -#include "listing.h" #include "opcode/arm.h" diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c index cd1e47e611a..05fff3a439f 100644 --- a/gas/config/tc-avr.c +++ b/gas/config/tc-avr.c @@ -21,11 +21,9 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" -#include "libiberty.h" struct avr_opcodes_s { diff --git a/gas/config/tc-bfin.c b/gas/config/tc-bfin.c index 03e733a0de6..aff8ed8a8fd 100644 --- a/gas/config/tc-bfin.c +++ b/gas/config/tc-bfin.c @@ -1,5 +1,5 @@ /* tc-bfin.c -- Assembler for the ADI Blackfin. - Copyright 2005 + Copyright 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -21,7 +21,6 @@ #include "as.h" #include "struc-symbol.h" -#include "obj-elf.h" #include "bfin-defs.h" #include "obstack.h" #include "safe-ctype.h" @@ -940,11 +939,7 @@ bfin_start_line_hook () /* Special extra functions that help bfin-parse.y perform its job. */ -#include #include -#include -#include -#include "bfin-defs.h" struct obstack mempool; diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c index 75c675c35d8..83e01c58954 100644 --- a/gas/config/tc-cris.c +++ b/gas/config/tc-cris.c @@ -1,5 +1,6 @@ /* tc-cris.c -- Assembler code for the CRIS CPU core. - Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002, 2003, 2004, 2006 + Free Software Foundation, Inc. Contributed by Axis Communications AB, Lund, Sweden. Originally written for GAS 1.38.1 by Mikael Asker. @@ -22,7 +23,6 @@ Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c index 6c94edbb4ef..c12eb640294 100644 --- a/gas/config/tc-d10v.c +++ b/gas/config/tc-d10v.c @@ -1,5 +1,5 @@ /* tc-d10v.c -- Assembler code for the Mitsubishi D10V - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005 + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c index 848ad0341f0..fb7776a3953 100644 --- a/gas/config/tc-d30v.c +++ b/gas/config/tc-d30v.c @@ -1,5 +1,5 @@ /* tc-d30v.c -- Assembler code for the Mitsubishi D30V - Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005 + Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-dlx.h b/gas/config/tc-dlx.h index fdf8d341dbc..2cf3d8163a3 100644 --- a/gas/config/tc-dlx.h +++ b/gas/config/tc-dlx.h @@ -1,5 +1,5 @@ /* tc-dlx.h -- Assemble for the DLX - Copyright 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -22,10 +22,6 @@ #define TC_DLX -#ifndef __BFD_H_SEEN__ -#include "bfd.h" -#endif - /* The target BFD architecture. */ #define TARGET_ARCH bfd_arch_dlx #define TARGET_FORMAT "elf32-dlx" diff --git a/gas/config/tc-fr30.c b/gas/config/tc-fr30.c index b0f2204c7f0..b7004c01755 100644 --- a/gas/config/tc-fr30.c +++ b/gas/config/tc-fr30.c @@ -1,5 +1,5 @@ /* tc-fr30.c -- Assembler for the Fujitsu FR30. - Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2005 + Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c index a2f4ccef4a6..77787719bcd 100644 --- a/gas/config/tc-frv.c +++ b/gas/config/tc-frv.c @@ -18,7 +18,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "subsegs.h" #include "symcat.h" diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c index 7db600c72bb..91f58e97307 100644 --- a/gas/config/tc-h8300.c +++ b/gas/config/tc-h8300.c @@ -1,6 +1,6 @@ /* tc-h8300.c -- Assemble code for the Renesas H8/300 Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -21,10 +21,8 @@ /* Written By Steve Chamberlain . */ -#include #include "as.h" #include "subsegs.h" -#include "bfd.h" #include "dwarf2dbg.h" #define DEFINE_TABLE diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c index 66d72a1b843..e54ba8ed852 100644 --- a/gas/config/tc-hppa.c +++ b/gas/config/tc-hppa.c @@ -22,8 +22,6 @@ /* HP PA-RISC support was contributed by the Center for Software Science at the University of Utah. */ -#include - #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-i370.c b/gas/config/tc-i370.c index d87d2d9f808..4445abeb406 100644 --- a/gas/config/tc-i370.c +++ b/gas/config/tc-i370.c @@ -27,7 +27,6 @@ similarities between HLASM and the MRI assemblers, such as section names, lack of leading . in pseudo-ops, DC and DS, etc. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c index 4a87c540576..c5aca38e450 100644 --- a/gas/config/tc-i860.c +++ b/gas/config/tc-i860.c @@ -1,6 +1,6 @@ /* tc-i860.c -- Assembler for the Intel i860 architecture. - Copyright 1989, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright 1989, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, + 2003, 2006 Free Software Foundation, Inc. Brought back from the dead and completely reworked by Jason Eckhardt . @@ -21,8 +21,6 @@ with GAS; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c index a3206bbf2d0..0af3a80c35e 100644 --- a/gas/config/tc-i960.c +++ b/gas/config/tc-i960.c @@ -1,6 +1,6 @@ /* tc-i960.c - All the i80960-specific stuff Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2005 + 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS. @@ -63,8 +63,6 @@ less than 4096 is specified, in which case we need neither a fixup nor a relocation directive. */ -#include - #include "as.h" #include "safe-ctype.h" diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c index 10e9e2f3fa2..7c3f77513d8 100644 --- a/gas/config/tc-ip2k.c +++ b/gas/config/tc-ip2k.c @@ -1,5 +1,5 @@ /* tc-ip2k.c -- Assembler for the Scenix IP2xxx. - Copyright (C) 2000, 2002, 2003, 2005 Free Software Foundation. + Copyright (C) 2000, 2002, 2003, 2005, 2006 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -18,7 +18,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "subsegs.h" #include "symcat.h" diff --git a/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c index 0d689c09a21..6e6fe550c81 100644 --- a/gas/config/tc-iq2000.c +++ b/gas/config/tc-iq2000.c @@ -1,5 +1,5 @@ /* tc-iq2000.c -- Assembler for the Sitera IQ2000. - Copyright (C) 2003, 2004, 2005 Free Software Foundation. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -18,7 +18,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" @@ -29,7 +28,6 @@ #include "elf/common.h" #include "elf/iq2000.h" #include "libbfd.h" -#include "hash.h" #include "macro.h" /* Structure to hold all of the different components describing diff --git a/gas/config/tc-m32c.c b/gas/config/tc-m32c.c index 5f174d39c0d..87ccd697801 100644 --- a/gas/config/tc-m32c.c +++ b/gas/config/tc-m32c.c @@ -1,5 +1,5 @@ /* tc-m32c.c -- Assembler for the Renesas M32C. - Copyright (C) 2005 Free Software Foundation. + Copyright (C) 2005, 2006 Free Software Foundation. Contributed by RedHat. This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "as.h" #include "subsegs.h" #include "symcat.h" @@ -29,9 +28,7 @@ #include "elf/common.h" #include "elf/m32c.h" #include "libbfd.h" -#include "libiberty.h" #include "safe-ctype.h" -#include "bfd.h" /* Structure to hold all of the different components describing an individual instruction. */ diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c index 51b160a98f7..bec2a8ced1a 100644 --- a/gas/config/tc-m32r.c +++ b/gas/config/tc-m32r.c @@ -1,6 +1,6 @@ /* tc-m32r.c -- Assembler for the Renesas M32R. - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-maxq.c b/gas/config/tc-maxq.c index 1633475d5e7..293d7000398 100644 --- a/gas/config/tc-maxq.c +++ b/gas/config/tc-maxq.c @@ -1,6 +1,6 @@ /* tc-maxq.c -- assembler code for a MAXQ chip. - Copyright 2004, 2005 Free Software Foundation, Inc. + Copyright 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by HCL Technologies Pvt. Ltd. @@ -34,10 +34,6 @@ #define MAXQ10S 1 #endif -#ifndef _STRING_H -#include "string.h" -#endif - #ifndef DEFAULT_ARCH #define DEFAULT_ARCH "MAXQ20" #endif diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c index a795a555036..d84f0c8eab3 100644 --- a/gas/config/tc-mcore.c +++ b/gas/config/tc-mcore.c @@ -1,5 +1,5 @@ /* tc-mcore.c -- Assemble code for M*Core - Copyright 1999, 2000, 2001, 2002, 2003, 2005 + Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,14 +19,11 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" -#include "bfd.h" #include "subsegs.h" #define DEFINE_TABLE #include "../opcodes/mcore-opc.h" #include "safe-ctype.h" -#include #ifdef OBJ_ELF #include "elf/mcore.h" diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index f657628695a..65d5e64dd69 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -1,6 +1,6 @@ /* tc-mips.c -- assemble code for a MIPS chip. Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by the OSF and Ralph Campbell. Written by Keith Knowles and Ralph Campbell, working independently. Modified for ECOFF and R4000 support by Ian Lance Taylor of Cygnus @@ -28,8 +28,6 @@ #include "subsegs.h" #include "safe-ctype.h" -#include - #include "opcode/mips.h" #include "itbl-ops.h" #include "dwarf2dbg.h" diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c index c1a8d536b18..ff522f62ad7 100644 --- a/gas/config/tc-mmix.c +++ b/gas/config/tc-mmix.c @@ -1,5 +1,6 @@ /* tc-mmix.c -- Assembler for Don Knuth's MMIX. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -26,11 +27,9 @@ compatible syntax, but the main purpose is to serve GCC. */ -#include #include #include "as.h" #include "subsegs.h" -#include "bfd.h" #include "elf/mmix.h" #include "opcode/mmix.h" #include "safe-ctype.h" diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c index 909652ef6e0..9eecf47ea58 100644 --- a/gas/config/tc-mn10200.c +++ b/gas/config/tc-mn10200.c @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 56ee06e2a74..a1cacf10488 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c index 4abf10e3c2d..72c73da2f4a 100644 --- a/gas/config/tc-msp430.c +++ b/gas/config/tc-msp430.c @@ -1,6 +1,6 @@ /* tc-msp430.c -- Assembler code for the Texas Instruments MSP430 - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by Dmitry Diky This file is part of GAS, the GNU Assembler. @@ -20,9 +20,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include #include #define PUSH_1X_WORKAROUND diff --git a/gas/config/tc-mt.c b/gas/config/tc-mt.c index f9a610e049c..f2b9aa81306 100644 --- a/gas/config/tc-mt.c +++ b/gas/config/tc-mt.c @@ -1,5 +1,5 @@ /* tc-mt.c -- Assembler for the Morpho Technologies mt . - Copyright (C) 2005 Free Software Foundation. + Copyright (C) 2005, 2006 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -18,7 +18,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "as.h" #include "dwarf2dbg.h" #include "subsegs.h" diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c index 1a8c3cb3eea..a407f715b66 100644 --- a/gas/config/tc-ns32k.c +++ b/gas/config/tc-ns32k.c @@ -1,6 +1,6 @@ /* ns32k.c -- Assemble on the National Semiconductor 32k series Copyright 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2005 + 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -22,8 +22,6 @@ /*#define SHOW_NUM 1*//* Uncomment for debugging. */ -#include - #include "as.h" #include "opcode/ns32k.h" diff --git a/gas/config/tc-openrisc.c b/gas/config/tc-openrisc.c index 50597a7f9dc..b27e022fecd 100644 --- a/gas/config/tc-openrisc.c +++ b/gas/config/tc-openrisc.c @@ -1,5 +1,5 @@ /* tc-openrisc.c -- Assembler for the OpenRISC family. - Copyright 2001, 2002, 2003, 2005 Free Software Foundation. + Copyright 2001, 2002, 2003, 2005, 2006 Free Software Foundation. Contributed by Johan Rydberg, jrydberg@opencores.org This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "subsegs.h" #include "symcat.h" diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 8b59f3fa4b1..7af4fa6309d 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -20,7 +20,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index a308ca253ae..463cde7a07d 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -1,5 +1,5 @@ /* tc-s390.c -- Assemble for the S390 - Copyright 2000, 2001, 2002, 2003, 2004, 2005 + Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). @@ -20,7 +20,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c index fa2e75ada27..0abbe92e211 100644 --- a/gas/config/tc-sh.c +++ b/gas/config/tc-sh.c @@ -1,6 +1,6 @@ /* tc-sh.c -- Assemble code for the Renesas / SuperH SH Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -21,9 +21,7 @@ /* Written By Steve Chamberlain */ -#include #include "as.h" -#include "bfd.h" #include "subsegs.h" #define DEFINE_TABLE #include "opcodes/sh-opc.h" diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c index 74330612e43..3e9346bb515 100644 --- a/gas/config/tc-sh64.c +++ b/gas/config/tc-sh64.c @@ -1,5 +1,6 @@ /* tc-sh64.c -- Assemble code for the SuperH SH SHcompact and SHmedia. - Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation. + Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -25,7 +26,6 @@ #define HAVE_SH64 -#include #include "as.h" #include "safe-ctype.h" #include "opcodes/sh64-opc.h" diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c index b9a3025ab61..d84c2733678 100644 --- a/gas/config/tc-sparc.c +++ b/gas/config/tc-sparc.c @@ -1,6 +1,6 @@ /* tc-sparc.c -- Assemble for the SPARC Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,8 +19,6 @@ to the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include - #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c index 7b3439f8c72..e6ffbb8226d 100644 --- a/gas/config/tc-tic30.c +++ b/gas/config/tc-tic30.c @@ -1,5 +1,5 @@ /* tc-c30.c -- Assembly code for the Texas Instruments TMS320C30 - Copyright 1998, 1999, 2000, 2001, 2002, 2003 + Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc. Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au) @@ -28,7 +28,6 @@ #include "as.h" #include "safe-ctype.h" #include "opcode/tic30.h" -#include /* Put here all non-digit non-letter characters that may occur in an operand. */ diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c index ec6753c1ed7..a92d6a6d22a 100644 --- a/gas/config/tc-tic4x.c +++ b/gas/config/tc-tic4x.c @@ -1,5 +1,5 @@ /* tc-tic4x.c -- Assemble for the Texas Instruments TMS320C[34]x. - Copyright (C) 1997,1998, 2002, 2003, 2005 Free Software Foundation. + Copyright (C) 1997,1998, 2002, 2003, 2005, 2006 Free Software Foundation. Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz) @@ -45,14 +45,11 @@ o Support 'abc' constants (that is 0x616263) */ -#include #include "safe-ctype.h" #include "as.h" #include "opcode/tic4x.h" #include "subsegs.h" #include "obstack.h" -#include "symbols.h" -#include "listing.h" /* OK, we accept a syntax similar to the other well known C30 assembly tools. With TIC4X_ALT_SYNTAX defined we are more diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c index f84afcd838e..b9f4fcfa256 100644 --- a/gas/config/tc-tic54x.c +++ b/gas/config/tc-tic54x.c @@ -45,9 +45,7 @@ COFF1 limits section names to 8 characters. Some of the default behavior changed from COFF1 to COFF2. */ -#include #include -#include #include "as.h" #include "safe-ctype.h" #include "sb.h" diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c index 79849561601..dc98bd5a1f5 100644 --- a/gas/config/tc-v850.c +++ b/gas/config/tc-v850.c @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c index b0ac3f745f3..47b4fcaea24 100644 --- a/gas/config/tc-vax.c +++ b/gas/config/tc-vax.c @@ -2035,8 +2035,6 @@ main (void) We declare arrays non-local in case some of our tiny-minded machines default to small stacks. Also, helps with some debuggers. */ -#include - char answer[100]; /* Human types into here. */ char *p; /* */ char *myerr; diff --git a/gas/config/tc-xc16x.c b/gas/config/tc-xc16x.c index 7a369b42ec2..2027dbdcaac 100644 --- a/gas/config/tc-xc16x.c +++ b/gas/config/tc-xc16x.c @@ -20,7 +20,6 @@ 02110-1301, USA. */ -#include #include "as.h" #include "safe-ctype.h" #include "subsegs.h" @@ -28,7 +27,6 @@ #include "opcodes/xc16x-desc.h" #include "opcodes/xc16x-opc.h" #include "cgen.h" -#include "bfd.h" #include "dwarf2dbg.h" diff --git a/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c index 29e01994245..e2f4631a8ec 100644 --- a/gas/config/tc-xstormy16.c +++ b/gas/config/tc-xstormy16.c @@ -1,5 +1,6 @@ /* tc-xstormy16.c -- Assembler for the Sanyo XSTORMY16. - Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation. + Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -18,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include "as.h" #include "subsegs.h" #include "symcat.h" diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index 5cd3c88223d..26b389eb796 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -18,13 +18,11 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include #include "as.h" #include "sb.h" #include "safe-ctype.h" #include "tc-xtensa.h" -#include "frags.h" #include "subsegs.h" #include "xtensa-relax.h" #include "xtensa-istack.h" diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c index 413e336a2c8..73b3fc83150 100644 --- a/gas/config/tc-z80.c +++ b/gas/config/tc-z80.c @@ -1,5 +1,5 @@ /* tc-z80.c -- Assemble code for the Zilog Z80 and ASCII R800 - Copyright 2005 Free Software Foundation, Inc. + Copyright 2005, 2006 Free Software Foundation, Inc. Contributed by Arnold Metselaar This file is part of GAS, the GNU Assembler. @@ -20,12 +20,8 @@ 02110-1301, USA. */ #include "as.h" -#include "listing.h" -#include "bfd.h" #include "safe-ctype.h" #include "subsegs.h" -#include "symbols.h" -#include "libiberty.h" /* Exported constants. */ const char comment_chars[] = ";\0"; diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c index 355ac12c2bb..cd6510c99da 100644 --- a/gas/config/tc-z8k.c +++ b/gas/config/tc-z8k.c @@ -1,6 +1,6 @@ /* tc-z8k.c -- Assemble code for the Zilog Z800n Copyright 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -21,10 +21,7 @@ /* Written By Steve Chamberlain . */ -#include - #include "as.h" -#include "bfd.h" #include "safe-ctype.h" #define DEFINE_TABLE #include "opcodes/z8k-opc.h" diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c index 65a0a266963..2e00b9857ed 100644 --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -28,7 +28,6 @@ [epilogue_begin] [is_stmt VALUE] [isa VALUE] */ -#include "ansidecl.h" #include "as.h" #include "safe-ctype.h" diff --git a/gas/expr.c b/gas/expr.c index 746d7a2d889..6297f19b475 100644 --- a/gas/expr.c +++ b/gas/expr.c @@ -25,7 +25,6 @@ (It also gives smaller files to re-compile.) Here, "operand"s are of expressions, not instructions. */ -#include #define min(a, b) ((a) < (b) ? (a) : (b)) #include "as.h" diff --git a/gas/input-file.c b/gas/input-file.c index 343f0494087..6ebd6b9139b 100644 --- a/gas/input-file.c +++ b/gas/input-file.c @@ -1,6 +1,6 @@ /* input_file.c - Deal with Input Files - Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2005 + 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -25,9 +25,6 @@ What we lose in "efficiency" we gain in modularity. Note we don't need to #include the "as.h" file. No common coupling! */ -#include -#include -#include #include "as.h" #include "input-file.h" #include "safe-ctype.h" diff --git a/gas/input-scrub.c b/gas/input-scrub.c index 8562ee25dff..7407741b3fa 100644 --- a/gas/input-scrub.c +++ b/gas/input-scrub.c @@ -1,6 +1,6 @@ /* input_scrub.c - Break up input buffers into whole numbers of lines. Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 2000, 2001, 2003 + 2000, 2001, 2003, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -20,7 +20,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include /* Need this to make errno declaration right */ #include "as.h" #include "input-file.h" #include "sb.h" diff --git a/gas/itbl-lex.l b/gas/itbl-lex.l index aceeac4f9f0..185f956ecea 100644 --- a/gas/itbl-lex.l +++ b/gas/itbl-lex.l @@ -1,5 +1,6 @@ /* itbl-lex.l - Copyright 1997, 1998, 2001, 2002, 2005 Free Software Foundation, Inc. + Copyright 1997, 1998, 2001, 2002, 2005, 2006 + Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,10 +20,7 @@ 02110-1301, USA. */ %{ -#include -#include -#include - +#include "as.h" #include "itbl-lex.h" #include diff --git a/gas/itbl-ops.c b/gas/itbl-ops.c index bd1f6473f45..7c5c7495673 100644 --- a/gas/itbl-ops.c +++ b/gas/itbl-ops.c @@ -1,5 +1,5 @@ /* itbl-ops.c - Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2005 + Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -89,9 +89,7 @@ * */ -#include -#include -#include +#include "as.h" #include "itbl-ops.h" #include @@ -253,8 +251,6 @@ itbl_add_operand (struct itbl_entry *e, int yytype, int sbit, /* Interfaces for assembler and disassembler */ #ifndef STAND_ALONE -#include "as.h" -#include "symbols.h" static void append_insns_as_macros (void); /* Initialize for gas. */ diff --git a/gas/itbl-ops.h b/gas/itbl-ops.h index 47dc8b295b1..b1687da7c52 100644 --- a/gas/itbl-ops.h +++ b/gas/itbl-ops.h @@ -1,5 +1,5 @@ /* itbl-ops.h - Copyright 1997, 1999, 2000, 2003 Free Software Foundation, Inc. + Copyright 1997, 1999, 2000, 2003, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -20,14 +20,6 @@ /* External functions, constants and defines for itbl support */ -#include "ansidecl.h" - -/* Include file notes: "expr.h" needed before targ-*.h, - * "targ-env.h" includes the chain of target dependant headers, - * "targ-cpu.h" has the HAVE_ITBL_CPU define, and - * as.h includes them all */ -#include "as.h" - #ifdef HAVE_ITBL_CPU #include "itbl-cpu.h" #endif diff --git a/gas/itbl-parse.y b/gas/itbl-parse.y index a7a52dfabff..45e10efd20e 100644 --- a/gas/itbl-parse.y +++ b/gas/itbl-parse.y @@ -1,5 +1,5 @@ /* itbl-parse.y - Copyright 1997, 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright 1997, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -246,7 +246,7 @@ FIXME! hex is ambiguous with any digit */ -#include +#include "as.h" #include "itbl-lex.h" #include "itbl-ops.h" diff --git a/gas/macro.c b/gas/macro.c index e6e9d05ba27..67846eb2daa 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -1,6 +1,6 @@ /* macro.c - macro support for gas Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, sac@cygnus.com @@ -22,47 +22,11 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" - -#ifndef __GNUC__ -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX -/* Indented so that pre-ansi C compilers will ignore it, rather than - choke on it. Some versions of AIX require this to be the first - thing in the file. */ - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -# if !defined (__STDC__) && !defined (__hpux) -extern char *alloca (); -# else -extern void *alloca (); -# endif /* __STDC__, __hpux */ -# endif /* alloca */ -# endif /* _AIX */ -# endif /* HAVE_ALLOCA_H */ -#endif /* __GNUC__ */ - -#include -#ifdef HAVE_STRING_H -#include -#else -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif #include "as.h" -#include "libiberty.h" #include "safe-ctype.h" #include "sb.h" -#include "hash.h" #include "macro.h" -#include "asintl.h" - /* The routines in this file handle macro definition and expansion. They are called by gas. */ diff --git a/gas/macro.h b/gas/macro.h index 4fdaa52d097..104aeae6f02 100644 --- a/gas/macro.h +++ b/gas/macro.h @@ -1,5 +1,5 @@ /* macro.h - header file for macro support for gas - Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004 + Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, @@ -26,9 +26,6 @@ #define MACRO_H -#include "ansidecl.h" -#include "sb.h" - /* Structures used to store macros. Each macro knows its name and included text. It gets built with a diff --git a/gas/output-file.c b/gas/output-file.c index f94359ab6b0..446af306ca1 100644 --- a/gas/output-file.c +++ b/gas/output-file.c @@ -1,6 +1,6 @@ /* output-file.c - Deal with the output file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,17 +19,13 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include - #include "as.h" - #include "output-file.h" #ifndef TARGET_MACH #define TARGET_MACH 0 #endif -#include "bfd.h" bfd *stdoutput; void diff --git a/gas/read.c b/gas/read.c index d51835e3cec..062e361c5d6 100644 --- a/gas/read.c +++ b/gas/read.c @@ -38,7 +38,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA #include "sb.h" #include "macro.h" #include "obstack.h" -#include "listing.h" #include "ecoff.h" #include "dw2gencfi.h" diff --git a/gas/sb.c b/gas/sb.c index f62883576c5..5fa0bc669eb 100644 --- a/gas/sb.c +++ b/gas/sb.c @@ -1,5 +1,5 @@ /* sb.c - string buffer manipulation routines - Copyright 1994, 1995, 2000, 2003 Free Software Foundation, Inc. + Copyright 1994, 1995, 2000, 2003, 2006 Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, sac@cygnus.com @@ -21,19 +21,8 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" -#include -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#else -#include -#endif -#include "libiberty.h" -#include "sb.h" #include "as.h" +#include "sb.h" /* These routines are about manipulating strings. diff --git a/gas/sb.h b/gas/sb.h index da787e245ea..5a886f9845f 100644 --- a/gas/sb.h +++ b/gas/sb.h @@ -1,5 +1,5 @@ /* sb.h - header file for string buffer manipulation routines - Copyright 1994, 1995, 2000, 2003 Free Software Foundation, Inc. + Copyright 1994, 1995, 2000, 2003, 2006 Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, sac@cygnus.com @@ -25,9 +25,6 @@ #define SB_H -#include -#include "ansidecl.h" - /* String blocks I had a couple of choices when deciding upon this data structure. -- 2.39.2