From 8b5c21df5e13970ef9ae82b996f4cbc5b7dffedb Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 25 Oct 1995 05:01:42 +0000
Subject: [PATCH] Win32 needs ".386" and ".model" declarations.

---
 v7/src/microcode/cmpauxmd/i386.m4    | 4 +++-
 v7/src/microcode/ntutl/makefile.wcc  | 5 ++---
 v7/src/microcode/os2utl/makefile.wcc | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/v7/src/microcode/cmpauxmd/i386.m4 b/v7/src/microcode/cmpauxmd/i386.m4
index ebf5fdcfb..826ea4976 100644
--- a/v7/src/microcode/cmpauxmd/i386.m4
+++ b/v7/src/microcode/cmpauxmd/i386.m4
@@ -1,6 +1,6 @@
 ### -*-Midas-*-
 ###
-###	$Id: i386.m4,v 1.41 1995/10/24 06:28:41 cph Exp $
+###	$Id: i386.m4,v 1.42 1995/10/25 04:57:46 cph Exp $
 ###
 ###	Copyright (c) 1992-95 Massachusetts Institute of Technology
 ###
@@ -381,6 +381,8 @@ define(rmask,REG(ebp))
 
 IFDOS(`.386
 .model tiny')
+IF_WIN32(`.386
+.model flat')
 
 DECLARE_DATA_SEGMENT()
 declare_alignment(2)
diff --git a/v7/src/microcode/ntutl/makefile.wcc b/v7/src/microcode/ntutl/makefile.wcc
index 1703bc546..47b35d2ae 100644
--- a/v7/src/microcode/ntutl/makefile.wcc
+++ b/v7/src/microcode/ntutl/makefile.wcc
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###     $Id: makefile.wcc,v 1.2 1995/10/24 09:33:04 cph Exp $
+###     $Id: makefile.wcc,v 1.3 1995/10/25 05:01:08 cph Exp $
 ###
 ###     Copyright (c) 1992-95 Massachusetts Institute of Technology
 ###
@@ -102,14 +102,13 @@ M4FLAGS = -DWIN32 -DWCC386R
 
 # Assembler options.
 #
-# /4pr		like /4r for compiler
 # /bt=nt	build NT binary (default when host is NT)
 # /d1		generate debug info
 # /fpi		generate in-line 387 insns, emulate if none
 # /fp3		generate in-line 387 insns
 # /mf		use flat memory model
 # /zq		operate quietly
-ASFLAGS = /4pr /d1 /fpi /fp3 /mf /zq
+ASFLAGS = /bt=nt /d1 /fpi /fp3 /mf /zq
 
 all : scheme.exe bchschem.exe bintopsb.exe psbtobin.exe
 
diff --git a/v7/src/microcode/os2utl/makefile.wcc b/v7/src/microcode/os2utl/makefile.wcc
index adab1db6c..9bef98122 100644
--- a/v7/src/microcode/os2utl/makefile.wcc
+++ b/v7/src/microcode/os2utl/makefile.wcc
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###	$Id: makefile.wcc,v 1.3 1995/10/17 23:06:53 cph Exp $
+###	$Id: makefile.wcc,v 1.4 1995/10/25 05:01:42 cph Exp $
 ###
 ###	Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -94,13 +94,12 @@ M4FLAGS = -DOS2 -DDASM -DWCC386R
 
 # Assembler options.
 #
-# /4pr		like /4r for compiler
 # /d1		generate debug info
 # /fpi		generate in-line 387 insns, emulate if none
 # /fp3		generate in-line 387 insns
 # /mf		use flat memory model
 # /zq		operate quietly
-ASFLAGS = /4pr /d1 /fpi /fp3 /mf /zq
+ASFLAGS = /d1 /fpi /fp3 /mf /zq
 
 %.obj : %.c
 	$(CC) $(CFLAGS) $<
-- 
2.25.1