Resolve other problems that dumb cvs can't find out by itself.

(trivial part done, `interesting' patches remain)

12 files changed, 9 insertions, 16 deletions

diff --git a/gnu/usr.bin/binutils/ld/emulparams/delta68.sh b/gnu/usr.bin/binutils/ld/emulparams/delta68.sh
index 640150612bd..e3c59099199 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/delta68.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/delta68.sh
@@ -1,5 +1,5 @@
 SCRIPT_NAME=delta68
-OUTPUT_FORMAT="coff-m68k"
+OUTPUT_FORMAT="coff-m68k-sysv"
 TEXT_START_ADDR=0x2000
 PAGE_SIZE=0x1000000
 ARCH=m68k
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh
index 3279fc3b6b2..74e2326d53e 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh
@@ -5,6 +5,7 @@ MAXPAGESIZE=0x10000
 NONPAGED_TEXT_START_ADDR=0x10000
 ALIGNMENT=8
 ARCH=sparc
+MACHINE=
 TEMPLATE_NAME=elf32
 DATA_PLT=
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh
index ffe82628150..473c41169e0 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh
@@ -25,5 +25,6 @@ OTHER_SECTIONS='
   .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
 '
 ARCH=mips
+MACHINE=
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32lmip.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32lmip.sh
index a686a9f2449..23312f44aca 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32lmip.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32lmip.sh
@@ -25,5 +25,6 @@ OTHER_SECTIONS='
   .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
 '
 ARCH=mips
+MACHINE=
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32lppc.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32lppc.sh
index 65daf8c9eee..edffc610d49 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32lppc.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32lppc.sh
@@ -5,3 +5,4 @@ OUTPUT_FORMAT="elf32-powerpcle"
 TEXT_START_ADDR=0x40000
 MAXPAGESIZE=0x40000
 ARCH=powerpc
+MACHINE=
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh
index fcafd1139ee..3e3880c63d2 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh
@@ -5,3 +5,4 @@ OUTPUT_FORMAT="elf32-powerpc"
 TEXT_START_ADDR=0x01800000
 MAXPAGESIZE=0x10000
 ARCH=powerpc
+MACHINE=
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh b/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh
index b11b7d71886..dff567bffbc 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh
@@ -4,6 +4,7 @@ TEXT_START_ADDR=0x08048000
 MAXPAGESIZE=0x1000
 NONPAGED_TEXT_START_ADDR=0x08048000
 ARCH=i386
+MACHINE=
 NOP=0x9090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/go32.sh b/gnu/usr.bin/binutils/ld/emulparams/go32.sh
deleted file mode 100644
index d13357fda7a..00000000000
--- a/gnu/usr.bin/binutils/ld/emulparams/go32.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_NAME=go32coff
-OUTPUT_FORMAT="coff-go32"
-TEXT_START_ADDR=0x10a8
-TARGET_PAGE_SIZE=0x1000
-SEGMENT_SIZE=0x1000
-NONPAGED_TEXT_START_ADDR=0x0
-ARCH=i386
diff --git a/gnu/usr.bin/binutils/ld/emulparams/i386moss.sh b/gnu/usr.bin/binutils/ld/emulparams/i386moss.sh
index dd214cfacd0..a5e0e05eb22 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/i386moss.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/i386moss.sh
@@ -4,6 +4,7 @@ TEXT_START_ADDR=0x00002000
 MAXPAGESIZE=0x1000
 NONPAGED_TEXT_START_ADDR=0x00002000
 ARCH=i386
+MACHINE=
 NOP=0x9090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/m68kelf.sh b/gnu/usr.bin/binutils/ld/emulparams/m68kelf.sh
index 1044f31165b..ad352c585b3 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/m68kelf.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/m68kelf.sh
@@ -4,6 +4,7 @@ TEXT_START_ADDR=0x80000000
 MAXPAGESIZE=0x2000
 NONPAGED_TEXT_START_ADDR=${TEXT_START_ADDR}
 ARCH=m68k
+MACHINE=
 NOP=0x4e75
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh b/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh
index 30b783a82f9..6c6737c3329 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh
@@ -3,4 +3,3 @@ OUTPUT_FORMAT="coff-m88kbcs"
 TEXT_START_ADDR=??
 TARGET_PAGE_SIZE=??
 ARCH=m88k
-TEMPLATE_NAME=m88kbcs
diff --git a/gnu/usr.bin/binutils/ld/emulparams/pc532machaout.sh b/gnu/usr.bin/binutils/ld/emulparams/pc532machaout.sh
deleted file mode 100644
index 07aa985b046..00000000000
--- a/gnu/usr.bin/binutils/ld/emulparams/pc532machaout.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-EMULATION_NAME=pc532machaout
-SCRIPT_NAME=aout
-OUTPUT_FORMAT="a.out-pc532-mach"
-TARGET_PAGE_SIZE=0x1000
-TEXT_START_ADDR="0x10020"
-NONPAGED_TEXT_START_ADDR=0x10000
-ARCH=ns32k