Skip to content

Commit

Permalink
Merge branch 'topic/kliemann/gnat-1150' into 'master'
Browse files Browse the repository at this point in the history
Use correct version of s-parame.adb for light-tasking on Linux

See merge request eng/toolchain/bb-runtimes!134
  • Loading branch information
jklmnn committed Oct 24, 2024
2 parents 0c21c19 + 14c2538 commit 1015a22
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions support/rts_sources/sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@
],
"linux_srcs": [
"libgnat/s-parame.ads",
"libgnat/s-parame__qnx.adb",
"hie/s-init__light.ads",
],
"qnx_srcs": [
Expand Down Expand Up @@ -2134,7 +2133,10 @@
},
"gnarl/aarch64": {
"conditions": ["CPU_Family:aarch64"],
"linux_srcs": ["hie/s-oscons__linux-aarch64.ads"],
"linux_srcs": [
"hie/s-oscons__linux-aarch64.ads",
"libgnat/s-parame__aarch64-linux.adb",
],
"vx7r2cert_srcs": ["libgnarl/s-vxwork__aarch64.ads"],
},
"gnarl/arm": {
Expand All @@ -2147,12 +2149,18 @@
},
"gnarl/x86": {
"conditions": ["CPU_Family:x86"],
"linux_srcs": ["hie/s-oscons__linux-x86.ads"],
"linux_srcs": [
"hie/s-oscons__linux-x86.ads",
"libgnat/s-parame.adb",
],
"vx7r2cert_srcs": ["libgnarl/s-vxwork__x86.ads"],
},
"gnarl/x86_64": {
"conditions": ["CPU_Family:x86_64"],
"linux_srcs": ["hie/s-oscons__linux-x86_64.ads"],
"linux_srcs": [
"hie/s-oscons__linux-x86_64.ads",
"libgnat/s-parame.adb",
],
"vx7r2cert_srcs": ["libgnarl/s-vxwork__x86.ads"],
},
"gnarl/pikeos3": {
Expand Down

0 comments on commit 1015a22

Please sign in to comment.