From 7b63fb592e8b21bc2870b65702d53c59faf4a144 Mon Sep 17 00:00:00 2001 From: ol-automation_ww Date: Fri, 20 May 2022 21:04:37 +0000 Subject: [PATCH 1/4] Update graal import. --- mx.truffleruby/suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index e55298b519e5..68ffb5fd2aca 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -7,7 +7,7 @@ { "name": "regex", "subdir": True, - "version": "3487e6705a86e77e123e813f6f31b3e24232df4b", + "version": "fe1b459b30655cab52f47da4d165d4eb034b080f", "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": "fe1b459b30655cab52f47da4d165d4eb034b080f", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"}, From aac6359cd67c6d805dc98601352e6e1bf88d56af Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 24 May 2022 21:09:52 +0200 Subject: [PATCH 2/4] Update config file with the new LLVM 14.0.3 toolchain (was 12.0.1) --- lib/cext/ABI_version.txt | 2 +- lib/cext/include/truffleruby/config_linux_aarch64.h | 2 ++ lib/cext/include/truffleruby/config_linux_amd64.h | 2 ++ tool/generate-config-header.sh | 5 ++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/cext/ABI_version.txt b/lib/cext/ABI_version.txt index b8626c4cff28..7ed6ff82de6b 100644 --- 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 index f5e9fe66105e..413cb1fccf60 100644 --- 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 index f9aeab7f0149..755343650ad8 100644 --- 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/tool/generate-config-header.sh b/tool/generate-config-header.sh index 9ec926d9b524..97479c18986e 100755 --- 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 From 90416ddef154bb423f4d5033bd580ca17b97c679 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 24 May 2022 13:32:58 +0200 Subject: [PATCH 3/4] Update graal just before host inlining --- mx.truffleruby/suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index 68ffb5fd2aca..c126dedbb4b6 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -7,7 +7,7 @@ { "name": "regex", "subdir": True, - "version": "fe1b459b30655cab52f47da4d165d4eb034b080f", + "version": "c4b6366ebe3f02d5d50f07ddbd15c424be57a9f6", "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": "fe1b459b30655cab52f47da4d165d4eb034b080f", + "version": "c4b6366ebe3f02d5d50f07ddbd15c424be57a9f6", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"}, From b9ae66f8075d7329590c73226abeb4833095db56 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 24 May 2022 13:34:12 +0200 Subject: [PATCH 4/4] Update graal just after host inlining --- mx.truffleruby/suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index c126dedbb4b6..3afaa8997461 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -7,7 +7,7 @@ { "name": "regex", "subdir": True, - "version": "c4b6366ebe3f02d5d50f07ddbd15c424be57a9f6", + "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": "c4b6366ebe3f02d5d50f07ddbd15c424be57a9f6", + "version": "abe6520dcfe30cc36c28ebf843cb3f5fcbe4e299", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},