aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorJ.T. Conklin <jtc@acorntoolworks.com>1994-10-26 21:02:02 +0000
committerJ.T. Conklin <jtc@acorntoolworks.com>1994-10-26 21:02:02 +0000
commit32286e08a514fa23565a7ccf76957e41806ea203 (patch)
tree8f266ba97515928559dc3e3db4c2f404b59346a2 /ld
parentcb409b5d9dc4c936b3186697fe58cb600bc315a7 (diff)
downloadgdb-32286e08a514fa23565a7ccf76957e41806ea203.zip
gdb-32286e08a514fa23565a7ccf76957e41806ea203.tar.gz
gdb-32286e08a514fa23565a7ccf76957e41806ea203.tar.bz2
* Makefile.in (ALL_EMULATIONS): Added ei386nbsd.o, ens32knbsd.o
and esparcnbsd.o; sorted entries. (ei386nbsd.c,ens32knbsd.c,esparcnbsd.c): New targets. * config/netbsd532.mt: Removed. * emulparams/netbsd532.sh: Removed. * config/{i386-nbsd.mt,ns32k-nbsd.mt,sparc-nbsd.mt}: New files. * emulparams/{i386nbsd.sh,ns32knbsd.sh,sparcnbsd.sh}: New files. * configure.in (i[345]86-*-netbsd*, ns32k-pc532-netbsd*, sparc*-*-netbsd*): Use above configs.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog14
-rw-r--r--ld/Makefile.in230
-rw-r--r--ld/config/.Sanitize3
-rw-r--r--ld/config/i386-nbsd.mt1
-rw-r--r--ld/config/netbsd532.mt2
-rw-r--r--ld/config/ns32k-nbsd.mt1
-rw-r--r--ld/config/sparc-nbsd.mt1
-rw-r--r--ld/configure.in4
-rw-r--r--ld/emulparams/.Sanitize3
-rw-r--r--ld/emulparams/netbsd532.sh7
-rw-r--r--ld/emulparams/ns32knbsd.sh5
-rw-r--r--ld/emulparams/sparcnbsd.sh5
12 files changed, 164 insertions, 112 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3ae4c85..927fd04 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,17 @@
+Wed Oct 26 13:59:12 1994 J.T. Conklin (jtc@phishhead.cygnus.com)
+
+ * Makefile.in (ALL_EMULATIONS): Added ei386nbsd.o, ens32knbsd.o
+ and esparcnbsd.o; sorted entries.
+ (ei386nbsd.c,ens32knbsd.c,esparcnbsd.c): New targets.
+
+ * config/netbsd532.mt: Removed.
+ * emulparams/netbsd532.sh: Removed.
+
+ * config/{i386-nbsd.mt,ns32k-nbsd.mt,sparc-nbsd.mt}: New files.
+ * emulparams/{i386nbsd.sh,ns32knbsd.sh,sparcnbsd.sh}: New files.
+ * configure.in (i[345]86-*-netbsd*, ns32k-pc532-netbsd*,
+ sparc*-*-netbsd*): Use above configs.
+
Tue Oct 25 11:47:10 1994 Ian Lance Taylor <ian@sanguine.cygnus.com>
* ldmain.c (multiple_common): One of the types may now be
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 5529db7..9f05128 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -57,6 +57,7 @@ INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
AR = ar
AR_FLAGS = qv
+CC = cc
CFLAGS = -g
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
@@ -107,36 +108,58 @@ HOSTING_CRT0 = /lib/crt0.o
HOSTING_LIBS = `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else gcc -print-libgcc-file-name; fi` -lc
HOSTING_EMU = -m $(EMUL)
-CXX = `if [ -f ../gcc/xgcc ] ; then \
- echo ../gcc/xgcc -B../gcc/; \
- else echo gcc; \
- fi`
-CXXFLAGS = -fgnu-linker
-
+# These were used by `make check-cdtest'
+#
+#CXX = `if [ -f ../gcc/xgcc ] ; then \
+# echo ../gcc/xgcc -B../gcc/; \
+# else echo gcc; \
+# fi`
+#CXXFLAGS = -fgnu-linker
+#
# FIX_ME: using ../gcc/xgcc breaks the cdtest.
-CXX = g++
+#CXX = g++
# Setup the testing framework, if you have one
-EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
- echo $${rootme}/../../expect/expect ; \
- else echo expect ; fi`
+EXPECT = `if [ -f $$r/../expect/expect ] ; \
+ then echo $$r/../expect/expect ; \
+ else echo expect ; fi`
+
+RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \
+ then echo $${srcroot}/../dejagnu/runtest ; \
+ else echo runtest ; fi`
-RUNTEST = `if [ -f $${srcdir}/../../dejagnu/runtest ] ; then \
- echo $${srcdir}/../../dejagnu/runtest ; \
- else echo runtest ; fi`
RUNTESTFLAGS =
-RUNTEST_CC = `if [ -f ../gcc/xgcc ] ; then \
- echo ../gcc/xgcc -B../gcc/; \
- else echo gcc; \
- fi`
-RUNTEST_CFLAGS = $(CFLAGS)
-RUNTEST_CXX = `if [ -f ../gcc/xgcc ] ; then \
- echo ../gcc/xgcc -B../gcc/; \
- else echo gcc; \
- fi`
-# FIX_ME: using ../gcc/xgcc breaks the cdtest.
-RUNTEST_CXX = $(CXX)
-RUNTEST_CXXFLAGS = $(CXXFLAGS)
+
+CC_FOR_TARGET = ` \
+ if [ -f $$r/../gcc/Makefile ] ; then \
+ if [ -f $$r/../newlib/Makefile ] ; then \
+ echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+ else \
+ echo $$r/../gcc/xgcc -B$$r/../gcc/; \
+ fi; \
+ else \
+ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+ echo $(CC); \
+ else \
+ t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \
+ fi; \
+ fi`
+
+CXX = gcc
+CXX_FOR_TARGET = ` \
+ if [ -f $$r/../gcc/Makefile ] ; then \
+ if [ -f $$r/../newlib/Makefile ] ; then \
+ echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+ else \
+ echo $$r/../gcc/xgcc -B$$r/../gcc/; \
+ fi; \
+ else \
+ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+ echo $(CXX); \
+ else \
+ t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \
+ fi; \
+ fi`
# go directly to ld.new in case this ld isn't capable of
# linking native object on this host. It can be renamed on
@@ -151,16 +174,16 @@ all: $(LD_PROG)
LINTFLAGS = $(INCLUDES) $(EXTRA_DEF)
-# The .cc suffix is used by `make check'.
+# The .cc suffix was used by `make check-cdtest'.
.SUFFIXES: .y $(SUFFIXES) .cc
# Suppress smart makes who think they know how to automake Yacc files
.y.c:
-# This rule is used for the check-cdtest target.
-.cc.o:
- $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(CFLAGS) $<
+# This rule was used for the check-cdtest target.
+#.cc.o:
+# $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(CFLAGS) $<
ALL_CFLAGS = $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(CFLAGS)
.c.o:
@@ -170,17 +193,18 @@ ALL_CFLAGS = $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(CFLAGS)
BFDLIB = ../bfd/libbfd.a
LIBIBERTY = ../libiberty/libiberty.a
-ALL_EMULATIONS = elnk960.o esun3.o ei386aout.o ego32.o evsta.o \
- em88kbcs.o ea29k.o enews.o ehp300bsd.o ehp3hpux.o \
- eh8300.o eh8300h.o eebmon29k.o esun4.o egld960.o \
- em68kcoff.o est2000.o esa29200.o ei386mach.o \
- evanilla.o ei386coff.o ez8ksim.o emipslit.o ei386bsd.o \
- emipsbig.o emipsbsd.o emipsidt.o evax.o eh8500.o \
- eh8500b.o eh8500s.o eh8500c.o eh8500m.o \
- ehppaelf.o emipsidtl.o esh.o eelf_i386.o ealpha.o \
- ei386lynx.o em68klynx.o esparclynx.o ecoff_sparc.o \
- eelf32ppc.o ei386go32.o em68kaout.o ei386linux.o \
- eelf32_sparc.o eelf64_sparc.o eriscix.o eelf32mipb.o eelf32mipl.o
+ALL_EMULATIONS = ea29k.o ealpha.o ecoff_sparc.o eebmon29k.o \
+ eelf32_sparc.o eelf32bmip.o eelf32lmip.o eelf32ppc.o \
+ eelf64_sparc.o eelf_i386.o egld960.o ego32.o eh8300.o \
+ eh8300h.o eh8500.o eh8500b.o eh8500c.o eh8500m.o eh8500s.o \
+ ehp300bsd.o ehp3hpux.o ehppaelf.o ei386aout.o ei386bsd.o \
+ ei386coff.o ei386go32.o ei386linux.o ei386lynx.o ei386mach.o \
+ ei386nbsd.c ei386nw.o elnk960.o em68kaout.o em68kcoff.o \
+ em68klynx.o em88kbcs.o emipsbig.o emipsbsd.o emipsidt.o \
+ emipsidtl.o emipslit.o enews.o ens32knbsd.c eppcnw.o \
+ eriscix.o esa29200.o esh.o esparclynx.o esparcnbsd.c \
+ est2000.o esun3.o esun4.o evanilla.o evax.o evsta.o \
+ ez8ksim.o
CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \
@@ -204,11 +228,15 @@ STAGESTUFF = *.o ldscripts/* e*.c
info: ld.info
.PHONY: info
-ldgram.h ldgram.c: ldgram.y
+ldgram.c: ldgram.y
$(BISON) $(BISONFLAGS) -d $(srcdir)/ldgram.y
mv -f y.tab.c ldgram.c
mv -f y.tab.h ldgram.h
+# Separate from ldgram.c so that a parallel make doesn't try to build
+# both ldgram.c and ldgram.h simultaneously.
+ldgram.h: ldgram.c
+
# EMUL is the name of a file in the emulparams subdir, without the .sh.
ldmain.o: ldmain.c config.status
if [ -z "$(EMUL)" ] ; then \
@@ -370,12 +398,12 @@ emipsidtl.c: $(srcdir)/emulparams/mipsidtl.sh \
eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
$(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} elf_i386
-eelf32mipb.c: $(srcdir)/emulparams/elf32mipb.sh \
+eelf32bmip.c: $(srcdir)/emulparams/elf32bmip.sh \
$(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} elf32mipb
-eelf32mipl.c: $(srcdir)/emulparams/elf32mipl.sh \
+ ${GENSCRIPTS} elf32bmip
+eelf32lmip.c: $(srcdir)/emulparams/elf32lmip.sh \
$(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} elf32mipl
+ ${GENSCRIPTS} elf32lmip
ealpha.c: $(srcdir)/emulparams/alpha.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
${GENSCRIPTS} alpha
@@ -408,9 +436,22 @@ epc532machaout.c: $(srcdir)/emulparams/pc532machaout.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
${GENSCRIPTS} pc532machaout
-enetbsd532.c: $(srcdir)/emulparams/netbsd532.sh \
- $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} netbsd532
+ei386nw.c: $(srcdir)/emulparams/i386nw.sh \
+ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} i386nw
+eppcnw.c: $(srcdir)/emulparams/ppcnw.sh \
+ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/nw.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} ppcnw
+
+ei386nbsd.c: $(srcdir)/emulparams/i386nbsd.sh \
+ $(srcdir)/emultmpl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} i386nbsd
+ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \
+ $(srcdir)/emultmpl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} ns32knbsd
+esparcnbsd.c: $(srcdir)/emulparams/sparcnbsd.sh \
+ $(srcdir)/emultmpl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} sparcnbsd
$(LD_PROG): $(OFILES) $(BFDLIB) $(LIBIBERTY)
$(CC) $(CFLAGS) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(EXTRALIBS)
@@ -422,19 +463,8 @@ $(EMULATION_OFILES): ../bfd/bfd.h ../bfd/sysdep.h $(INCDIR)/bfdlink.h \
# These targets are for the dejagnu testsuites. The file site.exp
# contains global variables that all the testsuites will use.
-# There is a current debate as to how and where to generate test
-# outputs. Rob feels each test should be built in $(objdir) with
-# a unique name. Cassidy feels that we should create a directory
-# called $(objdir)/tmpdir and do the work there. This way, there
-# is no potential conflict with existing objects, ie: as there
-# was in the past with loop.o and flow.o, and, there is no chance
-# of filling /tmp, which would cause other problems. Lastly, this
-# allow retention of the testcase name making debugging easier.
-#
-testdir = $(objdir)/tmpdir
site.exp: ./config.status Makefile
- @if [ -d $(testdir) ]; then true; else mkdir $(testdir); fi
@echo "Making a new config file..."
@rm -f ./tmp?
@touch site.exp
@@ -455,9 +485,8 @@ site.exp: ./config.status Makefile
@echo "set target_triplet $(target_canonical)" >> ./tmp0
@echo "# DIRECTORY INFO" >> ./tmp0
@echo "set objdir `pwd`" >> ./tmp0
- @echo "set tmpdir `cd $(testdir); pwd`" >> ./tmp0
@echo "" >> ./tmp0
- @echo "# LD DEPENDANCIES" >> ./tmp0
+ @echo "# LD DEPENDENCIES" >> ./tmp0
@echo "set OFILES \"$(OFILES)\"" >> ./tmp0
@echo "set BFDLIB \"$(BFDLIB)\"" >> ./tmp0
@echo "set LIBIBERTY \"$(LIBIBERTY)\"" >> ./tmp0
@@ -472,26 +501,22 @@ site.exp: ./config.status Makefile
-@rm -f ./tmp?
check: site.exp
- @if [ $(host_canonical) = $(target_canonical) ]; then \
- rootme=`pwd`; export rootme; \
- srcdir=${srcdir} ; export srcdir ; \
- EXPECT=${EXPECT} ; export EXPECT ; \
- if [ -f $${rootme}/../expect/expect ] ; then \
- TCL_LIBRARY=$${srcdir}/../tcl/library ; \
- export TCL_LIBRARY ; fi ; \
- $(RUNTEST) --tool ld \
- --srcdir $(srcdir)/testsuite $(RUNTESTFLAGS) \
- CC="$(RUNTEST_CC)" CFLAGS="$(RUNTEST_CFLAGS)" \
- CXX="$(RUNTEST_CXX)" CXXFLAGS="$(RUNTEST_CXXFLAGS)" ;\
- if [ $$? != 0 ]; then exit 1; else true; fi ;\
- else \
- echo No cross-linker tests yet. ;\
- fi
+ r=`pwd`; export r; \
+ srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
+ EXPECT=${EXPECT} ; export EXPECT ; \
+ if [ -f $$r/../expect/expect ] ; then \
+ TCL_LIBRARY=$${srcroot}/../tcl/library ; \
+ export TCL_LIBRARY ; fi ; \
+ $(RUNTEST) --tool ld --srcdir $(srcdir)/testsuite $(RUNTESTFLAGS) \
+ CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS)" \
+ CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)"
installcheck:
.PHONY: check installcheck
# Rules for testing by relinking ld itself.
+# A similar test is in the testsuite. This target is for ease of use
+# when porting ld.
ld-partial.o: ld.new
./ld.new $(HOSTING_EMU) -o ld-partial.o -r $(OFILES)
@@ -513,32 +538,33 @@ bootstrap: ld3
.PHONY: bootstrap
# A test program for C++ constructors and destructors.
-
-cdtest: cdtest-main.o cdtest-bar.o cdtest-foo.o ld.new
- ./ld.new $(HOSTING_EMU) -o cdtest $(HOSTING_CRT0) \
- cdtest-main.o cdtest-bar.o cdtest-foo.o $(HOSTING_LIBS)
-
-cdtest.out: cdtest
- ./cdtest > cdtest.tmp
- mv cdtest.tmp cdtest.out
-
-cdtest-ur.o: cdtest-main.o cdtest-bar.o cdtest-foo.o ld.new
- ./ld.new $(HOSTING_EMU) -o cdtest-ur.o -Ur cdtest-main.o \
- cdtest-bar.o cdtest-foo.o
-
-cdtest-ur: cdtest-ur.o
- ./ld.new $(HOSTING_EMU) -o cdtest-ur $(HOSTING_CRT0) cdtest-ur.o \
- $(HOSTING_LIBS)
-
-cdtest-ur.out: cdtest-ur
- ./cdtest-ur > cdtest-ur.tmp
- mv cdtest-ur.tmp cdtest-ur.out
-
-check-cdtest: cdtest.out cdtest-ur.out $(srcdir)/cdtest.exp
- diff $(srcdir)/cdtest.exp cdtest.out
- diff $(srcdir)/cdtest.exp cdtest-ur.out
-
-.PHONY: check-cdtest
+# This test is now in the testsuite.
+#
+#cdtest: cdtest-main.o cdtest-bar.o cdtest-foo.o ld.new
+# ./ld.new $(HOSTING_EMU) -o cdtest $(HOSTING_CRT0) \
+# cdtest-main.o cdtest-bar.o cdtest-foo.o $(HOSTING_LIBS)
+#
+#cdtest.out: cdtest
+# ./cdtest > cdtest.tmp
+# mv cdtest.tmp cdtest.out
+#
+#cdtest-ur.o: cdtest-main.o cdtest-bar.o cdtest-foo.o ld.new
+# ./ld.new $(HOSTING_EMU) -o cdtest-ur.o -Ur cdtest-main.o \
+# cdtest-bar.o cdtest-foo.o
+#
+#cdtest-ur: cdtest-ur.o
+# ./ld.new $(HOSTING_EMU) -o cdtest-ur $(HOSTING_CRT0) cdtest-ur.o \
+# $(HOSTING_LIBS)
+#
+#cdtest-ur.out: cdtest-ur
+# ./cdtest-ur > cdtest-ur.tmp
+# mv cdtest-ur.tmp cdtest-ur.out
+#
+#check-cdtest: cdtest.out cdtest-ur.out $(srcdir)/cdtest.exp
+# diff $(srcdir)/cdtest.exp cdtest.out
+# diff $(srcdir)/cdtest.exp cdtest-ur.out
+#
+#.PHONY: check-cdtest
# END OF CHECK TARGETS
diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize
index 3729565..6b77fac 100644
--- a/ld/config/.Sanitize
+++ b/ld/config/.Sanitize
@@ -50,6 +50,7 @@ i386-go32.mt
i386-linux.mt
i386-lynx.mt
i386-mach.mt
+i386-nbsd.mt
i386-nw.mt
i386bsd.mh
i386sco.mh
@@ -75,6 +76,7 @@ mipsl-elf32.mt
mipsl-idt.mt
mips-lit.mt
news.mt
+ns32k-nbsd.mt
ose68.mt
ppc-elf32.mt
ppc-nw.mt
@@ -84,6 +86,7 @@ solaris2.mh
sparc64-elf.mt
sparc-ll.mh
sparc-lynx.mt
+sparc-nbsd.mt
st2000.mt
sun3.mh
sun3.mt
diff --git a/ld/config/i386-nbsd.mt b/ld/config/i386-nbsd.mt
new file mode 100644
index 0000000..93acef5
--- /dev/null
+++ b/ld/config/i386-nbsd.mt
@@ -0,0 +1 @@
+EMUL=i386nbsd
diff --git a/ld/config/netbsd532.mt b/ld/config/netbsd532.mt
deleted file mode 100644
index 92332ec..0000000
--- a/ld/config/netbsd532.mt
+++ /dev/null
@@ -1,2 +0,0 @@
-EMUL=netbsd532
-OTHER_EMULATIONS=enetbsd532.o
diff --git a/ld/config/ns32k-nbsd.mt b/ld/config/ns32k-nbsd.mt
new file mode 100644
index 0000000..54d7c5b
--- /dev/null
+++ b/ld/config/ns32k-nbsd.mt
@@ -0,0 +1 @@
+EMUL=ns32knbsd
diff --git a/ld/config/sparc-nbsd.mt b/ld/config/sparc-nbsd.mt
new file mode 100644
index 0000000..fe3f553
--- /dev/null
+++ b/ld/config/sparc-nbsd.mt
@@ -0,0 +1 @@
+EMUL=sparcnbsd
diff --git a/ld/configure.in b/ld/configure.in
index ef6d6f2..1d1c73c 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -49,6 +49,7 @@ case "${targ}" in
sparc64*) ld_target=sun4 ;;
sparc*-*-elf) ld_target=sun4sol2 ;;
sparc*-*-lynxos*) ld_target=sparc-lynx ;;
+ sparc*-*-netbsd*) ld_target=sparc-nbsd ;;
sparc*-*-solaris2*) ld_target=sun4sol2 ;;
sparc*-wrs-vxworks*) ld_target=sun4 ;;
i960-wrs-vxworks5.0*) ld_target=i960 ;;
@@ -73,6 +74,7 @@ case "${targ}" in
i[345]86-*-linux*) ld_target=i386-linux ;;
i[345]86-*-sysv4*) ld_target=i386-elf ;;
i[345]86-*-unixware) ld_target=i386-elf ;;
+ i[345]86-*-netbsd*) ld_target=i386-nbsd ;;
i[345]86-*-netware) ld_target=i386-nw ;;
i[345]86-*-elf*) ld_target=i386-elf ;;
i[345]86-*-sysv*) ld_target=i386-coff ;;
@@ -110,7 +112,7 @@ case "${targ}" in
alpha-*-netware*) ld_target=alpha ;;
z8k-*-sim | z8k-*-coff) ld_target=z8ksim ;;
ns32k-pc532-mach) ld_target=pc532mach ;;
- ns32k-pc532-netbsd*) ld_target=netbsd532 ;;
+ ns32k-pc532-netbsd*) ld_target=ns32k-nbsd ;;
powerpc-*-elf*) ld_target=ppc-elf32 ;;
powerpc-*-netware*) ld_target=ppc-nw ;;
*-*-aout) ld_target=${target_cpu}-${target_vendor} ;;
diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index fc7b111..5824aa9 100644
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -55,6 +55,7 @@ i386go32.sh
i386linux.sh
i386lynx.sh
i386mach.sh
+i386nbsd.sh
i386nw.sh
lnk960.sh
m68kaout.sh
@@ -67,10 +68,12 @@ mipsidt.sh
mipsidtl.sh
mipslit.sh
news.sh
+ns32knbsd.sh
ppcnw.sh
sa29200.sh
sh.sh
sparclynx.sh
+sparcnbsd.sh
st2000.sh
sun3.sh
sun4.sh
diff --git a/ld/emulparams/netbsd532.sh b/ld/emulparams/netbsd532.sh
deleted file mode 100644
index c0cd1c9..0000000
--- a/ld/emulparams/netbsd532.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-EMULATION_NAME=netbsd532
-SCRIPT_NAME=aout
-OUTPUT_FORMAT="a.out-netbsd-532"
-PAGE_SIZE=0x1000
-TEXT_START_ADDR=0x1020
-NONPAGED_TEXT_START_ADDR=0x1000
-ARCH=ns32k
diff --git a/ld/emulparams/ns32knbsd.sh b/ld/emulparams/ns32knbsd.sh
new file mode 100644
index 0000000..950dc74
--- /dev/null
+++ b/ld/emulparams/ns32knbsd.sh
@@ -0,0 +1,5 @@
+SCRIPT_NAME=aout
+TEXT_START_ADDR=0x1020
+OUTPUT_FORMAT="a.out-ns32k-netbsd"
+PAGE_SIZE=0x1000
+ARCH=ns32k
diff --git a/ld/emulparams/sparcnbsd.sh b/ld/emulparams/sparcnbsd.sh
new file mode 100644
index 0000000..916449b
--- /dev/null
+++ b/ld/emulparams/sparcnbsd.sh
@@ -0,0 +1,5 @@
+SCRIPT_NAME=aout
+TEXT_START_ADDR=0x1020
+OUTPUT_FORMAT="a.out-sparc-netbsd"
+PAGE_SIZE=0x1000
+ARCH=sparc