From 850ede9bfb11956fead6e165683337c349adf3b0 Mon Sep 17 00:00:00 2001 From: Sebastian Poeplau Date: Mon, 6 Nov 2023 12:06:07 +0100 Subject: [PATCH] Exclude embedded-morello when building with GNAT-LLVM Since GNAT-LLVM can't build the embedded runtime yet, exclude it from the package, so that we can already work with light and light-tasking. Part of eng/toolchain/gnat-llvm#64. --- aarch64/__init__.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/aarch64/__init__.py b/aarch64/__init__.py index 1279213e..bf459fa6 100644 --- a/aarch64/__init__.py +++ b/aarch64/__init__.py @@ -1,4 +1,5 @@ # BSP support for ARM64 +from support import Compiler, target_compiler from support.bsp_sources.archsupport import ArchSupport from support.bsp_sources.target import DFBBTarget @@ -100,12 +101,18 @@ def compiler_switches(self): @property def system_ads(self): - return { + result = { 'light': 'system-xi-arm.ads', 'light-tasking': 'system-xi-arm-gic-sfp.ads', - 'embedded': 'system-xi-arm-gic-full.ads' } + # GNAT-LLVM can't build the embedded Morello runtime yet, so we exclude it for + # the time being. + if target_compiler() != Compiler.gnat_llvm: + result['embedded'] = 'system-xi-arm-gic-full.ads' + + return result + class ZynqMP(Aarch64Target): @property