From 3d1ee0f974987bbe27da2710ed40cca6af01403a Mon Sep 17 00:00:00 2001 From: uz Date: Tue, 29 Sep 2009 13:08:23 +0000 Subject: [PATCH] Fixes for the watcom makefiles: * Increase the stack size to 64K (instead of 4096). This solves a memory overwrite problem with the DOS version. * Generate a mapfile, but set it to "ignored" in svn. * Be somewhat more specific in zap. git-svn-id: svn://svn.cc65.org/cc65/trunk@4273 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/ar65/make/watcom.mak | 6 ++++-- src/ca65/make/watcom.mak | 8 +++++--- src/cc65/make/watcom.mak | 6 ++++-- src/cl65/make/watcom.mak | 6 ++++-- src/co65/make/watcom.mak | 6 ++++-- src/common/make/watcom.mak | 2 +- src/da65/make/watcom.mak | 6 ++++-- src/grc/make/watcom.mak | 6 ++++-- src/ld65/make/watcom.mak | 8 +++++--- src/od65/make/watcom.mak | 6 ++++-- 10 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/ar65/make/watcom.mak b/src/ar65/make/watcom.mak index 2be48e8c8..6d46b6a2c 100644 --- a/src/ar65/make/watcom.mak +++ b/src/ar65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = ar65.exe @@ -88,6 +88,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -98,7 +100,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS)$(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/ca65/make/watcom.mak b/src/ca65/make/watcom.mak index 3969c226c..74795cc49 100644 --- a/src/ca65/make/watcom.mak +++ b/src/ca65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = ca65.exe @@ -117,7 +117,9 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) - @echo "NAME $@" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) + @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @$(LD) system $(SYSTEM) @$(LNKCFG) @@ -127,7 +129,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/cc65/make/watcom.mak b/src/cc65/make/watcom.mak index b23e54f27..ea83b0e1b 100644 --- a/src/cc65/make/watcom.mak +++ b/src/cc65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = cc65.exe @@ -158,6 +158,8 @@ all: svnversion $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -177,7 +179,7 @@ clean: @rm -f *~ core zap: clean - @rm -f $(OBJS) $(EXE) svnversion.c + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) svnversion.c strip: @-$(WSTRIP) $(EXE) diff --git a/src/cl65/make/watcom.mak b/src/cl65/make/watcom.mak index 6c59d15f3..2b7d02ab0 100644 --- a/src/cl65/make/watcom.mak +++ b/src/cl65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = cl65.exe @@ -80,6 +80,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -90,7 +92,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/co65/make/watcom.mak b/src/co65/make/watcom.mak index 802f0b7b3..ffc4e83b2 100644 --- a/src/co65/make/watcom.mak +++ b/src/co65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = co65.exe @@ -84,6 +84,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -94,7 +96,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak index f7a195f80..46efdbacc 100644 --- a/src/common/make/watcom.mak +++ b/src/common/make/watcom.mak @@ -20,7 +20,7 @@ LD = $(WINE) wlink LIB = common.lib # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 # Create NT programs by default ifndef TARGET diff --git a/src/da65/make/watcom.mak b/src/da65/make/watcom.mak index b4eba8cc1..ee703d93a 100644 --- a/src/da65/make/watcom.mak +++ b/src/da65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = da65.exe @@ -97,6 +97,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -107,7 +109,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/grc/make/watcom.mak b/src/grc/make/watcom.mak index 990082039..8895acbc8 100644 --- a/src/grc/make/watcom.mak +++ b/src/grc/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = grc.exe @@ -78,6 +78,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -88,7 +90,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/ld65/make/watcom.mak b/src/ld65/make/watcom.mak index c9cd98ba1..c1f6b04af 100644 --- a/src/ld65/make/watcom.mak +++ b/src/ld65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = ld65.exe @@ -72,7 +72,7 @@ OBJS = asserts.obj \ error.obj \ exports.obj \ expr.obj \ - extsyms.obj \ + extsyms.obj \ fileinfo.obj \ fileio.obj \ filepath.obj \ @@ -106,6 +106,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -116,7 +118,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) diff --git a/src/od65/make/watcom.mak b/src/od65/make/watcom.mak index 59055254a..000a8133d 100644 --- a/src/od65/make/watcom.mak +++ b/src/od65/make/watcom.mak @@ -22,7 +22,7 @@ WSTRIP = $(WINE) wstrip -q LNKCFG = ld.tmp # Program arguments -CFLAGS = -d1 -onatx -zp4 -5 -zq -w2 -i=..\\common +CFLAGS = -d1 -obeilr -zp4 -5 -zq -w2 -i=..\\common # Target files EXE = od65.exe @@ -82,6 +82,8 @@ all: $(EXE) $(EXE): $(OBJS) $(LIBS) @echo "DEBUG ALL" > $(LNKCFG) @echo "OPTION QUIET" >> $(LNKCFG) + @echo "OPTION MAP" >> $(LNKCFG) + @echo "OPTION STACK=65536" >> $(LNKCFG) @echo "NAME $@" >> $(LNKCFG) @for i in $(OBJS); do echo "FILE $${i}"; done >> $(LNKCFG) @for i in $(LIBS); do echo "LIBRARY $${i}"; done >> $(LNKCFG) @@ -92,7 +94,7 @@ clean: @rm -f *~ core zap: clean - @rm -f *.obj $(EXE) + @rm -f $(OBJS) $(EXE) $(EXE:.exe=.map) strip: @-$(WSTRIP) $(EXE) -- 2.39.5