[GR-26395] Periodic update of the graal import.

PullRequest: truffleruby/3357
oracle · May 24, 2022 · c5dcfbd · c5dcfbd
2 parents e2f62b8 + b9ae66f
commit c5dcfbd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/lib/cext/ABI_version.txt b/lib/cext/ABI_version.txt
@@ -1 +1 @@
-4
+5
diff --git a/lib/cext/include/truffleruby/config_linux_aarch64.h b/lib/cext/include/truffleruby/config_linux_aarch64.h
@@ -141,6 +141,8 @@
 #define NO_ADDRESS_SAFETY_ANALYSIS(x) __attribute__ ((__no_address_safety_analysis__)) x
 #define WARN_UNUSED_RESULT(x) __attribute__ ((__warn_unused_result__)) x
 #define MAYBE_UNUSED(x) __attribute__ ((__unused__)) x
+#define ERRORFUNC(mesg,x) __attribute__ ((__error__ mesg)) x
+#define WARNINGFUNC(mesg,x) __attribute__ ((__warning__ mesg)) x
 #define WEAK(x) __attribute__ ((__weak__)) x
 #define HAVE_FUNC_WEAK 1
 #define RUBY_CXX_DEPRECATED(msg) __attribute__((__deprecated__(msg)))

diff --git a/lib/cext/include/truffleruby/config_linux_amd64.h b/lib/cext/include/truffleruby/config_linux_amd64.h
@@ -142,6 +142,8 @@
 #define NO_ADDRESS_SAFETY_ANALYSIS(x) __attribute__ ((__no_address_safety_analysis__)) x
 #define WARN_UNUSED_RESULT(x) __attribute__ ((__warn_unused_result__)) x
 #define MAYBE_UNUSED(x) __attribute__ ((__unused__)) x
+#define ERRORFUNC(mesg,x) __attribute__ ((__error__ mesg)) x
+#define WARNINGFUNC(mesg,x) __attribute__ ((__warning__ mesg)) x
 #define WEAK(x) __attribute__ ((__weak__)) x
 #define HAVE_FUNC_WEAK 1
 #define RUBY_CXX_DEPRECATED(msg) __attribute__((__deprecated__(msg)))

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "3487e6705a86e77e123e813f6f31b3e24232df4b",
+                "version": "abe6520dcfe30cc36c28ebf843cb3f5fcbe4e299",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "3487e6705a86e77e123e813f6f31b3e24232df4b",
+                "version": "abe6520dcfe30cc36c28ebf843cb3f5fcbe4e299",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

diff --git a/tool/generate-config-header.sh b/tool/generate-config-header.sh
@@ -32,7 +32,10 @@ archive=$(basename "$url")
 
 if [ ! -e "$archive" ]; then
     curl -O "$url"
-    tar xf "ruby-$VERSION.tar.gz"
+fi
+
+if [ ! -d "ruby-$VERSION" ]; then
+    tar xf "$archive"
 fi
 
 cd "ruby-$VERSION" || exit 1