From 8a1a477e6c7e016e720019d5c9534f809b0ba045 Mon Sep 17 00:00:00 2001
From: Diego Argueta <dargueta@users.noreply.github.com>
Date: Sun, 3 Mar 2024 12:58:43 -0800
Subject: [PATCH] Architecture-specific fixes

---
 .github/workflows/ci.yml             | 12 +++++++-----
 src/metaldata/internal/annotations.h |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef83ff2..08a3423 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,12 +89,14 @@ jobs:
           - pdk13
           - pdk14
           - pdk15
-          - pic14
-          - pic16
+          # These require additional work with flags, uncomment later
+          # - pic14
+          # - pic16
           - r2k
           - r2ka
           - r3ka
-          - r800
+          # Uncomment once we upgrade to 4.3+
+          # - r800
           - s08
           - sm83
           - stm8
@@ -109,6 +111,6 @@ jobs:
         # 4.3.0+ are broken: https://sourceforge.net/p/sdcc/bugs/3715/
         run: make -C make -f compiler-support/install.mk install-sdcc SDCC_VERSION=4.2.0
       - name: Configure
-        run: ./configure --cc=sdcc
+        run: ./configure --cc=sdcc -m ${{ matrix.architecture }}
       - name: Compile
-        run: make library MY_CFLAGS=-m${{ matrix.architecture }}
+        run: make library
diff --git a/src/metaldata/internal/annotations.h b/src/metaldata/internal/annotations.h
index 2876d0f..2d00645 100644
--- a/src/metaldata/internal/annotations.h
+++ b/src/metaldata/internal/annotations.h
@@ -313,8 +313,9 @@
 #endif
 
 #if defined(__SDCC_ds390) || defined(__SDCC_ds400) || defined(__SDCC_hc08) ||            \
-    defined(__SDCC_mcs51) || defined(__SDCC_s08) || defined(__SDCC_pdk13) ||             \
-    defined(__SDCC_pdk14) || defined(__SDCC_pdk15)
+    defined(__SDCC_mcs51) || defined(__SDCC_mos6502) || defined(__SDCC_mos65c02) ||      \
+    defined(__SDCC_pdk13) || defined(__SDCC_pdk14) || defined(__SDCC_pdk15) ||           \
+    defined(__SDCC_s08)
 #    define MDL_REENTRANT_MARKER __reentrant
 #else
 #    define MDL_REENTRANT_MARKER