Merge branch 'topic/dmking/21-use-cheri-system-tasking' into 'master'

Use different version of System.Tasking on CHERI targets See merge request eng/toolchain/bb-runtimes!137
AdaCore · Nov 14, 2024 · 4f467ed · 4f467ed
2 parents 1b11f2a + 6d92281
commit 4f467ed
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/support/rts_sources/sources.py b/support/rts_sources/sources.py
@@ -2012,7 +2012,6 @@
             "hie/s-tasdeb__raven.adb",
             "libgnarl/s-tasinf.ads",
             "libgnarl/s-tasinf.adb",
-            "hie/s-taskin.adb",
             "libgnarl/s-tasres.ads",
             "libgnarl/s-tpobmu.ads",
         ],
@@ -2252,6 +2251,19 @@
             "hie/s-tpobop__bb.adb",
         ],
     },
+    # CHERI-specific GNARL sources
+    "gnarl/common-no-cheri": {
+        "conditions": ["Has_CHERI:no"],
+        "srcs": [
+            "hie/s-taskin.adb",
+        ],
+    },
+    "gnarl/common-cheri": {
+        "conditions": ["Has_CHERI:yes"],
+        "srcs": [
+            "hie/s-taskin__cheri.adb",
+        ],
+    },
     # Timing support
     "gnarl/timer32": {
         "conditions": ["Timer:timer32"],