diff options
| -rw-r--r-- | ld/.Sanitize | 28 | ||||
| -rw-r--r-- | ld/ChangeLog | 20 | ||||
| -rw-r--r-- | ld/Makefile.am | 12 | ||||
| -rw-r--r-- | ld/Makefile.in | 44 | ||||
| -rw-r--r-- | ld/configure.tgt | 6 | ||||
| -rw-r--r-- | ld/emulparams/.Sanitize | 10 | ||||
| -rw-r--r-- | ld/scripttempl/.Sanitize | 8 |
7 files changed, 40 insertions, 88 deletions
diff --git a/ld/.Sanitize b/ld/.Sanitize index 12e3bfb..a383971 100644 --- a/ld/.Sanitize +++ b/ld/.Sanitize @@ -237,34 +237,6 @@ else done fi -d30v_files="ChangeLog configure.tgt Makefile.am Makefile.in" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping d30v stuff in $i - fi - fi - done -else - for i in $d30v_files ; do - if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"d30v\" from $i... - fi - cp $i new - sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/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 - sky_files="ChangeLog configure.tgt" if ( echo $* | grep keep\-sky > /dev/null ) ; then for i in $sky_files ; do diff --git a/ld/ChangeLog b/ld/ChangeLog index 459e93d..708bbad 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -214,9 +214,7 @@ Mon May 18 13:14:43 1998 Ian Lance Taylor <ian@cygnus.com> * scripttempl/elf.sc: Put *crtbegin.o before other .ctors and .dtors. * scripttempl/elfd10v.sc: Likewise. -start-sanitize-d30v * scripttempl/elfd30v.sc: Likewise. -end-sanitize-d30v * scripttempl/elfppc.sc: Likewise. Fri May 15 00:22:35 1998 Ian Lance Taylor <ian@cygnus.com> @@ -239,9 +237,7 @@ Fri May 15 00:22:35 1998 Ian Lance Taylor <ian@cygnus.com> * mri.c (mri_draw_tree): Update calls to lang_add_wild. * scripttempl/elf.sc: Sort .ctors.* and .dtors.* by section name. * scripttempl/elfd10v.sc: Likewise. -start-sanitize-d30v * scripttempl/elfd30v.sc: Likewise. -end-sanitize-d30v * scripttempl/elfppc.sc: Likewise. Thu May 14 18:39:16 1998 Richard Henderson <rth@cygnus.com> @@ -488,14 +484,12 @@ Mon Mar 2 19:24:08 1998 Michael Meissner <meissner@cygnus.com> * ldlang.c (lang_size_sections): If the default memory region is *default*, see if there is a memory region that could be used. -start-sanitize-d30v Thu Feb 26 17:09:53 1998 Michael Meissner <meissner@cygnus.com> * scripttempl/elfd30v.sc: Add support for .eit_v section and put it at 0xfffff020. * emulparams/d30v{elf,_o,_e}.sh: Ditto. -end-sanitize-d30v Mon Feb 23 17:46:51 1998 Ian Lance Taylor <ian@cygnus.com> * emultempl/pe.em (sort_sections): Permit the wildcard to include @@ -698,7 +692,6 @@ Fri Jan 2 20:15:37 1998 Michael Meissner <meissner@cygnus.com> (lang_set_flags): Update prototype to match new calling sequence. (lang_memory_region_default): Add prototype. -start-sanitize-d30v * emulparams/d30v{_e,_o,elf}.sh ({TEXT,DATA,EMEM}_DEF_SECTION): Define whether or not the region gets default sections, and if so, what sections. @@ -710,7 +703,6 @@ Thu Jan 1 22:58:04 1998 Michael Meissner <meissner@cygnus.com> * scripttempl/elfd30v.sc (.eh_frame): Link into the data section. -end-sanitize-d30v Thu Jan 1 18:04:51 1998 Jeffrey A Law (law@cygnus.com) * scripttempl/h8300h.sc: Fix typo. @@ -728,7 +720,6 @@ Wed Dec 17 12:14:11 1997 Ian Lance Taylor <ian@cygnus.com> multiple times on the same argument and confuse the getopt internals. -start-sanitize-d30v Thu Dec 11 09:00:15 1997 Michael Meissner <meissner@cygnus.com> * configure.tgt (d30v-elf-*): Rename d30velf_e to d30v_e and @@ -738,7 +729,6 @@ Thu Dec 11 09:00:15 1997 Michael Meissner <meissner@cygnus.com> * emulparams/d30v_{o,e}: Rename from d30velf_{o,e}. * emulparams/d30velf_{o,e}: Deleted. -end-sanitize-d30v Wed Dec 10 17:40:08 1997 Nick Clifton <nickc@cygnus.com> * scripttempl/armcoff.sc: Add glue sections (code taken from Arm @@ -748,7 +738,6 @@ Wed Dec 10 17:40:08 1997 Nick Clifton <nickc@cygnus.com> * emultempl/armcoff.em: New file, imported from Arm branch. -start-sanitize-d30v Wed Dec 10 14:10:44 1997 Michael Meissner <meissner@cygnus.com> * scripttempl/elfd30v.sc: Add .rel and .rela sections for all @@ -756,7 +745,6 @@ Wed Dec 10 14:10:44 1997 Michael Meissner <meissner@cygnus.com> external memory sections for rodata. Delete .string, .rodata1, and .data1 sections. -end-sanitize-d30v Tue Dec 9 15:28:17 1997 Michael Meissner <meissner@cygnus.com> * Makefile.am: Add Oct 23 changes to Makefile.in here. @@ -767,7 +755,6 @@ start-sanitize-tic80 * Makefile.{am,in}: (ALL_EMULATIONS): Add etic80coff.o. end-sanitize-tic80 -start-sanitize-d30v * Makefile.{am,in}: (ALL_EMULATIONS): Add ed30velf{,_e,_o}.o. (ed30velf_e.c): Like d30velf, except .text/.data/etc always go in external memory. @@ -800,7 +787,6 @@ start-sanitize-d30v (.data{,1}/.strings/.rodata{,1}): Put in ${DATA_MEMORY} memory region. (.bss): Put in ${BSS_MEMORY} memory region. -end-sanitize-d30v Tue Dec 2 10:14:47 1997 Nick Clifton <nickc@cygnus.com> @@ -813,7 +799,6 @@ Sat Nov 22 15:23:19 1997 Ian Lance Taylor <ian@cygnus.com> correctly. Pass 0 rather than hex_mode to bfd_scan_vma. * ldlex.h (hex_mode): Don't declare. -start-sanitize-d30v Sun Nov 16 20:16:45 1997 Michael Meissner <meissner@cygnus.com> * emulparams/d30velf.sh ({DATA,EMEM}_START_ADDR): Define as start @@ -826,7 +811,6 @@ Sun Nov 16 20:16:45 1997 Michael Meissner <meissner@cygnus.com> to be 0x20008000, which is 1 byte beyond end of the internal data region. -end-sanitize-d30v Thu Nov 13 13:45:00 1997 Andrew Cagney <cagney@b1.cygnus.com> * configure.tgt (targ_extra_emuls): Make FreeBSD a i386bsd @@ -951,14 +935,12 @@ Wed Sep 17 16:43:39 1997 Nick Clifton <nickc@cygnus.com> * scripttempl/v850.sc: Add call table data area end-sanitize-v850e -start-sanitize-d30v Mon Sep 15 11:29:13 1997 Ken Raeburn <raeburn@cygnus.com> Merge change from Martin Hunt: * scripttempl/elfd30v.sc: Put .rodata in the .text section. -end-sanitize-d30v Tue Sep 9 07:49:56 1997 Fred Fish <fnf@ninemoons.com> * ldlang.c (lang_memory_region_lookup): Remove extraneous @@ -1433,7 +1415,6 @@ Mon Feb 24 18:16:09 1997 Ian Lance Taylor <ian@cygnus.com> * scripttempl/elf.sc: Add .gnu.version sections. * ld.texinfo: Document symbol versioning. -start-sanitize-d30v Fri Feb 21 17:37:51 1997 Martin M. Hunt <hunt@pizza.cygnus.com> * Makefile.in (ed30velf.c): New target. @@ -1441,7 +1422,6 @@ Fri Feb 21 17:37:51 1997 Martin M. Hunt <hunt@pizza.cygnus.com> * emulparams/d30velf.sh: New file. * scripttempl/elfd30v.sc: New file. -end-sanitize-d30v Fri Feb 14 18:28:31 1997 Ian Lance Taylor <ian@cygnus.com> * ld.texinfo (Option Commands): Document the INCLUDE command. diff --git a/ld/Makefile.am b/ld/Makefile.am index 305b668..46dc909 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -106,11 +106,9 @@ ALL_EMULATIONS = \ earmpe.o \ ecoff_sparc.o \ ed10velf.o \ - $(start-sanitize-d30v) \ ed30velf.o \ ed30v_e.o \ ed30v_o.o \ - $(end-sanitize-d30v) \ edelta68.o \ eebmon29k.o \ eelf32_sparc.o \ @@ -141,6 +139,9 @@ ALL_EMULATIONS = \ ehp3hpux.o \ ehppaelf.o \ ei386aout.o \ + $(start-sanitize-beos) \ + ei386beos.o \ + $(end-sanitize-beos) \ ei386bsd.o \ ei386coff.o \ ei386go32.o \ @@ -288,7 +289,6 @@ ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \ ed10velf.c: $(srcdir)/emulparams/d10velf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS} ${GENSCRIPTS} d10velf "$(tdir_d10v)" -start-sanitize-d30v: ed30velf.c: $(srcdir)/emulparams/d30velf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} ${GENSCRIPTS} d30velf "$(tdir_d30v)" @@ -298,7 +298,6 @@ ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \ 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} ${GENSCRIPTS} delta68 "$(tdir_delta68)" @@ -400,6 +399,11 @@ ehppaelf.c: $(srcdir)/emulparams/hppaelf.sh \ ei386aout.c: $(srcdir)/emulparams/i386aout.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} i386aout "$(tdir_i386aout)" +# start-sanitize-beos +ei386beos.c: $(srcdir)/emulparams/i386beos.sh \ + $(srcdir)/emultempl/beos.em $(srcdir)/scripttempl/i386beos.sc ${GEN_DEPENDS} + ${GENSCRIPTS} i386beos "$(tdir_i386beos)" +# end-sanitize-beos ei386bsd.c: $(srcdir)/emulparams/i386bsd.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} i386bsd "$(tdir_i386bsd)" diff --git a/ld/Makefile.in b/ld/Makefile.in index 7c35af8..de24015 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -177,11 +177,9 @@ ALL_EMULATIONS = \ earmpe.o \ ecoff_sparc.o \ ed10velf.o \ - $(start-sanitize-d30v) \ ed30velf.o \ ed30v_e.o \ ed30v_o.o \ - $(end-sanitize-d30v) \ edelta68.o \ eebmon29k.o \ eelf32_sparc.o \ @@ -212,6 +210,9 @@ ALL_EMULATIONS = \ ehp3hpux.o \ ehppaelf.o \ ei386aout.o \ + $(start-sanitize-beos) \ + ei386beos.o \ + $(end-sanitize-beos) \ ei386bsd.o \ ei386coff.o \ ei386go32.o \ @@ -605,10 +606,10 @@ uninstall-man1: done install-man: $(MANS) @$(NORMAL_INSTALL) - $(MAKE) install-man1 + $(MAKE) $(AM_MAKEFLAGS) install-man1 uninstall-man: @$(NORMAL_UNINSTALL) - $(MAKE) uninstall-man1 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -626,7 +627,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" @@ -639,12 +640,12 @@ maintainer-clean-recursive: for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS @@ -689,12 +690,12 @@ distcheck: dist dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) \ - && $(MAKE) dvi \ - && $(MAKE) check \ - && $(MAKE) install \ - && $(MAKE) installcheck \ - && $(MAKE) dist + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist -rm -rf $(distdir) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ @@ -722,10 +723,10 @@ distdir: $(DISTFILES) || mkdir $(distdir)/$$subdir \ || exit 1; \ chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done - $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info + $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info DEJATOOL = $(PACKAGE) @@ -752,11 +753,11 @@ site.exp: Makefile info: $(INFO_DEPS) info-recursive dvi: $(DVIS) dvi-recursive check: - $(MAKE) check-recursive check-DEJAGNU + $(MAKE) $(AM_MAKEFLAGS) check-recursive check-DEJAGNU installcheck: installcheck-recursive install-info: install-info-am install-info-recursive all-recursive-am: config.h - $(MAKE) all-recursive + $(MAKE) $(AM_MAKEFLAGS) all-recursive all-am: Makefile $(PROGRAMS) $(MANS) config.h @@ -778,7 +779,7 @@ install: install-recursive install-exec-am install-data-am uninstall: uninstall-recursive uninstall-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: installdirs-recursive $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 @@ -905,7 +906,6 @@ ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \ ed10velf.c: $(srcdir)/emulparams/d10velf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS} ${GENSCRIPTS} d10velf "$(tdir_d10v)" -start-sanitize-d30v: ed30velf.c: $(srcdir)/emulparams/d30velf.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS} ${GENSCRIPTS} d30velf "$(tdir_d30v)" @@ -915,7 +915,6 @@ ed30v_o.c: $(srcdir)/emulparams/d30v_o.sh \ 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} ${GENSCRIPTS} delta68 "$(tdir_delta68)" @@ -1017,6 +1016,11 @@ ehppaelf.c: $(srcdir)/emulparams/hppaelf.sh \ ei386aout.c: $(srcdir)/emulparams/i386aout.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} i386aout "$(tdir_i386aout)" +# start-sanitize-beos +ei386beos.c: $(srcdir)/emulparams/i386beos.sh \ + $(srcdir)/emultempl/beos.em $(srcdir)/scripttempl/i386beos.sc ${GEN_DEPENDS} + ${GENSCRIPTS} i386beos "$(tdir_i386beos)" +# end-sanitize-beos ei386bsd.c: $(srcdir)/emulparams/i386bsd.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} i386bsd "$(tdir_i386bsd)" diff --git a/ld/configure.tgt b/ld/configure.tgt index c95e89c..195cda2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -14,11 +14,9 @@ case "${targ}" in arm-*-pe) targ_emul=armpe ;; arc-*-elf*) targ_emul=arcelf ;; d10v-*-*) targ_emul=d10velf ;; -# start-sanitize-d30v d30v-*-*ext*) targ_emul=d30v_e; targ_extra_emuls="d30velf d30v_o" ;; d30v-*-*onchip*) targ_emul=d30v_o; targ_extra_emuls="d30velf d30v_e" ;; d30v-*-*) targ_emul=d30velf; targ_extra_emuls="d30v_e d30v_o" ;; -# end-sanitize-d30v sparc64-*-aout*) targ_emul=sparcaout ;; sparc64-*-elf*) targ_emul=elf64_sparc ;; sparc-sun-sunos4*) targ_emul=sun4 ;; @@ -103,6 +101,10 @@ i[3456]86-*-winnt*) targ_emul=i386pe ;; i[3456]86-*-pe) targ_emul=i386pe ;; i[3456]86-*-cygwin32*) targ_emul=i386pe ;; i[3456]86-*-mingw32*) targ_emul=i386pe ;; +# start-sanitize-beos +i[3456]86-*-beospe*) targ_emul=i386beos ;; +i[3456]86-*-beos*) targ_emul=elf_i386 ;; +# end-sanitize-beos m8*-*-*) targ_emul=m88kbcs ;; a29k-*-udi) targ_emul=sa29200 ;; a29k-*-ebmon) targ_emul=ebmon29k ;; diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize index 9649394..ec8dce2 100644 --- a/ld/emulparams/.Sanitize +++ b/ld/emulparams/.Sanitize @@ -15,13 +15,6 @@ Do-first: -d30v_files="d30velf.sh d30v_o.sh d30v_e.sh" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - keep_these_too="${d30v_files} ${keep_these_too}" -else - lose_these_too="${d30v_files} ${lose_these_too}" -fi - tic80_files="tic80coff.sh" if ( echo $* | grep keep\-tic80 > /dev/null ) ; then keep_these_too="${tic80_files} ${keep_these_too}" @@ -63,6 +56,9 @@ armcoff.sh armpe.sh coff_sparc.sh d10velf.sh +d30v_e.sh +d30v_o.sh +d30velf.sh delta68.sh ebmon29k.sh elf32_sparc.sh diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize index 44dada4..119834a 100644 --- a/ld/scripttempl/.Sanitize +++ b/ld/scripttempl/.Sanitize @@ -15,13 +15,6 @@ Do-first: -d30v_files="elfd30v.sc" -if ( echo $* | grep keep\-d30v > /dev/null ) ; then - keep_these_too="${d30v_files} ${keep_these_too}" -else - lose_these_too="${d30v_files} ${lose_these_too}" -fi - tic80_files="tic80coff.sc" if ( echo $* | grep keep\-tic80 > /dev/null ) ; then keep_these_too="${tic80_files} ${keep_these_too}" @@ -55,6 +48,7 @@ delta68.sc ebmon29k.sc elf.sc elfd10v.sc +elfd30v.sc elfppc.sc go32coff.sc h8300.sc |