Skip to content

Commit

Permalink
Merge branch 'wip/s-macres' into 'master'
Browse files Browse the repository at this point in the history
s-macres: fix remaining s-macres__native mentions

See merge request eng/toolchain/bb-runtimes!145
  • Loading branch information
Helflym committed Nov 29, 2024
2 parents cecd163 + 8821b53 commit 31dcea3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion freertos/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class ArmFreeRTOS(Target):
def __init__(self):
super().__init__()
self.add_gnat_sources("src/s-macres__native.adb")
self.add_gnat_sources("src/s-macres__libc.adb")
self.add_linker_switch("-Wl,-r", loader=None)
self.add_linker_switch("-nostdlib", loader=None)

Expand Down
2 changes: 1 addition & 1 deletion pikeos/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def has_libc(self, profile):
def __init__(self):
super(PikeOS, self).__init__()
self.add_linker_script("pikeos/memory.ld")
self.add_gnat_sources("src/s-textio__pikeos.adb", "src/s-macres__native.adb")
self.add_gnat_sources("src/s-textio__pikeos.adb", "src/s-macres__libc.adb")
self.add_gnarl_source("src/a-intnam__dummy.ads")

def dump_runtime_xml(self, rts_name, rts):
Expand Down
2 changes: 1 addition & 1 deletion visium/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def has_small_memory(self):

def __init__(self):
super(Visium, self).__init__()
self.add_gnat_sources("src/s-macres__native.adb", "src/s-textio__stdio.adb")
self.add_gnat_sources("src/s-macres__libc.adb", "src/s-textio__stdio.adb")

def dump_runtime_xml(self, rts_name, rts):
return readfile("visium/mcm/runtime.xml")
Expand Down

0 comments on commit 31dcea3

Please sign in to comment.