From 671ace2fe0c6118281056456fe2f9212138da1bb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 27 Feb 2007 08:33:25 +0000 Subject: * Makefile.am (ALL_EMUL_EXTRA_OFILES): Remove spu_inc.o. (eelf32_spu.c): Adjust dependencies. * Makefile.in: Regenerate. * emultempl/spuelf.em (ovl_mgr): New array. Insert spu_ovl.o code using bin2c. (_binary_spu_ovl_o_start, _binary_spu_ovl_o_end): Delete. (ovl_mgr_stream): Update. * emultempl/spu_inc.s: Delete. * emultempl/spu_none.s: Delete. --- ld/Makefile.am | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'ld/Makefile.am') diff --git a/ld/Makefile.am b/ld/Makefile.am index d83bb16..767a9ca 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -422,8 +422,7 @@ ALL_64_EMULATIONS = \ ALL_EMUL_EXTRA_OFILES = \ deffilep.o \ pe-dll.o \ - pep-dll.o \ - spu_inc.o + pep-dll.o CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ @@ -722,16 +721,9 @@ eelf32_sparc_vxworks.c: $(srcdir)/emulparams/elf32_sparc_vxworks.sh \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32_sparc_vxworks "$(tdir_elf32_sparc_vxworks)" eelf32_spu.c: $(srcdir)/emulparams/elf32_spu.sh $(srcdir)/emultempl/spuelf.em \ + $(srcdir)/emultempl/spu_ovl.o \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32_spu "$(tdir_elf32_spu)" -spu_inc.o: $(srcdir)/emultempl/spu_inc.s $(srcdir)/emultempl/spu_none.s \ - $(srcdir)/emultempl/spu_ovl.o - cp $(srcdir)/emultempl/spu_ovl.o spu_ovl.o; \ - if ! ld -r -o $@ -b binary spu_ovl.o; then \ - if ! $(CC) -c -o $@ $(srcdir)/emultempl/spu_inc.s; then \ - $(CC) -c -o $@ $(srcdir)/emultempl/spu_none.s; \ - fi \ - fi $(srcdir)/emultempl/spu_ovl.o: @MAINT@ $(srcdir)/emultempl/spu_ovl.S cpp -DOVLY_IRQ_SAVE $(srcdir)/emultempl/spu_ovl.S spu_ovl.s if ../gas/as-new --version \ -- cgit v1.1