Put EXE header and main chunk load header into a single file --

it makes no sense to be able to include/exclude them separately.

diff --git a/cfg/atari-asm.cfg b/cfg/atari-asm.cfg
index 2035213522a4b0a8486b9f3a0f392b654e2b493e..4e87a8884e8e3f7b4c7a3c979d854dedb8e3a923 100644 (file)
--- a/cfg/atari-asm.cfg
+++ b/cfg/atari-asm.cfg
@@ -3,7 +3,6 @@ FEATURES {
 }
 SYMBOLS {
     __EXEHDR__:          type = import;
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STARTADDRESS__:    type = export, value = %S;
 }

diff --git a/cfg/atari-overlay.cfg b/cfg/atari-overlay.cfg
index d5a73531b3a1fd90266e117e2c0b9fad7e5d55a3..1d339b2081dc7f1b32652d898abf0c75b752de1c 100644 (file)
--- a/cfg/atari-overlay.cfg
+++ b/cfg/atari-overlay.cfg
@@ -4,7 +4,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __OVERLAYSIZE__:     type = weak, value = $1000; # 4k overlay

diff --git a/cfg/atari.cfg b/cfg/atari.cfg
index ef57c3e52b5c73abc153070901f07bc1f2197d35..dce593f0532d09ae5a59a78a037107ea1b52130e 100644 (file)
--- a/cfg/atari.cfg
+++ b/cfg/atari.cfg
@@ -4,7 +4,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;

diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg
index 17874b60029c8f2cc6c13a40d8105a46ac4dfb67..5339872586638044a8ba166693dd9f00aec7e8f1 100644 (file)
--- a/cfg/atarixl-largehimem.cfg
+++ b/cfg/atarixl-largehimem.cfg
@@ -10,7 +10,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;

diff --git a/cfg/atarixl-overlay.cfg b/cfg/atarixl-overlay.cfg
index 2f5595c0b20ac5c8a0c1a898eefa3fb5b6972cb0..0c903ef45c7c7dfd537c2fae9d21808681f846cf 100644 (file)
--- a/cfg/atarixl-overlay.cfg
+++ b/cfg/atarixl-overlay.cfg
@@ -5,7 +5,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __OVERLAYSIZE__:     type = weak, value = $1000; # 4k overlay

diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index f217c308f8081c4f058bf5f907d5bf898a6df249..f2cf20bc63eaa047758f5d19334e6a5e283dbb2d 100644 (file)
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -5,7 +5,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;

diff --git a/libsrc/atari/exehdr.s b/libsrc/atari/exehdr.s
index f2f77501d9b75d62a3a108c2e5808aa3c1295ae8..ea9fa95d7cc775b22f45577ca788a233a5c136d3 100644 (file)
--- a/libsrc/atari/exehdr.s
+++ b/libsrc/atari/exehdr.s
@@ -1,8 +1,11 @@
-; This file defines the EXE header for Atari executables
+; This file defines the EXE header and main chunk load header for Atari executables
 
         .export         __EXEHDR__: absolute = 1
+        .import         __RAM_START__, __BSS_LOAD__
 
 .segment        "EXEHDR"
-
         .word   $FFFF
 
+.segment        "MAINHDR"
+        .word   __RAM_START__
+        .word   __BSS_LOAD__ - 1

diff --git a/libsrc/atari/mainhdr.s b/libsrc/atari/mainhdr.s
deleted file mode 100644 (file)
index 31b339b..0000000
--- a/libsrc/atari/mainhdr.s
+++ /dev/null
@@ -1,9 +0,0 @@
-; This file defines the chunk header for the main program load chunk
-
-        .export         __MAINCHNKHDR__: absolute = 1
-        .import         __RAM_START__, __BSS_LOAD__
-
-.segment        "MAINHDR"
-
-        .word   __RAM_START__
-        .word   __BSS_LOAD__ - 1