From 8a0e27600ba9a8575365c257cda4816cdd7011a2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 24 Aug 2009 05:57:44 +0000 Subject: [PATCH] dependency tracking fixes in ld ld/: * Makefile.am (ldmain.o, ldfile.o): Fix typos in non-fastdep rules. (eelf32_spu.o): Add dependency tracking. * Makefile.in: Regenerate. --- ld/ChangeLog | 5 +++++ ld/Makefile.am | 14 ++++++++++++-- ld/Makefile.in | 13 +++++++++---- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index f83f113bcc0..b2230e52d4d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2009-08-24 Ralf Wildenhues + * Makefile.am (ldmain.o, ldfile.o): Fix typos in non-fastdep + rules. + (eelf32_spu.o): Add dependency tracking. + * Makefile.in: Regenerate. + * Makefile.am (am__skiplex, am__skipyacc): New. * Makefile.in: Regenerate. diff --git a/ld/Makefile.am b/ld/Makefile.am index bc4915c4874..146901569e2 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -523,7 +523,7 @@ if am__fastdepCC mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po else if AMDEP - source='deffilep.c' object='$@' libtool=no @AMDEPBACKSLASH@ + source='ldmain.c' object='$@' libtool=no @AMDEPBACKSLASH@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ endif $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' \ @@ -540,7 +540,7 @@ if am__fastdepCC mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po else if AMDEP - source='deffilep.c' object='$@' libtool=no @AMDEPBACKSLASH@ + source='ldfile.c' object='$@' libtool=no @AMDEPBACKSLASH@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ endif $(COMPILE) -c -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' \ @@ -549,8 +549,18 @@ endif endif eelf32_spu.o: eelf32_spu.c +if am__fastdepCC + $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \ + -DEMBEDSPU="\"`echo embedspu | sed '$(transform)'`\"" eelf32_spu.c + mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +else +if AMDEP + source='eelf32_spu.c' object='$@' libtool=no @AMDEPBACKSLASH@ + DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +endif $(COMPILE) -c -DEMBEDSPU="\"`echo embedspu | sed '$(transform)'`\"" \ eelf32_spu.c +endif ldemul-list.h: Makefile (echo "/* This file is automatically generated. DO NOT EDIT! */";\ diff --git a/ld/Makefile.in b/ld/Makefile.in index f36e34c3b02..75d853d979a 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1883,7 +1883,7 @@ ldmain.o: ldmain.c config.status @am__fastdepCC_TRUE@ -DTARGET='"@target@"' @TARGET_SYSTEM_ROOT_DEFINE@ \ @am__fastdepCC_TRUE@ $(srcdir)/ldmain.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='deffilep.c' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldmain.c' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' \ @am__fastdepCC_FALSE@ -DBINDIR='"$(bindir)"' -DTOOLBINDIR='"$(tooldir)/bin"' \ @@ -1895,15 +1895,20 @@ ldfile.o: ldfile.c config.status @am__fastdepCC_TRUE@ -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' -DTOOLBINDIR='"$(tooldir)/bin"' \ @am__fastdepCC_TRUE@ $(srcdir)/ldfile.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='deffilep.c' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldfile.c' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' \ @am__fastdepCC_FALSE@ -DTOOLBINDIR='"$(tooldir)/bin"' \ @am__fastdepCC_FALSE@ $(srcdir)/ldfile.c eelf32_spu.o: eelf32_spu.c - $(COMPILE) -c -DEMBEDSPU="\"`echo embedspu | sed '$(transform)'`\"" \ - eelf32_spu.c +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \ +@am__fastdepCC_TRUE@ -DEMBEDSPU="\"`echo embedspu | sed '$(transform)'`\"" eelf32_spu.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eelf32_spu.c' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -DEMBEDSPU="\"`echo embedspu | sed '$(transform)'`\"" \ +@am__fastdepCC_FALSE@ eelf32_spu.c ldemul-list.h: Makefile (echo "/* This file is automatically generated. DO NOT EDIT! */";\ -- 2.30.2