Remove spurious conflict indicators.

[deliverable/binutils-gdb.git] / ld / emulparams / delta68.sh

diff --git a/ld/emulparams/delta68.sh b/ld/emulparams/delta68.sh
index e4b1b5b3fc1b4869a73f5d6dc102b1f6d0df3436..e3c5909919905cda4cc054e9affab345a5754ae4 100644 (file)
--- a/ld/emulparams/delta68.sh
+++ b/ld/emulparams/delta68.sh
@@ -1,5 +1,5 @@
 SCRIPT_NAME=delta68
-OUTPUT_FORMAT="coff-m68k"
-TEXT_START_ADDR=8400
-PAGE_SIZE=4096
+OUTPUT_FORMAT="coff-m68k-sysv"
+TEXT_START_ADDR=0x2000
+PAGE_SIZE=0x1000000
 ARCH=m68k