Skip to content

Commit 40d2b80

Browse files
committed
Use the same devtoolset as GraalVM dev builds and releases
* Fixes the missing definition of NO_SANITIZE on linux-aarch64 with GCC 7.3.1. With the devtoolset it's GCC 10.2.1 on linux-aarch64.
1 parent b82e4b6 commit 40d2b80

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

ci.jsonnet

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,18 @@ local part_definitions = {
232232
},
233233

234234
platform: {
235-
local common_deps = common.deps.truffleruby + common.deps.sulong,
236-
local linux_amd64_extra_deps = {
237-
packages+: {
238-
binutils: ">=2.30",
239-
},
240-
},
241-
242-
linux: common.linux_amd64 + common_deps + linux_amd64_extra_deps + {
235+
local devtoolset = { # Until there is a proper object in common.jsonnet for it
236+
packages+: if self.os == "linux" then
237+
(if self.arch == "aarch64" then {
238+
"00:devtoolset": "==10",
239+
} else {
240+
"00:devtoolset": "==11",
241+
})
242+
else {},
243+
},
244+
local common_deps = common.deps.truffleruby + common.deps.sulong + devtoolset,
245+
246+
linux: common.linux_amd64 + common_deps + {
243247
platform_name:: "LinuxAMD64",
244248
"$.cap":: {
245249
normal_machine: [],

lib/cext/include/truffleruby/config_linux_aarch64.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
#define DEPRECATED_BY(n,x) __attribute__ ((__deprecated__("by "#n))) x
157157
#define NOINLINE(x) __attribute__ ((__noinline__)) x
158158
#define ALWAYS_INLINE(x) __attribute__ ((__always_inline__)) x
159+
#define NO_SANITIZE(san, x) __attribute__ ((__no_sanitize__(san))) x
159160
#define NO_SANITIZE_ADDRESS(x) __attribute__ ((__no_sanitize_address__)) x
160161
#define NO_ADDRESS_SAFETY_ANALYSIS(x) __attribute__ ((__no_address_safety_analysis__)) x
161162
#define WARN_UNUSED_RESULT(x) __attribute__ ((__warn_unused_result__)) x

0 commit comments

Comments
 (0)