Skip to content

Commit c5dcfbd

Browse files
committed
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/3357
2 parents e2f62b8 + b9ae66f commit c5dcfbd

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

lib/cext/ABI_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
5

lib/cext/include/truffleruby/config_linux_aarch64.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@
141141
#define NO_ADDRESS_SAFETY_ANALYSIS(x) __attribute__ ((__no_address_safety_analysis__)) x
142142
#define WARN_UNUSED_RESULT(x) __attribute__ ((__warn_unused_result__)) x
143143
#define MAYBE_UNUSED(x) __attribute__ ((__unused__)) x
144+
#define ERRORFUNC(mesg,x) __attribute__ ((__error__ mesg)) x
145+
#define WARNINGFUNC(mesg,x) __attribute__ ((__warning__ mesg)) x
144146
#define WEAK(x) __attribute__ ((__weak__)) x
145147
#define HAVE_FUNC_WEAK 1
146148
#define RUBY_CXX_DEPRECATED(msg) __attribute__((__deprecated__(msg)))

lib/cext/include/truffleruby/config_linux_amd64.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@
142142
#define NO_ADDRESS_SAFETY_ANALYSIS(x) __attribute__ ((__no_address_safety_analysis__)) x
143143
#define WARN_UNUSED_RESULT(x) __attribute__ ((__warn_unused_result__)) x
144144
#define MAYBE_UNUSED(x) __attribute__ ((__unused__)) x
145+
#define ERRORFUNC(mesg,x) __attribute__ ((__error__ mesg)) x
146+
#define WARNINGFUNC(mesg,x) __attribute__ ((__warning__ mesg)) x
145147
#define WEAK(x) __attribute__ ((__weak__)) x
146148
#define HAVE_FUNC_WEAK 1
147149
#define RUBY_CXX_DEPRECATED(msg) __attribute__((__deprecated__(msg)))

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "3487e6705a86e77e123e813f6f31b3e24232df4b",
10+
"version": "abe6520dcfe30cc36c28ebf843cb3f5fcbe4e299",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
1616
{
1717
"name": "sulong",
1818
"subdir": True,
19-
"version": "3487e6705a86e77e123e813f6f31b3e24232df4b",
19+
"version": "abe6520dcfe30cc36c28ebf843cb3f5fcbe4e299",
2020
"urls": [
2121
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2222
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

tool/generate-config-header.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ archive=$(basename "$url")
3232

3333
if [ ! -e "$archive" ]; then
3434
curl -O "$url"
35-
tar xf "ruby-$VERSION.tar.gz"
35+
fi
36+
37+
if [ ! -d "ruby-$VERSION" ]; then
38+
tar xf "$archive"
3639
fi
3740

3841
cd "ruby-$VERSION" || exit 1

0 commit comments

Comments
 (0)