tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-25 23:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

utils: build utility programs by Open Watcom for Linux and Windows

Browse Source
This commit is contained in:
Jiří Malák 2024-07-06 08:54:27 +02:00 committed by Kenneth J Davis
parent c012700190
commit e985cc36b3
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hdr/portab.h
View File

@ -77,7 +77,7 @@ void __emit__(char, ...);
#define enable() __emit__(0xfb) #define enable() __emit__(0xfb)
#endif #endif
#elif defined (_MSC_VER) #elif defined(_MSC_VER)
#define I86 #define I86
#define asm __asm #define asm __asm
@ -100,14 +100,11 @@ static unsigned short __inline getSS(void)
asm mov ax, ss; asm mov ax, ss;
} }
#elif defined(__WATCOMC__) && defined(BUILD_UTILS)
/* workaround for building some utils with OpenWatcom (owcc) */
#define MC68K
#elif defined(__WATCOMC__) /* don't know a better way */ #elif defined(__WATCOMC__) /* don't know a better way */
#if defined(_M_I86) #if defined(_M_I86)
#define I86 #define I86
#endif
#define __int__(intno) asm int intno; #define __int__(intno) asm int intno;
void disable(void); void disable(void);
#pragma aux disable = "cli" modify exact []; #pragma aux disable = "cli" modify exact [];
@ -131,10 +128,11 @@ unsigned short getSS(void);
/* enable Possible loss of precision warning for compatibility with Borland */ /* enable Possible loss of precision warning for compatibility with Borland */
#pragma enable_message(130) #pragma enable_message(130)
#if _M_IX86 >= 300 || defined(M_I386) #else
#ifndef I386
#define I386 /* workaround for building some utils with OpenWatcom (flat model) */
#endif #define MC68K
#endif #endif
#elif defined (_MYMC68K_COMILER_) #elif defined (_MYMC68K_COMILER_)

2
mkfiles/owlinux.mak
View File

@ -12,7 +12,7 @@ CP=cp
ECHOTO=echo>> ECHOTO=echo>>
INITPATCH=@echo > /dev/null INITPATCH=@echo > /dev/null
CLDEF=1 CLDEF=1
CLT=gcc -Wall -DDOSC_TIME_H -I../hdr -o $@ CLT=wcl386 -bcl=linux -DDOSC_TIME_H -I../hdr -fe=$@ -I$(COMPILERPATH)/lh
CLC=$(CLT) CLC=$(CLT)
CFLAGST=-fo=.obj $(CFLAGST) CFLAGST=-fo=.obj $(CFLAGST)
ALLCFLAGS=-fo=.obj $(ALLCFLAGS) ALLCFLAGS=-fo=.obj $(ALLCFLAGS)

4
mkfiles/owwin.mak
View File

@ -7,13 +7,13 @@ include "../mkfiles/watcom.mak"
DIRSEP=\ DIRSEP=\
INCLUDEPATH=$(COMPILERPATH)$(DIRSEP)h INCLUDEPATH=$(COMPILERPATH)\h
#RM=del 2>nul #RM=del 2>nul
#CP=copy #CP=copy
#ECHOTO=echo>> #ECHOTO=echo>>
#INITPATCH=@echo > nul #INITPATCH=@echo > nul
CLDEF=1 CLDEF=1
CLT=owcc -DDOSC_TIME_H -DBUILD_UTILS -I../hdr -o $@ CLT=wcl386 -bcl=nt -DDOSC_TIME_H -I..\hdr -fe=$@ -I$(COMPILERPATH)\h -I$(COMPILERPATH)\h\nt
CLC=$(CLT) CLC=$(CLT)
CFLAGST=-fo=.obj $(CFLAGST) CFLAGST=-fo=.obj $(CFLAGST)
ALLCFLAGS=-fo=.obj $(ALLCFLAGS) ALLCFLAGS=-fo=.obj $(ALLCFLAGS)

2
mkfiles/watcom.mak
View File

@ -61,7 +61,7 @@ MATH_INSERT=+i4m
# -3 optimization for 386 - given in CONFIG.MAK, not here # -3 optimization for 386 - given in CONFIG.MAK, not here
# #
ALLCFLAGS=-I..$(DIRSEP)hdr $(TARGETOPT) $(ALLCFLAGS)-zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff-r ALLCFLAGS=-I..$(DIRSEP)hdr $(TARGETOPT) $(ALLCFLAGS) -zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff-r
INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-gTGROUP-ndI INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-gTGROUP-ndI
CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT

2
utils/patchobj.c
View File

@ -13,7 +13,7 @@
*****************************************************************************/ *****************************************************************************/
#include <stdio.h> #include <stdio.h>
#ifdef __GNUC__ #if defined(__GNUC__) || defined(__WATCOMC__)
#include <unistd.h> #include <unistd.h>
#else #else
#include <io.h> #include <io.h>