From: Alan Modra <amodra@gmail.com>
Date: Sun, 3 Aug 2008 03:26:03 +0000 (+0000)
Subject: 	* Makefile.am (spu_ovl.o): Merge rule into..
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc9b841ce6bfdd8383a76f0f9f4eaf2cf4b2d421;p=binutils-gdb.git

	* Makefile.am (spu_ovl.o): Merge rule into..
	(spu_ovl.o_c): ..this one.  Only run cpp for spu target.
	* Makefile.in: Regenerate.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a1fc001bab9..7ed7e090335 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (spu_ovl.o): Merge rule into..
+	(spu_ovl.o_c): ..this one.  Only run cpp for spu target.
+	* Makefile.in: Regenerate.
+
 2008-08-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Include the spu_ovl ASCII form in the repository files.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 0e6cf623026..5c212d7ac73 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -731,13 +731,12 @@ eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32_spu "$(tdir_elf32_spu)"
-$(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ spu_ovl.o
-	../binutils/bin2c <spu_ovl.o >$@
-spu_ovl.o: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
-	cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s
+$(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
 	if ../gas/as-new --version \
 		| grep 'target.*spu' >/dev/null 2>/dev/null; then \
-	  ../gas/as-new -o $@ spu_ovl.s; \
+	  cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s
+	  ../gas/as-new -o spu_ovl.o spu_ovl.s; \
+	  ../binutils/bin2c <spu_ovl.o >$@
 	fi
 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 08b825277f9..185d440c981 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1560,13 +1560,12 @@ eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32_spu "$(tdir_elf32_spu)"
-$(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ spu_ovl.o
-	../binutils/bin2c <spu_ovl.o >$@
-spu_ovl.o: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
-	cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s
+$(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S
 	if ../gas/as-new --version \
 		| grep 'target.*spu' >/dev/null 2>/dev/null; then \
-	  ../gas/as-new -o $@ spu_ovl.s; \
+	  cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s
+	  ../gas/as-new -o spu_ovl.o spu_ovl.s; \
+	  ../binutils/bin2c <spu_ovl.o >$@
 	fi
 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}