# HG changeset patch # User Boisy Pitre # Date 1359294881 21600 # Node ID 151849d94f25aedf739707c847540c2068ef286f # Parent 28b6ec8a14d531f7c30d6be0259d2e9793cc7534# Parent e333ec1907ef00b02256cb86320785489607098e Merged drencor's changes diff -r e333ec1907ef -r 151849d94f25 level1/cmds/attr.as --- a/level1/cmds/attr.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/attr.as Sun Jan 27 07:54:41 2013 -0600 @@ -41,7 +41,7 @@ u0078 rmb 46 endsect - section text + section code * psect tee_a,Prgrm+Objct,ReEnt+rev,edition,200,start diff -r e333ec1907ef -r 151849d94f25 level1/cmds/dw.as --- a/level1/cmds/dw.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/dw.as Sun Jan 27 07:54:41 2013 -0600 @@ -28,7 +28,7 @@ die rmb 1 endsect - section text + section code * psect dw_a,$01,$80,1,200,start * signal handling diff -r e333ec1907ef -r 151849d94f25 level1/cmds/inetd.as --- a/level1/cmds/inetd.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/inetd.as Sun Jan 27 07:54:41 2013 -0600 @@ -44,7 +44,7 @@ endsect * psect inetd_a,$01,$80,1,200,start - section text + section code DEBUG equ 1 diff -r e333ec1907ef -r 151849d94f25 level1/cmds/load.as --- a/level1/cmds/load.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/load.as Sun Jan 27 07:54:41 2013 -0600 @@ -22,7 +22,7 @@ endsect * psect load_a,Prgrm+Objct,ReEnt+rev,edition,200,start - section text + section code start os9 F$Load bcs Exit diff -r e333ec1907ef -r 151849d94f25 level1/cmds/tee.as --- a/level1/cmds/tee.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/tee.as Sun Jan 27 07:54:41 2013 -0600 @@ -27,7 +27,7 @@ endsect * psect tee_a,Prgrm+Objct,ReEnt+rev,edition,200,start - section text + section code start clrb clr pcount clear path counter diff -r e333ec1907ef -r 151849d94f25 level1/cmds/telnet.as --- a/level1/cmds/telnet.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/telnet.as Sun Jan 27 07:54:41 2013 -0600 @@ -74,7 +74,7 @@ endsect * psect telnet_a,tylg,atrv,edition,200,start - section text + section code TELESCAPE equ 'Y-$40 * CTRL-Y diff -r e333ec1907ef -r 151849d94f25 level1/cmds/touch.as --- a/level1/cmds/touch.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/touch.as Sun Jan 27 07:54:41 2013 -0600 @@ -57,7 +57,7 @@ endsect * psect touch_a,Prgrm+Objct,ReEnt+rev,edition,200,start - section text + section code * Place constant strings here IFNE DOHELP diff -r e333ec1907ef -r 151849d94f25 level1/cmds/tsmon.as --- a/level1/cmds/tsmon.as Sun Jan 27 00:14:03 2013 -0600 +++ b/level1/cmds/tsmon.as Sun Jan 27 07:54:41 2013 -0600 @@ -25,7 +25,7 @@ endsect * psect tsmon_a,Prgrm+Objct,ReEnt+rev,edition,200,start - section text + section code Login fcc "LOGIN" LoginPrm fcb C$CR diff -r e333ec1907ef -r 151849d94f25 lib/scf.as --- a/lib/scf.as Sun Jan 27 00:14:03 2013 -0600 +++ b/lib/scf.as Sun Jan 27 07:54:41 2013 -0600 @@ -155,7 +155,6 @@ C$PERD: SET '. C$COMA: SET ', - PAG ********************************************* * Sequential Character Path Descriptor Format diff -r e333ec1907ef -r 151849d94f25 rules.mak --- a/rules.mak Sun Jan 27 00:14:03 2013 -0600 +++ b/rules.mak Sun Jan 27 07:54:41 2013 -0600 @@ -43,7 +43,7 @@ # Use the cross assembler #AS = os9asm -i=$(DEFSDIR) -AS = lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=. --includedir=$(DEFSDIR) +AS = lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero,undefextern,dollarnotlocal --includedir=. --includedir=$(DEFSDIR) ASOUT = -o AFLAGS = -DNOS9VER=$(NOS9VER) -DNOS9MAJ=$(NOS9MAJ) -DNOS9MIN=$(NOS9MIN) -DNOS9DBG=$(NOS9DBG) ifdef PORT @@ -51,7 +51,7 @@ endif # RMA/RLINK -ASM = lwasm --6309 --format=obj --pragma=pcaspcr,nosymbolcase,condundefzero,undefextern,dollarnotlocal --includedir=. +ASM = lwasm --6309 --format=obj --pragma=pcaspcr,nosymbolcase,condundefzero,undefextern,dollarnotlocal,export --includedir=. LINKER = lwlink # Commands @@ -109,6 +109,9 @@ %.a: %.o lwar -c $@ $? +%: %.o + $(LINKER) $(LFLAGS) $^ -o$@ + %: %.a $(LINKER) $(LFLAGS) $^ -o$@