diff options
| author | Nick Clifton <nickc@redhat.com> | 2012-05-16 14:26:46 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2012-05-16 14:26:46 +0000 |
| commit | 691bf19c4ea5b2f5d615c4116649daf32f81cc7d (patch) | |
| tree | 2d42f0d1967062b125b79665fff42824222052ad | |
| parent | 8b127cbcc36cb65ef13eb756d02fe84aa120effb (diff) | |
| download | gdb-691bf19c4ea5b2f5d615c4116649daf32f81cc7d.zip gdb-691bf19c4ea5b2f5d615c4116649daf32f81cc7d.tar.gz gdb-691bf19c4ea5b2f5d615c4116649daf32f81cc7d.tar.bz2 | |
PR binutils/13558
* bfd/aout-cris.c: Include sysdep.h before bfd.h.
* bfd/aout-ns32k.c: Likewise.
* bfd/aout-sparcle.c: Likewise.
* bfd/aout0.c: Likewise.
* bfd/bfd-in2.h: Likewise.
* bfd/coff-stgo32.c: Likewise.
* bfd/cpu-lm32.c: Likewise.
* bfd/cpu-microblaze.c: Likewise.
* bfd/cpu-score.c: Likewise.
* bfd/cpu-tilegx.c: Likewise.
* bfd/cpu-tilepro.c: Likewise.
* bfd/elf32-lm32.c: Likewise.
* bfd/elf32-microblaze.c: Likewise.
* bfd/elf32-score7.c: Likewise.
* bfd/elf32-tilepro.c: Likewise.
* bfd/elfxx-tilegx.c: Likewise.
* bfd/mach-o.h: Likewise.
* bfd/nlm32-ppc.c: Likewise.
* bfd/ns32knetbsd.c: Likewise.
* bfd/pef.h: Likewise.
* bfd/plugin.c: Likewise.
* bfd/stab-syms.c: Likewise.
* bfd/sunos.c: Likewise.
* bfd/syms.c: Likewise.
* bfd/xsym.h: Likewise.
* Makefile.am (CFILES): Add syslex_wrap.c.
(sysinfo): Depend upon syslex_wrap.o.
(syslex_wrap.o): New rule.
(syslex.o): Delete rule.
* syslex_wrap.c: New file.
* Makefile.in: Regenerate.
| -rw-r--r-- | bfd/ChangeLog | 29 | ||||
| -rw-r--r-- | bfd/aout-cris.c | 3 | ||||
| -rw-r--r-- | bfd/aout-ns32k.c | 1 | ||||
| -rw-r--r-- | bfd/aout-sparcle.c | 3 | ||||
| -rw-r--r-- | bfd/aout0.c | 3 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 4 | ||||
| -rw-r--r-- | bfd/coff-stgo32.c | 3 | ||||
| -rw-r--r-- | bfd/cpu-lm32.c | 4 | ||||
| -rw-r--r-- | bfd/cpu-microblaze.c | 4 | ||||
| -rw-r--r-- | bfd/cpu-score.c | 4 | ||||
| -rw-r--r-- | bfd/cpu-tilegx.c | 4 | ||||
| -rw-r--r-- | bfd/cpu-tilepro.c | 4 | ||||
| -rw-r--r-- | bfd/elf32-lm32.c | 2 | ||||
| -rw-r--r-- | bfd/elf32-microblaze.c | 2 | ||||
| -rw-r--r-- | bfd/elf32-score7.c | 2 | ||||
| -rw-r--r-- | bfd/elf32-tilepro.c | 2 | ||||
| -rw-r--r-- | bfd/elfxx-tilegx.c | 2 | ||||
| -rw-r--r-- | bfd/mach-o.h | 1 | ||||
| -rw-r--r-- | bfd/nlm32-ppc.c | 4 | ||||
| -rw-r--r-- | bfd/ns32knetbsd.c | 3 | ||||
| -rw-r--r-- | bfd/pef.h | 1 | ||||
| -rw-r--r-- | bfd/plugin.c | 4 | ||||
| -rw-r--r-- | bfd/stab-syms.c | 3 | ||||
| -rw-r--r-- | bfd/sunos.c | 3 | ||||
| -rw-r--r-- | bfd/syms.c | 3 | ||||
| -rw-r--r-- | bfd/xsym.h | 3 | ||||
| -rw-r--r-- | binutils/ChangeLog | 10 | ||||
| -rw-r--r-- | binutils/Makefile.am | 14 | ||||
| -rw-r--r-- | binutils/Makefile.in | 15 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 1 | ||||
| -rw-r--r-- | binutils/syslex.l | 6 | ||||
| -rw-r--r-- | binutils/syslex_wrap.c | 8 |
32 files changed, 105 insertions, 50 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6e9e098..200e37a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,32 @@ +2012-05-16 Daniel Richard G. <skunk@iskunk.org> + + PR binutils/13558 + * bfd/aout-cris.c: Include sysdep.h before bfd.h. + * bfd/aout-ns32k.c: Likewise. + * bfd/aout-sparcle.c: Likewise. + * bfd/aout0.c: Likewise. + * bfd/bfd-in2.h: Likewise. + * bfd/coff-stgo32.c: Likewise. + * bfd/cpu-lm32.c: Likewise. + * bfd/cpu-microblaze.c: Likewise. + * bfd/cpu-score.c: Likewise. + * bfd/cpu-tilegx.c: Likewise. + * bfd/cpu-tilepro.c: Likewise. + * bfd/elf32-lm32.c: Likewise. + * bfd/elf32-microblaze.c: Likewise. + * bfd/elf32-score7.c: Likewise. + * bfd/elf32-tilepro.c: Likewise. + * bfd/elfxx-tilegx.c: Likewise. + * bfd/mach-o.h: Likewise. + * bfd/nlm32-ppc.c: Likewise. + * bfd/ns32knetbsd.c: Likewise. + * bfd/pef.h: Likewise. + * bfd/plugin.c: Likewise. + * bfd/stab-syms.c: Likewise. + * bfd/sunos.c: Likewise. + * bfd/syms.c: Likewise. + * bfd/xsym.h: Likewise. + 2012-05-16 Alan Modra <amodra@gmail.com> * elflink.c: Rename flaginfo to flinfo throughout, except.. diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c index f1f3060..3e3d21a 100644 --- a/bfd/aout-cris.c +++ b/bfd/aout-cris.c @@ -1,5 +1,5 @@ /* BFD backend for CRIS a.out binaries. - Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009 + Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009, 2012 Free Software Foundation, Inc. Contributed by Axis Communications AB. Written by Hans-Peter Nilsson. @@ -66,6 +66,7 @@ #define MY(OP) CONCAT2 (cris_aout_,OP) #define NAME(x, y) CONCAT3 (cris_aout,_32_,y) +#include "sysdep.h" #include "bfd.h" /* Version 1 of the header. */ diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c index 5cf5ad4..75886bc 100644 --- a/bfd/aout-ns32k.c +++ b/bfd/aout-ns32k.c @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "sysdep.h" #include "bfd.h" #include "aout/aout64.h" #include "ns32k.h" diff --git a/bfd/aout-sparcle.c b/bfd/aout-sparcle.c index afcc342..e050423 100644 --- a/bfd/aout-sparcle.c +++ b/bfd/aout-sparcle.c @@ -1,5 +1,5 @@ /* BFD backend for sparc little-endian aout binaries. - Copyright 1996, 2001, 2005, 2007 Free Software Foundation, Inc. + Copyright 1996, 2001, 2005, 2007, 2012 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -25,6 +25,7 @@ the tokens. */ #define MY(OP) CONCAT2 (sparcle_aout_,OP) +#include "sysdep.h" #include "bfd.h" #include "bfdlink.h" #include "libaout.h" diff --git a/bfd/aout0.c b/bfd/aout0.c index e87af00..7cec377 100644 --- a/bfd/aout0.c +++ b/bfd/aout0.c @@ -1,5 +1,5 @@ /* BFD backend for SunOS style a.out with flags set to 0 - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2005, 2007 + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2005, 2007, 2012 Free Software Foundation, Inc. Written by Cygnus Support. @@ -27,6 +27,7 @@ the tokens. */ #define MY(OP) CONCAT2 (aout0_big_,OP) +#include "sysdep.h" #include "bfd.h" #define MY_exec_hdr_flags 0 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index fa2b9a5..a006591 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -6306,8 +6306,8 @@ typedef struct bfd_target /* Sets the bitmask of allowed and disallowed section flags. */ bfd_boolean (*_bfd_lookup_section_flags) (struct bfd_link_info *, - struct flag_info *, - asection *); + struct flag_info *, + asection *); /* Attempt to merge SEC_MERGE sections. */ bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *); diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c index c10194e..125b0d9 100644 --- a/bfd/coff-stgo32.c +++ b/bfd/coff-stgo32.c @@ -1,6 +1,6 @@ /* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub). Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2007, 2009, - 2011 Free Software Foundation, Inc. + 2011, 2012 Free Software Foundation, Inc. Written by Robert Hoehne. This file is part of BFD, the Binary File Descriptor library. @@ -54,6 +54,7 @@ { COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \ COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 } +#include "sysdep.h" #include "bfd.h" /* At first the prototypes. */ diff --git a/bfd/cpu-lm32.c b/bfd/cpu-lm32.c index 5ddce04..5222a91 100644 --- a/bfd/cpu-lm32.c +++ b/bfd/cpu-lm32.c @@ -1,5 +1,5 @@ /* BFD support for the Lattice Mico32 architecture. - Copyright 2008 Free Software Foundation, Inc. + Copyright 2008, 2012 Free Software Foundation, Inc. Contributed by Jon Beniston <jon@beniston.com> This file is part of BFD, the Binary File Descriptor library. @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" const bfd_arch_info_type bfd_lm32_arch = diff --git a/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c index c59fa45..2cf6bc6 100644 --- a/bfd/cpu-microblaze.c +++ b/bfd/cpu-microblaze.c @@ -1,6 +1,6 @@ /* BFD Xilinx MicroBlaze architecture definition - Copyright 2009 Free Software Foundation, Inc. + Copyright 2009, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" const bfd_arch_info_type bfd_microblaze_arch = diff --git a/bfd/cpu-score.c b/bfd/cpu-score.c index 7a8d7b4..329c97c 100644 --- a/bfd/cpu-score.c +++ b/bfd/cpu-score.c @@ -1,5 +1,5 @@ /* BFD support for the score processor - Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright 2006, 2007, 2008, 2009, 2012 Free Software Foundation, Inc. Contributed by Brain.lin (brain.lin@sunplusct.com) Mei Ligang (ligang@sunnorth.com.cn) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" /* This routine is provided two arch_infos and works out which Score diff --git a/bfd/cpu-tilegx.c b/bfd/cpu-tilegx.c index f98cb0c..11234ec 100644 --- a/bfd/cpu-tilegx.c +++ b/bfd/cpu-tilegx.c @@ -1,5 +1,5 @@ /* BFD support for the TILE-Gx processor. - Copyright 2011 Free Software Foundation, Inc. + Copyright 2011, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" const bfd_arch_info_type bfd_tilegx32_arch = diff --git a/bfd/cpu-tilepro.c b/bfd/cpu-tilepro.c index 33bfab0..4066fc19 100644 --- a/bfd/cpu-tilepro.c +++ b/bfd/cpu-tilepro.c @@ -1,5 +1,5 @@ /* BFD support for the TILEPro processor. - Copyright 2011 Free Software Foundation, Inc. + Copyright 2011, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" const bfd_arch_info_type bfd_tilepro_arch = diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c index b18f08f..b2211a3 100644 --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "elf-bfd.h" #include "elf/lm32.h" diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c index a58f7b3..1fe0640 100644 --- a/bfd/elf32-microblaze.c +++ b/bfd/elf32-microblaze.c @@ -22,8 +22,8 @@ int dbg = 0; -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "bfdlink.h" #include "libbfd.h" #include "elf-bfd.h" diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c index b18991b..7ec774a 100644 --- a/bfd/elf32-score7.c +++ b/bfd/elf32-score7.c @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "libiberty.h" #include "elf-bfd.h" diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c index 88c1326..899abdd 100644 --- a/bfd/elf32-tilepro.c +++ b/bfd/elf32-tilepro.c @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "elf-bfd.h" #include "elf/tilepro.h" diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c index 9939228..02f80c5 100644 --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "elf-bfd.h" #include "elf/tilegx.h" diff --git a/bfd/mach-o.h b/bfd/mach-o.h index 7f54961..67ee43d 100644 --- a/bfd/mach-o.h +++ b/bfd/mach-o.h @@ -23,6 +23,7 @@ #ifndef _BFD_MACH_O_H_ #define _BFD_MACH_O_H_ +#include "sysdep.h" #include "bfd.h" #include "mach-o/loader.h" diff --git a/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c index b8c5852..ef5bfa9 100644 --- a/bfd/nlm32-ppc.c +++ b/bfd/nlm32-ppc.c @@ -1,6 +1,6 @@ /* Support for 32-bit PowerPC NLM (NetWare Loadable Module) Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007 Free Software Foundation, Inc. + 2007, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" /* The format of a PowerPC NLM changed. Define OLDFORMAT to get the diff --git a/bfd/ns32knetbsd.c b/bfd/ns32knetbsd.c index 6b636ae..fe0a688 100644 --- a/bfd/ns32knetbsd.c +++ b/bfd/ns32knetbsd.c @@ -1,6 +1,6 @@ /* BFD back-end for NetBSD/ns32k a.out-ish binaries. Copyright 1990, 1991, 1992, 1994, 1995, 1998, 2000, 2001, 2002, 2005, - 2007 Free Software Foundation, Inc. + 2007, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -46,6 +46,7 @@ for me -- IWD. */ #define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup +#include "sysdep.h" #include "bfd.h" /* To ensure following declaration is OK. */ const struct reloc_howto_struct * MY_bfd_reloc_type_lookup (bfd *, bfd_reloc_code_real_type); @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "sysdep.h" #include "bfd.h" #include <stdio.h> diff --git a/bfd/plugin.c b/bfd/plugin.c index 0a29e37..733ba71 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -1,5 +1,5 @@ /* Plugin support for BFD. - Copyright 2009, 2010, 2011 + Copyright 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -20,6 +20,7 @@ MA 02110-1301, USA. */ #include "config.h" +#include "sysdep.h" #include "bfd.h" #if BFD_SUPPORTS_PLUGINS @@ -34,7 +35,6 @@ #endif #include <stdarg.h> #include "plugin-api.h" -#include "sysdep.h" #include "plugin.h" #include "libbfd.h" #include "libiberty.h" diff --git a/bfd/stab-syms.c b/bfd/stab-syms.c index 9e9274f..8e65ddc 100644 --- a/bfd/stab-syms.c +++ b/bfd/stab-syms.c @@ -1,5 +1,5 @@ /* Table of stab names for the BFD library. - Copyright 1990, 1991, 1992, 1994, 1995, 1996, 2000, 2005, 2007 + Copyright 1990, 1991, 1992, 1994, 1995, 1996, 2000, 2005, 2007, 2012 Free Software Foundation, Inc. Written by Cygnus Support. @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "sysdep.h" #include "bfd.h" #define ARCH_SIZE 32 /* Value doesn't matter. */ diff --git a/bfd/sunos.c b/bfd/sunos.c index 8ef25ed..bd14001 100644 --- a/bfd/sunos.c +++ b/bfd/sunos.c @@ -1,6 +1,6 @@ /* BFD backend for SunOS binaries. Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Free Software Foundation, Inc. Written by Cygnus Support. @@ -28,6 +28,7 @@ the tokens. */ #define MY(OP) CONCAT2 (sunos_big_,OP) +#include "sysdep.h" #include "bfd.h" #include "bfdlink.h" #include "libaout.h" @@ -1,6 +1,6 @@ /* Generic symbol-table support for the BFD library. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2012 Free Software Foundation, Inc. Written by Cygnus Support. @@ -107,6 +107,7 @@ SUBSECTION which has been created using <<bfd_make_empty_symbol>>. Here is an example showing the creation of a symbol table with only one element: +| #include "sysdep.h" | #include "bfd.h" | int main (void) | { @@ -1,5 +1,5 @@ /* xSYM symbol-file support for BFD. - Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 + Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "sysdep.h" #include "bfd.h" #include <stdio.h> diff --git a/binutils/ChangeLog b/binutils/ChangeLog index fc8420c..64786da 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,13 @@ +2012-05-16 Daniel Richard G. <skunk@iskunk.org> + + PR binutils/13558 + * Makefile.am (CFILES): Add syslex_wrap.c. + (sysinfo): Depend upon syslex_wrap.o. + (syslex_wrap.o): New rule. + (syslex.o): Delete rule. + * syslex_wrap.c: New file. + * Makefile.in: Regenerate. + 2012-05-15 James Murray <jsm@jsm-net.demon.co.uk> * readelf.c (get_machine_name): Update m68hc12 entry. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index e492cb3..3364bee 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -106,7 +106,7 @@ CFILES = \ rclex.c rdcoff.c rddbg.c readelf.c rename.c \ resbin.c rescoff.c resrc.c resres.c \ size.c srconv.c stabs.c strings.c sysdump.c \ - unwind-ia64.c elfedit.c version.c \ + syslex_wrap.c unwind-ia64.c elfedit.c version.c \ windres.c winduni.c wrstabs.c \ windmc.c mclex.c @@ -268,15 +268,11 @@ sysroff.c: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h -sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@ - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex.@OBJEXT@ +sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@ + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@ -syslex.@OBJEXT@: syslex.c sysinfo.h config.h - if [ -r syslex.c ]; then \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \ - else \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\ - fi +syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h + $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c sysinfo.@OBJEXT@: sysinfo.c if [ -r sysinfo.c ]; then \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 3ac0d0a..8867813 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -476,7 +476,7 @@ CFILES = \ rclex.c rdcoff.c rddbg.c readelf.c rename.c \ resbin.c rescoff.c resrc.c resres.c \ size.c srconv.c stabs.c strings.c sysdump.c \ - unwind-ia64.c elfedit.c version.c \ + syslex_wrap.c unwind-ia64.c elfedit.c version.c \ windres.c winduni.c wrstabs.c \ windmc.c mclex.c @@ -880,6 +880,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stabs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syslex_wrap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unwind-ia64.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windmc.Po@am__quote@ @@ -1284,15 +1285,11 @@ sysroff.c: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h -sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@ - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex.@OBJEXT@ +sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@ + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@ -syslex.@OBJEXT@: syslex.c sysinfo.h config.h - if [ -r syslex.c ]; then \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \ - else \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\ - fi +syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h + $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c sysinfo.@OBJEXT@: sysinfo.c if [ -r sysinfo.c ]; then \ diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 3acf28a..e39ee65 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/gettext-sister.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/largefile.m4 \ + $(top_srcdir)/../config/lcmessage.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ diff --git a/binutils/syslex.l b/binutils/syslex.l index abfa678..14aee73 100644 --- a/binutils/syslex.l +++ b/binutils/syslex.l @@ -1,7 +1,7 @@ %option noinput nounput %{ -/* Copyright 2001, 2003, 2005, 2007, 2011 Free Software Foundation, Inc. +/* Copyright 2001, 2003, 2005, 2007, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -20,7 +20,8 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" +/* Note: config.h is #included via syslex_wrap.c. */ + #ifdef HAVE_STRING_H #include <string.h> #else @@ -28,6 +29,7 @@ #include <strings.h> #endif #endif + #include "sysinfo.h" #ifndef YY_NO_UNPUT diff --git a/binutils/syslex_wrap.c b/binutils/syslex_wrap.c new file mode 100644 index 0000000..e10b5fd --- /dev/null +++ b/binutils/syslex_wrap.c @@ -0,0 +1,8 @@ +/* Wrapper source to ensure that config.h is the first header file seen by + the compiler. */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include "syslex.c" |