From 3db383fbd30f36e5defab24f65d73b989910e243 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Thu, 27 Feb 2025 18:20:52 +0900 Subject: [PATCH 1/4] /bin/bash -> /usr/bin/env bash --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ae3bc3d8..c751885c 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e From 29857986b9dbdb5d505533aa572c6fc07b1ad63e Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Thu, 27 Feb 2025 18:23:13 +0900 Subject: [PATCH 2/4] add FreeBSD, NetBSD and OpenBSD support --- mkfiles/watcom.mak | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mkfiles/watcom.mak b/mkfiles/watcom.mak index 86393cf0..69152a38 100644 --- a/mkfiles/watcom.mak +++ b/mkfiles/watcom.mak @@ -37,6 +37,12 @@ CFLAGS1 = -os-s-wx ! endif ! else ifdef __OSX__ clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ +! else ifdef __FREEBSD__ + clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ +! else ifdef __OPENBSD__ + clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ +! else ifdef __NETBSD__ + gcc -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ ! else $(CL386) -I$(WATCOM)$(DIRSEP)h $< -fm -fe=$@ -I..$(DIRSEP)suppl ! endif From c2bff59ffc87ff3f30cd9865635e2c179e7f9d30 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Sun, 2 Mar 2025 11:55:31 +0900 Subject: [PATCH 3/4] watcom.mak: remove -DGCC, this is for ia16-elf-gcc only --- mkfiles/watcom.mak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mkfiles/watcom.mak b/mkfiles/watcom.mak index 69152a38..427a376e 100644 --- a/mkfiles/watcom.mak +++ b/mkfiles/watcom.mak @@ -36,13 +36,13 @@ CFLAGS1 = -os-s-wx $(CL) -ms -I$(WATCOM)$(DIRSEP)h $< -fm -fe=$@ -I..$(DIRSEP)suppl ! endif ! else ifdef __OSX__ - clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ + clang -x c -Og -g -Wall -Wno-pragma-pack -D__GETOPT_H -I../suppl $< -o $@ ! else ifdef __FREEBSD__ - clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ + clang -x c -Og -g -Wall -Wno-pragma-pack -D__GETOPT_H -I../suppl $< -o $@ ! else ifdef __OPENBSD__ - clang -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ + clang -x c -Og -g -Wall -Wno-pragma-pack -D__GETOPT_H -I../suppl $< -o $@ ! else ifdef __NETBSD__ - gcc -x c -Og -g -Wall -Wno-pragma-pack -DGCC -D__GETOPT_H -I../suppl $< -o $@ + gcc -x c -Og -g -Wall -Wno-pragma-pack -D__GETOPT_H -I../suppl $< -o $@ ! else $(CL386) -I$(WATCOM)$(DIRSEP)h $< -fm -fe=$@ -I..$(DIRSEP)suppl ! endif From 1442accb3424e9a2186f656481d52bfd9e605fc0 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Tue, 4 Mar 2025 22:53:12 +0900 Subject: [PATCH 4/4] mkfiles/gcc.mak: replace -DGCC -> -DTARGET_USE_GCC_IA16 --- mkfiles/gcc.mak | 2 +- tools/ptchsize.c | 6 +++--- utils/mkinfres.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkfiles/gcc.mak b/mkfiles/gcc.mak index 96be88ab..8da8f45e 100644 --- a/mkfiles/gcc.mak +++ b/mkfiles/gcc.mak @@ -27,7 +27,7 @@ CFLAGS1 = -Os -Wall -Werror -Wno-pointer-to-int-cast -Wno-incompatible-pointer-t .SUFFIXES: .c .asm .com .exe .obj ifeq ($(UTILS_BUILD),1) .c.exe: - gcc -x c -Og -g -Wall -DGCC -D__GETOPT_H -I../suppl $< -o $@ + gcc -x c -Og -g -Wall -DTARGET_USE_GCC_IA16 -D__GETOPT_H -I../suppl $< -o $@ else ifeq ($(COMPACT_MODEL),1) .c.obj .c.exe: @echo ------------------------------------------------------ diff --git a/tools/ptchsize.c b/tools/ptchsize.c index dd7866ac..c86633b4 100644 --- a/tools/ptchsize.c +++ b/tools/ptchsize.c @@ -230,7 +230,7 @@ int main(int argc, char **argv) } if(argc == 2 -#ifndef GCC +#ifndef TARGET_USE_GCC_IA16 || ival.heapPos == ~0 #endif ) { @@ -275,7 +275,7 @@ int main(int argc, char **argv) , argv[1], tosize); /* Watcom already has extraMin minimal and dynamically adjusts its MCB*/ if(tosize) { -#ifdef GCC +#ifdef TARGET_USE_GCC_IA16 /* need to adjust SP */ unsigned startbss = 0x10000 - exe.extraMax * 16; exe.fSP = startbss + ival.extraSpace * 16 + tosize; @@ -293,7 +293,7 @@ int main(int argc, char **argv) return 77; } -#ifndef GCC +#ifndef TARGET_USE_GCC_IA16 if(fseek(freecom, ival.heapPos, SEEK_SET) != 0) { printf("Failed to seek to heap size offset in %s\n", argv[1]); return 42; diff --git a/utils/mkinfres.c b/utils/mkinfres.c index 7eb6842a..9eabe540 100644 --- a/utils/mkinfres.c +++ b/utils/mkinfres.c @@ -130,7 +130,7 @@ int addImageDisplacement(const char * const fnam *extraSpace += (stacksize+15)/16; } fclose(f); -#ifdef GCC +#ifdef TARGET_USE_GCC_IA16 stacksize = 4*1024; *extraSpace += stacksize / 16; #else