From: Christian Groessler <chris@groessler.org>
Date: Fri, 18 Oct 2013 20:07:05 +0000 (+0200)
Subject: Force inclusion of 'shadow RAM preparation' load chunk in crt0.s and
X-Git-Tag: V2.15~213^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=478a7679a26efbbbb65666f992971b65e2f43a91;p=cc65

Force inclusion of 'shadow RAM preparation' load chunk in crt0.s and
not in the linker config file.
---

diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg
index 533987258..01fc76a26 100644
--- a/cfg/atarixl-largehimem.cfg
+++ b/cfg/atarixl-largehimem.cfg
@@ -13,7 +13,6 @@ SYMBOLS {
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;
-    sramprep:            type = import;  # force inclusion of SRPREP
 }
 
 MEMORY {
diff --git a/cfg/atarixl-overlay.cfg b/cfg/atarixl-overlay.cfg
index 0c903ef45..68d0f524e 100644
--- a/cfg/atarixl-overlay.cfg
+++ b/cfg/atarixl-overlay.cfg
@@ -9,7 +9,6 @@ SYMBOLS {
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __OVERLAYSIZE__:     type = weak, value = $1000; # 4k overlay
     __STARTADDRESS__:    type = export, value = %S;
-    sramprep:            type = import;  # force inclusion of SRPREP
 }
 
 MEMORY {
diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index f2cf20bc6..aad3ce613 100644
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -8,7 +8,6 @@ SYMBOLS {
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;
-    sramprep:            type = import;  # force inclusion of SRPREP
 }
 
 MEMORY {
diff --git a/libsrc/atari/crt0.s b/libsrc/atari/crt0.s
index 464557fa7..fb434b5de 100644
--- a/libsrc/atari/crt0.s
+++ b/libsrc/atari/crt0.s
@@ -20,6 +20,7 @@
         .import         sram_init
         .import         scrdev
         .import         findfreeiocb
+        .forceimport    sramprep                        ; force inclusion of the "shadow RAM preparation" load chunk
         .include        "save_area.inc"
 .endif
 
diff --git a/libsrc/atari/shadow_ram_prepare.s b/libsrc/atari/shadow_ram_prepare.s
index 76fae2f45..a1760bd72 100644
--- a/libsrc/atari/shadow_ram_prepare.s
+++ b/libsrc/atari/shadow_ram_prepare.s
@@ -14,6 +14,7 @@
 .ifdef __ATARIXL__
 
         .export         sramprep
+
         .import         __SRPREP_LOAD__, __SRPREPCHNK_LAST__
         .import         __SHADOW_RAM_LOAD__, __SHADOW_RAM_SIZE__, __SHADOW_RAM_RUN__
         .import         __SHADOW_RAM2_LOAD__, __SHADOW_RAM2_SIZE__, __SHADOW_RAM2_RUN__