From 33542e3ed9edd48cc49d78be0490d331999fc666 Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Wed, 14 Sep 2005 08:55:28 +0000
Subject: [PATCH] Use the new linker features in apple2.cfg. This makes
 apple2-tgi.cfg obsolete.

git-svn-id: svn://svn.cc65.org/cc65/trunk@3648 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/ld65/cfg/apple2-tgi.cfg | 36 ------------------------------------
 src/ld65/cfg/apple2.cfg     | 29 +++++++++++++++--------------
 2 files changed, 15 insertions(+), 50 deletions(-)
 delete mode 100644 src/ld65/cfg/apple2-tgi.cfg

diff --git a/src/ld65/cfg/apple2-tgi.cfg b/src/ld65/cfg/apple2-tgi.cfg
deleted file mode 100644
index 22d1233b4..000000000
--- a/src/ld65/cfg/apple2-tgi.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-MEMORY {
-    ZP:     start = $0080, size = $001A, define = yes;
-    HEADER: start = $0000, size = $0004, file = %O;
-    RAM:    start = $4000, size = $7600, file = %O;
-}
-SEGMENTS {
-    EXEHDR:   load = HEADER, type = ro;
-    STARTUP:  load = RAM,    type = ro, define = yes;
-    LOWCODE:  load = RAM,    type = ro,               optional = yes;
-    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
-    CODE:     load = RAM,    type = ro;
-    RODATA:   load = RAM,    type = ro;
-    DATA:     load = RAM,    type = rw;
-    BSS:      load = RAM,    type = bss, define = yes;
-    HEAP:     load = RAM,    type = bss, optional = yes; # must sit just below stack
-    ZEROPAGE: load = ZP,     type = zp;
-}
-FEATURES {
-    CONDES: segment = INIT,
-	    type = constructor,
-	    label = __CONSTRUCTOR_TABLE__,
-	    count = __CONSTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-	    type = destructor,
-	    label = __DESTRUCTOR_TABLE__,
-	    count = __DESTRUCTOR_COUNT__;
-    CONDES: type = interruptor,
-	    segment = RODATA,
-	    label = __INTERRUPTOR_TABLE__,
-	    count = __INTERRUPTOR_COUNT__;
-}
-SYMBOLS {
-    __STACKSIZE__ = $800;	# 2K stack
-}
-
-
diff --git a/src/ld65/cfg/apple2.cfg b/src/ld65/cfg/apple2.cfg
index fef2b4e79..2461b1306 100644
--- a/src/ld65/cfg/apple2.cfg
+++ b/src/ld65/cfg/apple2.cfg
@@ -1,7 +1,10 @@
+FEATURES {
+    STARTADDRESS: default = $0800;
+}
 MEMORY {
-    ZP:     start = $0080, size = $001A, define = yes;
-    HEADER: start = $0000, size = $0004, file = %O;
-    RAM:    start = $0800, size = $8E00, file = %O;
+    ZP:     start = $0080, size = $001A,      define = yes;
+    HEADER: start = $0000, size = $0004,      file = %O;
+    RAM:    start = %S,    size = $9600 - %S, file = %O;
 }
 SEGMENTS {
     EXEHDR:   load = HEADER, type = ro;
@@ -17,20 +20,18 @@ SEGMENTS {
 }
 FEATURES {
     CONDES: segment = INIT,
-	    type = constructor,
-	    label = __CONSTRUCTOR_TABLE__,
-	    count = __CONSTRUCTOR_COUNT__;
+	    type    = constructor,
+	    label   = __CONSTRUCTOR_TABLE__,
+	    count   = __CONSTRUCTOR_COUNT__;
     CONDES: segment = RODATA,
-	    type = destructor,
-	    label = __DESTRUCTOR_TABLE__,
-	    count = __DESTRUCTOR_COUNT__;
-    CONDES: type = interruptor,
+	    type    = destructor,
+	    label   = __DESTRUCTOR_TABLE__,
+	    count   = __DESTRUCTOR_COUNT__;
+    CONDES: type    = interruptor,
 	    segment = RODATA,
-	    label = __INTERRUPTOR_TABLE__,
-	    count = __INTERRUPTOR_COUNT__;
+	    label   = __INTERRUPTOR_TABLE__,
+	    count   = __INTERRUPTOR_COUNT__;
 }
 SYMBOLS {
     __STACKSIZE__ = $800;	# 2K stack
 }
-
-
-- 
2.39.5