File tree Expand file tree Collapse file tree 2 files changed +13
-8
lines changed
lib/cext/include/truffleruby Expand file tree Collapse file tree 2 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -232,14 +232,18 @@ local part_definitions = {
232
232
},
233
233
234
234
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 + {
243
247
platform_name:: "LinuxAMD64" ,
244
248
"$.cap" :: {
245
249
normal_machine: [],
Original file line number Diff line number Diff line change 156
156
#define DEPRECATED_BY (n ,x ) __attribute__ ((__deprecated__("by "#n))) x
157
157
#define NOINLINE (x ) __attribute__ ((__noinline__)) x
158
158
#define ALWAYS_INLINE (x ) __attribute__ ((__always_inline__)) x
159
+ #define NO_SANITIZE (san , x ) __attribute__ ((__no_sanitize__(san))) x
159
160
#define NO_SANITIZE_ADDRESS (x ) __attribute__ ((__no_sanitize_address__)) x
160
161
#define NO_ADDRESS_SAFETY_ANALYSIS (x ) __attribute__ ((__no_address_safety_analysis__)) x
161
162
#define WARN_UNUSED_RESULT (x ) __attribute__ ((__warn_unused_result__)) x
You can’t perform that action at this time.
0 commit comments