Merge branch 'origin/work/rename-morello-triplet' into 'master'

Rename morello-elf compiler triplet to morello-elf See merge request eng/toolchain/bb-runtimes!82
AdaCore · Mar 22, 2024 · cc84997 · cc84997
2 parents 25a4f98 + 64defc3
commit cc84997
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/aarch64/__init__.py b/aarch64/__init__.py
@@ -108,6 +108,10 @@ class MorelloTarget(Aarch64Target):
     def parent(self):
         return MorelloArch
 
+    @property
+    def target(self):
+        return "morello-elf"
+
     @property
     def compiler_switches(self):
         return ("-march=morello+c64", "-mabi=purecap")

diff --git a/support/rts_sources/profiles.py b/support/rts_sources/profiles.py
@@ -118,7 +118,7 @@ def light_scenarios(self, profile="light"):
         if self.config.target is not None:
             cpu = self.config.target.split("-")[0]
 
-            if cpu in ("aarch64",):
+            if cpu in ("aarch64", "morello"):
                 ret["CPU_Family"] = "aarch64"
                 ret["Has_FMA"] = "yes" if self.config.has_fpu else "no"
             elif cpu in ("arm",):