* 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 a1fc001bab97f205f9e177897e6a1a57e8d732df..7ed7e090335debedd623741c627b0968933c8144 100644 (file)
--- 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 0e6cf623026311ff8b961339353d8e1f70c07181..5c212d7ac737fb355f3b1bc0dc195ce0f8d24d3a 100644 (file)
--- 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 08b825277f96f6d5aac84b2301978addc5f12b68..185d440c981e28819ea44847ce54b746c7bd9a39 100644 (file)
--- 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}