From f5870264dfa95240958b2c21605abecbcd05c248 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Mon, 22 Dec 1997 17:04:20 +0000 Subject: [PATCH] * Makefile.am (etxvuelf.c): Add rule for. * Makefile.in: Regenerate. * configure: Regenerate. * configure.tgt (txvu-*-*): Recognize. * emulparams/txvuelf.sh: New file. --- ld/.Sanitize | 29 +++++++++++++++++++++++++++++ ld/ChangeLog | 15 +++++++++++++++ ld/Makefile.am | 13 +++++++++++++ ld/Makefile.in | 30 ++++++++++++++++++++++++++++-- 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/ld/.Sanitize b/ld/.Sanitize index 217c7ae..d36a305 100644 --- a/ld/.Sanitize +++ b/ld/.Sanitize @@ -234,6 +234,35 @@ else done fi +sky_files="ChangeLog configure.tgt Makefile.am Makefile.in" + +if ( echo $* | grep keep\-sky > /dev/null ) ; then + for i in $sky_files ; do + if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Keeping sky stuff in $i + fi + fi + done +else + for i in $sky_files ; do + if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Removing traces of \"sky\" from $i... + fi + cp $i new + sed '/start\-sanitize\-sky/,/end-\sanitize\-sky/d' < $i > new + if [ -n "${safe}" -a ! -f .Recover/$i ] ; then + if [ -n "${verbose}" ] ; then + echo Caching $i in .Recover... + fi + mv $i .Recover + fi + mv new $i + fi + done +fi + for i in * ; do if test ! -d $i && (grep sanitize $i > /dev/null) ; then echo '***' Some mentions of Sanitize are still left in $i! 1>&2 diff --git a/ld/ChangeLog b/ld/ChangeLog index ad58f49..0bcbb04 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,18 @@ +start-sanitize-sky +Mon Dec 22 16:54:39 1997 Doug Evans + + * Makefile.am (etxvuelf.c): Add rule for. + * Makefile.in: Regenerate. + * configure: Regenerate. + * configure.tgt (txvu-*-*): Recognize. + * emulparams/txvuelf.sh: New file. + +end-sanitize-sky +Sun Dec 21 12:51:49 1997 Ian Lance Taylor + + * ldexp.c (fold_name): Don't crash if the symbol is defined in a + section with no output section, such as a shared library section. + Wed Dec 17 12:14:11 1997 Ian Lance Taylor * lexsup.c (parse_args): Keep track of where we are in the option diff --git a/ld/Makefile.am b/ld/Makefile.am index 017ebbd..ff26cd0 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -103,6 +103,8 @@ ALL_EMULATIONS = \ ed10velf.o \ $(start-sanitize-d30v) \ ed30velf.o \ + ed30v_e.o \ + ed30v_o.o \ $(end-sanitize-d30v) \ edelta68.o \ eebmon29k.o \ @@ -270,6 +272,12 @@ start-sanitize-d30v: ed30velf.c: $(srcdir)/emulparams/d30velf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} ${GENSCRIPTS} d30velf "$(tdir_d30v)" +ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} + ${GENSCRIPTS} d30v_o "$(tdir_d30v)" +ed30v_e.c: $(srcdir)/emulparams/d30v_e.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} + ${GENSCRIPTS} d30v_e "$(tdir_d30v)" end-sanitize-d30v: edelta68.c: $(srcdir)/emulparams/delta68.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS} @@ -513,6 +521,11 @@ etic80coff.c: $(srcdir)/emulparams/tic80coff.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic80coff.sc ${GEN_DEPENDS} ${GENSCRIPTS} tic80coff "$(tdir_tic80coff)" end-sanitize-tic80: +start-sanitize-sky: +etxvuelf.c: $(srcdir)/emulparams/txvuelf.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} txvuelf "$(tdir_txvu)" +end-sanitize-sky: evanilla.c: $(srcdir)/emulparams/vanilla.sh \ $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS} ${GENSCRIPTS} vanilla "$(tdir_vanilla)" diff --git a/ld/Makefile.in b/ld/Makefile.in index 3a6084e..0e18d3d 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -5,7 +5,7 @@ # gives unlimited permission to copy, distribute and modify it. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -172,6 +172,8 @@ ALL_EMULATIONS = \ ed10velf.o \ $(start-sanitize-d30v) \ ed30velf.o \ + ed30v_e.o \ + ed30v_o.o \ $(end-sanitize-d30v) \ edelta68.o \ eebmon29k.o \ @@ -339,7 +341,7 @@ OBJECTS = $(ld_new_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .dvi .h .info .l .lo .o .ps .texi .texinfo .y +.SUFFIXES: .S .c .dvi .h .info .l .lo .o .ps .s .texi .texinfo .y $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -384,6 +386,12 @@ distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + .c.o: $(COMPILE) -c $< @@ -400,6 +408,13 @@ maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +# These are just copies of the above rule. +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: rm -f *.lo @@ -743,6 +758,12 @@ start-sanitize-d30v: ed30velf.c: $(srcdir)/emulparams/d30velf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} ${GENSCRIPTS} d30velf "$(tdir_d30v)" +ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} + ${GENSCRIPTS} d30v_o "$(tdir_d30v)" +ed30v_e.c: $(srcdir)/emulparams/d30v_e.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} + ${GENSCRIPTS} d30v_e "$(tdir_d30v)" end-sanitize-d30v: edelta68.c: $(srcdir)/emulparams/delta68.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS} @@ -986,6 +1007,11 @@ etic80coff.c: $(srcdir)/emulparams/tic80coff.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic80coff.sc ${GEN_DEPENDS} ${GENSCRIPTS} tic80coff "$(tdir_tic80coff)" end-sanitize-tic80: +start-sanitize-sky: +etxvuelf.c: $(srcdir)/emulparams/txvuelf.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} txvuelf "$(tdir_txvu)" +end-sanitize-sky: evanilla.c: $(srcdir)/emulparams/vanilla.sh \ $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS} ${GENSCRIPTS} vanilla "$(tdir_vanilla)" -- 2.7.4