Skip to content

Commit

Permalink
Merge branch 'topic/kliemann/bb-runtimes-77-native-linux' into 'master'
Browse files Browse the repository at this point in the history
Add Linux source profile

See merge request eng/toolchain/bb-runtimes!123
  • Loading branch information
jklmnn committed Aug 23, 2024
2 parents eb596e0 + cdfb1ff commit 35f4f72
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gen_rts_sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def main():
)
parser.add_argument(
"--source-profile",
choices=["bb", "deos", "freertos", "pikeos", "vx7r2cert", "qnx"],
choices=["bb", "deos", "freertos", "linux", "pikeos", "vx7r2cert", "qnx"],
default="bb",
help="platform specific source selections",
)
Expand Down
2 changes: 1 addition & 1 deletion native/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class Native(DFBBTarget):
def __init__(self):
super().__init__()
self.add_gnat_sources("src/s-macres__native.adb", "src/s-textio__stdio.adb")
self.add_gnat_sources("src/s-macres__native.adb")

@property
def target(self):
Expand Down
34 changes: 31 additions & 3 deletions support/rts_sources/sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,16 @@
"hie/g-io__zfp.adb",
"hie/g-io-put.adb",
],
"linux_srcs": [
"hie/a-textio.ads",
"hie/a-textio__libc.adb",
"hie/g-io__zfp.ads",
"hie/g-io__zfp.adb",
"hie/g-io-put.adb",
"hie/s-macres.ads",
"hie/s-textio__libc.ads",
"hie/s-textio__libc.adb",
],
"pikeos_srcs": [
"hie/a-textio.ads",
"exit.c",
Expand Down Expand Up @@ -312,10 +322,10 @@
"hie/g-io__zfp.adb",
"hie/g-io-put.adb",
"hie/a-textio.ads",
"hie/a-textio__qnx.adb",
"hie/a-textio__libc.adb",
"hie/s-macres.ads",
"hie/s-textio__qnx.ads",
"hie/s-textio__qnx.adb",
"hie/s-textio__libc.ads",
"hie/s-textio__libc.adb",
],
},
"common/32": {
Expand Down Expand Up @@ -352,6 +362,7 @@
],
"bb_srcs": ["hie/a-elchha__zfp.adb"],
"freertos_srcs": ["hie/a-elchha__zfp.adb"],
"linux_srcs": ["hie/a-elchha__zfp.adb"],
"pikeos_srcs": ["hie/a-elchha__zfp.adb"],
"qnx_srcs": [
"hie/a-elchha__traceback.adb",
Expand Down Expand Up @@ -381,6 +392,7 @@
"bb_srcs": ["hie/s-sssita.ads", "hie/s-sssita.adb"],
"deos_srcs": ["hie/s-thread__cert.ads", "hie/s-thread__cert.adb"],
"freertos_srcs": ["hie/s-sssita.ads", "hie/s-sssita.adb"],
"linux_srcs": ["hie/s-sssita.ads", "hie/s-sssita.adb"],
"pikeos_srcs": [
"hie/a-textio__pikeos-light.adb",
"hie/s-sssita.ads",
Expand Down Expand Up @@ -1357,6 +1369,19 @@
"hie/s-libm__ada.adb",
"hie/s-libpre__ada.ads",
],
"linux_srcs": [
"hie/a-ngelfu__cert.ads",
"hie/a-ngelfu__cert.adb",
"hie/a-nlelfu__cert.ads",
"hie/a-nuelfu__cert.ads",
"hie/s-gcmain__cert.ads",
"hie/s-gcmain__cert.adb",
"hie/a-nllefu__cert.ads",
"hie/a-nuaufl__light.ads",
"hie/a-nalofl__light.ads",
"hie/a-nallfl__light.ads",
"libgnat/a-naliop.ads",
],
"pikeos_srcs": [
"hie/a-ngelfu__ada.ads",
"hie/a-ngelfu__ada.adb",
Expand Down Expand Up @@ -2224,16 +2249,19 @@
"conditions": ["RTS_Profile:light", "Memory_Profile:small"],
"bb_srcs": ["hie/s-parame__zfp_small.ads"],
"freertos_srcs": ["hie/s-parame__zfp_small.ads"],
"linux_srcs": ["hie/s-parame__zfp_small.ads"],
},
"gnat/parameters/light-large": {
"conditions": ["RTS_Profile:light", "Memory_Profile:large"],
"bb_srcs": ["hie/s-parame__zfp.ads"],
"freertos_srcs": ["hie/s-parame__zfp.ads"],
"linux_srcs": ["hie/s-parame__zfp.ads"],
},
"gnat/parameters/light-huge": {
"conditions": ["RTS_Profile:light", "Memory_Profile:huge"],
"bb_srcs": ["hie/s-parame__zfp_huge.ads"],
"freertos_srcs": ["hie/s-parame__zfp_huge.ads"],
"linux_srcs": ["hie/s-parame__zfp_huge.ads"],
},
# Cert
"cert": {
Expand Down

0 comments on commit 35f4f72

Please sign in to comment.