From 691bf19c4ea5b2f5d615c4116649daf32f81cc7d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 16 May 2012 14:26:46 +0000 Subject: 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. --- binutils/ChangeLog | 10 ++++++++++ binutils/Makefile.am | 14 +++++--------- binutils/Makefile.in | 15 ++++++--------- binutils/doc/Makefile.in | 1 + binutils/syslex.l | 6 ++++-- binutils/syslex_wrap.c | 8 ++++++++ 6 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 binutils/syslex_wrap.c (limited to 'binutils') 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. + + 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 * 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 #else @@ -28,6 +29,7 @@ #include #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 +#endif + +#include "syslex.c" -- cgit v1.1