From 0b5098042ed7d221f6839aa8ed6142b7bb0044a7 Mon Sep 17 00:00:00 2001
From: Bart Oldeman <bart@dosemu.org>
Date: Sat, 9 Apr 2011 02:42:51 +0000
Subject: [PATCH] Make sure the DOS native and Linux cross-builds produce
 identical binaries.

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1568 6ac86273-5f31-0410-b378-82cca8765d1b
---
 docs/history.txt    | 7 +++++++
 kernel/asmsupt.asm  | 5 +++++
 mkfiles/owlinux.mak | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/history.txt b/docs/history.txt
index 48ec920..ecffb60 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -21,6 +21,13 @@ Changelog items can list SVN revision rNUMBER and bugzilla bug NUMBER.
 	  sector is given (sys X: bootfile.bin)
 
 + Changes Bart
+	* r1568 kernel/asmsupt.asm, mkfiles/owlinux.mak: Make sure the
+	  DOS native and Linux cross-builds produce identical binaries.
+	* r1567	drivers/rdpcclk.asm,kernel/{asmsupt,entry,irqstack,kernel,
+	  nls_hc}.asm, kernel/makefile:
+	  Remove useless END from nls_hc.asm, add explicit byte
+          overrides for older versions of NASM for more compact code,
+          and adjust silent relocation segments.
 	* r1565 sys/sys.c: Change // to /* comments for Turbo C compatibility.
 	* r1564 kernel/dosfns.c: If handle valid, close file in PSP
 	  table before the low-level close + (perhaps) critical error.
diff --git a/kernel/asmsupt.asm b/kernel/asmsupt.asm
index 47f12fd..156c3dd 100644
--- a/kernel/asmsupt.asm
+++ b/kernel/asmsupt.asm
@@ -34,6 +34,11 @@
 ; $Id$
 ;
 
+; for OW on Linux:
+%ifdef owlinux
+%define WATCOM
+%endif
+
 %ifdef WATCOM
 %ifdef _INIT
 %define WATCOM_INIT ; no seperate init segment for watcom.
diff --git a/mkfiles/owlinux.mak b/mkfiles/owlinux.mak
index 3c12475..5172c15 100644
--- a/mkfiles/owlinux.mak
+++ b/mkfiles/owlinux.mak
@@ -16,4 +16,4 @@ CLT=gcc -DDOSC_TIME_H -I../hdr -o $@
 CLC=$(CLT)
 CFLAGST=-fo=.obj $(CFLAGST)
 ALLCFLAGS=-fo=.obj $(ALLCFLAGS) 
-XLINK=$(XLINK) debug all op symfile format dos option map op statics F { $(OBJS) ../lib/device.lib } N kernel.exe $#
+XLINK=$(XLINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ../lib/device.lib N kernel.exe $#