From 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Tue, 12 Sep 2000 19:13:03 +0000
Subject: Help stupid cvs fixing basic conflicts.

---
 gnu/usr.bin/binutils/ld/emulparams/i386go32.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/usr.bin/binutils/ld/emulparams/i386go32.sh')

diff --git a/gnu/usr.bin/binutils/ld/emulparams/i386go32.sh b/gnu/usr.bin/binutils/ld/emulparams/i386go32.sh
index 52649a1e5d9..0ef16c4d37c 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/i386go32.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/i386go32.sh
@@ -1,8 +1,8 @@
 SCRIPT_NAME=i386go32
-OUTPUT_FORMAT="coff-i386"
+OUTPUT_FORMAT="coff-go32"
 TEXT_START_ADDR=0x10a8
 TARGET_PAGE_SIZE=0x1000
-SEGMENT_SIZE=0x1000
+SEGMENT_SIZE=0x200
 NONPAGED_TEXT_START_ADDR=0x0
 ARCH=i386
 
-- 
cgit v1.2.3