[GR-31147] Update Sulong to get the fix for macOS 11.3

* See oracle/graal#3383
oracle · May 28, 2021 · 385d892 · 385d892
1 parent c513943
commit 385d892
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ Compatibility:
 * Allow `Fiber#raise` after `Fiber#transfer` like Ruby 3.0 (#2342).
 * Fix `ObjectSpace._id2ref` for Symbols and frozen String literals (#2358).
 * Implemented `Enumerator::Lazy#filter_map` (#2356).
+* Fix LLVM toolchain issue on macOS 10.13 (#2352, [oracle/graal#3383](https://github.com/oracle/graal/issues/3383)).
 
 Performance:
 

diff --git a/common.json b/common.json
@@ -2,20 +2,20 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
   "jdks": {
-    "openjdk8":           {"name": "openjdk",   "version": "8u292+09-jvmci-21.2-b01", "platformspecific": true },
-    "oraclejdk8":         {"name": "oraclejdk", "version": "8u301+03-jvmci-21.2-b01", "platformspecific": true },
-    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u301+03-jvmci-21.2-b01-fastdebug", "platformspecific": true },
+    "openjdk8":           {"name": "openjdk",   "version": "8u302+02-jvmci-21.2-b02", "platformspecific": true },
+    "oraclejdk8":         {"name": "oraclejdk", "version": "8u301+05-jvmci-21.2-b02", "platformspecific": true },
+    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u301+05-jvmci-21.2-b02-fastdebug", "platformspecific": true },
 
-    "openjdk11":          {"name": "openjdk",   "version": "11.0.3+7", "platformspecific": true },
-    "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.11+8-jvmci-21.2-b01", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.11+9-jvmci-21.2-b01", "platformspecific": true },
+    "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
+    "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.11+8-jvmci-21.2-b02", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.11+9-jvmci-21.2-b02", "platformspecific": true },
 
     "oraclejdk16":        {"name": "oraclejdk", "version": "16.0.1+4", "platformspecific": true },
-    "labsjdk-ce-16":      {"name": "labsjdk",   "version": "ce-16.0.1+9-jvmci-21.2-b01", "platformspecific": true },
-    "labsjdk-ce-16Debug": {"name": "labsjdk",   "version": "ce-16.0.1+9-jvmci-21.2-b01-debug", "platformspecific": true },
-    "labsjdk-ee-16":      {"name": "labsjdk",   "version": "ee-16.0.1+9-jvmci-21.2-b01", "platformspecific": true },
-    "labsjdk-ee-16Debug": {"name": "labsjdk",   "version": "ee-16.0.1+9-jvmci-21.2-b01-debug", "platformspecific": true }
+    "labsjdk-ce-16":      {"name": "labsjdk",   "version": "ce-16.0.2+4-jvmci-21.2-b02", "platformspecific": true },
+    "labsjdk-ce-16Debug": {"name": "labsjdk",   "version": "ce-16.0.2+4-jvmci-21.2-b02-debug", "platformspecific": true },
+    "labsjdk-ee-16":      {"name": "labsjdk",   "version": "ee-16.0.2+4-jvmci-21.2-b02", "platformspecific": true },
+    "labsjdk-ee-16Debug": {"name": "labsjdk",   "version": "ee-16.0.2+4-jvmci-21.2-b02-debug", "platformspecific": true }
   },
 
   "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "3ec3ea3d848b32c809c2c57d5cdf9d082e81b7a8",
+                "version": "61e2cf5c7d2f3fd6e15c1697fe518d48f9f7c666",
                 "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": "3ec3ea3d848b32c809c2c57d5cdf9d082e81b7a8",
+                "version": "61e2cf5c7d2f3fd6e15c1697fe518d48f9f7c666",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},