Skip to content

Commit

Permalink
Merge branch 'mr/fix-using-llvm-compiler' into 'master'
Browse files Browse the repository at this point in the history
Fix call sites of the new helper using_llvm_compiler

See merge request eng/toolchain/bb-runtimes!74
  • Loading branch information
sebastianpoeplau committed Mar 5, 2024
2 parents a4c18c4 + 886dcd6 commit 92c481a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion aarch64/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions support/bsp_sources/target.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 = ()
Expand Down Expand Up @@ -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",'
)

Expand Down

0 comments on commit 92c481a

Please sign in to comment.