Merge ae4a95ecf6 into 84153e809e

Merge pull request #2438 from ops/exehdr
Add missing EXEHDR
2024-06-02 04:41:35 +00:00 · 2024-05-15 15:27:30 +02:00 · 2024-05-15 14:11:08 +02:00 · 2024-04-02 19:25:15 +03:00 · 2024-02-28 13:21:33 +02:00
4 changed files with 5 additions and 2 deletions
--- a/cfg/vic20-asm-32k.cfg
+++ b/cfg/vic20-asm-32k.cfg
@ -14,6 +14,7 @@ MEMORY {
 SEGMENTS {
    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
    CODE:     load = MAIN,     type = ro;
    RODATA:   load = MAIN,     type = ro;
    DATA:     load = MAIN,     type = rw;
--- a/cfg/vic20-asm-3k.cfg
+++ b/cfg/vic20-asm-3k.cfg
@ -14,6 +14,7 @@ MEMORY {
 SEGMENTS {
    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
    CODE:     load = MAIN,     type = ro;
    RODATA:   load = MAIN,     type = ro;
    DATA:     load = MAIN,     type = rw;
--- a/cfg/vic20-asm.cfg
+++ b/cfg/vic20-asm.cfg
@ -14,6 +14,7 @@ MEMORY {
 SEGMENTS {
    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
    CODE:     load = MAIN,     type = ro;
    RODATA:   load = MAIN,     type = ro;
    DATA:     load = MAIN,     type = rw;
--- a/test/Makefile
+++ b/test/Makefile
@ -14,9 +14,9 @@ WORKDIR = ../testwrk

 .PHONY: test continue mostlyclean clean

-test: mostlyclean continue
+test: continue

-continue:
+continue: mostlyclean
 	@$(MAKE) -C asm all
 	@$(MAKE) -C dasm all
 	@$(MAKE) -C val all
Author	SHA1	Message	Date
clbr	5b74e135d3	Merge `ae4a95ecf6` into `84153e809e`	2024-05-15 15:27:30 +02:00
Bob Andrews	84153e809e	Merge pull request #2438 from ops/exehdr Add missing EXEHDR	2024-05-15 14:11:08 +02:00
Olli Savia	074ec82126	Added missing EXEHDR	2024-04-02 19:25:15 +03:00
Lauri Kasanen	ae4a95ecf6	Fix some Makefile races	2024-02-28 13:21:33 +02:00