target_info: Use -morello-bounded-memargs when building against 24.05

CTSRD-CHERI · Aug 14, 2024 · 4c7a261 · 4c7a261
1 parent 174eeb9
commit 4c7a261
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pycheribuild/config/target_info.py b/pycheribuild/config/target_info.py
@@ -1144,8 +1144,11 @@ def cheribsd_morello_version_dependent_flags(cheribsd_version: "Optional[int]",
     if cheribsd_version is None or cheribsd_version >= 20220511:
         # Use new var-args ABI
         result.extend(["-Xclang", "-morello-vararg=new"])
-    if cheribsd_version is None or cheribsd_version >= 20230804:
+    if cheribsd_version is None or cheribsd_version >= 20240315:
         # Use new function call ABI
+        result.extend(["-Xclang", "-morello-bounded-memargs"])
+    elif cheribsd_version >= 20230804:
+        # Use transitionary function call ABI on older purecap
         result.extend(["-Xclang", "-morello-bounded-memargs=caller-only"])
     if is_purecap and cheribsd_version is not None and cheribsd_version < 20220511:
         # Use emulated TLS on older purecap