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 5339872586638044a8ba166693dd9f00aec7e8f1..01fc76a2680c39dbef65433e70c13cbbfe444e04 100644 (file)
--- 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 0c903ef45c7c7dfd537c2fae9d21808681f846cf..68d0f524e07622f3bec178aea49228af7ecd9dee 100644 (file)
--- 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 f2cf20bc63eaa047758f5d19334e6a5e283dbb2d..aad3ce613e692e07a45bc3965845c291df6b97f1 100644 (file)
--- 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 464557fa7dda7328af99964c40415fece6a2b3db..fb434b5deb087b6e7643a7a7130445d96a648f0b 100644 (file)
--- 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 76fae2f4544e89f79e30bfa5d93a7f801632936a..a1760bd72d303372250bf80d1966fcc31275709e 100644 (file)
--- 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__