From 886dcd6d232f3161cc2a4dc43f9d0a08612bf351 Mon Sep 17 00:00:00 2001 From: Sebastian Poeplau Date: Tue, 5 Mar 2024 10:36:31 +0100 Subject: [PATCH] Fix call sites of the new helper using_llvm_compiler Issue: eng/toolchain/bb-runtimes#20 --- aarch64/__init__.py | 2 +- support/bsp_sources/target.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aarch64/__init__.py b/aarch64/__init__.py index 787bc38b..d4faf01c 100644 --- a/aarch64/__init__.py +++ b/aarch64/__init__.py @@ -117,7 +117,7 @@ def system_ads(self): # GNAT-LLVM can't build the embedded Morello runtime yet, so we exclude it for # the time being. - if using_llvm_compiler(): + if not using_llvm_compiler(): result["embedded"] = "system-xi-arm-nxstack-embedded.ads" return result diff --git a/support/bsp_sources/target.py b/support/bsp_sources/target.py index a87af9f6..582b7081 100644 --- a/support/bsp_sources/target.py +++ b/support/bsp_sources/target.py @@ -176,7 +176,7 @@ def __init__(self): "c_flags": ["-DIN_RTS", "-Dinhibit_libc", "-DLIGHT_RUNTIME"], } # GNAT-LLVM doesn't support -fcallgraph-info - if using_llvm_compiler(): + if not using_llvm_compiler(): self.build_flags["common_flags"].append("-fcallgraph-info=su,da") # Add the following compiler switches to runtime.xml for all targets: @@ -187,7 +187,7 @@ def __init__(self): # a hidden runtime dependency that is considered undesirable by many # of our customers. strlen is particularly problematic, as its not # provided in our light and light-tasking runtimes. - if using_llvm_compiler(): + if not using_llvm_compiler(): self.global_compiler_switches = ("-fno-tree-loop-distribute-patterns",) else: self.global_compiler_switches = () @@ -372,7 +372,7 @@ def dump_runtime_xml(self, rts_name, rts): blank + '"-nostartfiles", "-nolibc", ' + '"-Wl,--start-group,-lgnarl,-lgnat,-lc,-lgcc,-lgcc_eh,--end-group",' - if using_llvm_compiler() + if not using_llvm_compiler() else '"-Wl,--start-group,-lgnarl,-lgnat,-lc,-lunwind,--end-group",' )