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

eregon · eregon · commit 6e3847005693 · 2022-08-09T17:02:47.000Z
PullRequest: truffleruby/3452
diff --git a/common.json b/common.json
@@ -28,8 +28,10 @@
 
   "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
   "devkits": {
-      "windows-jdk11":      { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
-      "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }}
+    "windows-jdk11":      { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
+    "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }},
+    "linux-jdk11":      { "packages" : { "devkit:gcc7.3.0-OEL6.4+1"  : "==1" }},
+    "linux-jdk17":      { "packages" : { "devkit:gcc10.3.0-OL6.4+1"  : "==0" }}
   },
 
   "catch_files" : [
@@ -120,7 +122,6 @@
       },
       "windows": {
         "packages": {
-          "msvc": "==10.0",
           "pip:cmake": "==3.18.4"
         }
       }
diff --git a/mx.truffleruby/jvm b/mx.truffleruby/jvm
@@ -1,2 +1,3 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools
 COMPONENTS=TruffleRuby,suite:tools
diff --git a/mx.truffleruby/jvm-ce b/mx.truffleruby/jvm-ce
@@ -1,2 +1,3 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler
diff --git a/mx.truffleruby/jvm-ce-libgraal b/mx.truffleruby/jvm-ce-libgraal
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
 NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
diff --git a/mx.truffleruby/jvm-ce-ntl b/mx.truffleruby/jvm-ce-ntl
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
 NATIVE_IMAGES=suite:sulong
diff --git a/mx.truffleruby/jvm-ee b/mx.truffleruby/jvm-ee
@@ -1,2 +1,3 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler
diff --git a/mx.truffleruby/jvm-ee-libgraal b/mx.truffleruby/jvm-ee-libgraal
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,LibGraal
 NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
diff --git a/mx.truffleruby/jvm-ee-ntl b/mx.truffleruby/jvm-ee-ntl
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise
 NATIVE_IMAGES=suite:sulong
diff --git a/mx.truffleruby/jvm-gu b/mx.truffleruby/jvm-gu
@@ -1,2 +1,3 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/vm
 COMPONENTS=TruffleRuby,suite:tools,gu
diff --git a/mx.truffleruby/jvm-js b/mx.truffleruby/jvm-js
@@ -1,2 +1,3 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-js
 COMPONENTS=TruffleRuby,suite:tools,Graal.js
diff --git a/mx.truffleruby/jvm-py b/mx.truffleruby/jvm-py
@@ -1,2 +1,3 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,graalpython
 COMPONENTS=TruffleRuby,suite:tools,Graal.Python
diff --git a/mx.truffleruby/native b/mx.truffleruby/native
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
 NATIVE_IMAGES=suite:sulong,lib:rubyvm
diff --git a/mx.truffleruby/native-ee b/mx.truffleruby/native-ee
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise
 NATIVE_IMAGES=suite:sulong,lib:rubyvm
diff --git a/mx.truffleruby/native-ee-g1 b/mx.truffleruby/native-ee-g1
@@ -1,3 +1,4 @@
+GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,SubstrateVM Enterprise GC
 NATIVE_IMAGES=suite:sulong,lib:rubyvm
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "65ff80682c17f2a4e7c299b01e6e03c101aee1a8",
+                "version": "3c60bcc908a460eaaa0324156acdedd25f325288",
                 "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": "65ff80682c17f2a4e7c299b01e6e03c101aee1a8",
+                "version": "3c60bcc908a460eaaa0324156acdedd25f325288",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+GRAALVM_SKIP_ARCHIVE=true`
`1`	`2`	`DYNAMIC_IMPORTS=/tools`
`2`	`3`	`COMPONENTS=TruffleRuby,suite:tools`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+GRAALVM_SKIP_ARCHIVE=true`
`1`	`2`	`DYNAMIC_IMPORTS=/tools,/compiler`
`2`	`3`	`COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+GRAALVM_SKIP_ARCHIVE=true`
`1`	`2`	`DYNAMIC_IMPORTS=/tools,/graal-enterprise`
`2`	`3`	`COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+GRAALVM_SKIP_ARCHIVE=true`
`1`	`2`	`DYNAMIC_IMPORTS=/tools,/vm`
`2`	`3`	`COMPONENTS=TruffleRuby,suite:tools,gu`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+GRAALVM_SKIP_ARCHIVE=true`
`1`	`2`	`DYNAMIC_IMPORTS=/tools,/graal-js`
`2`	`3`	`COMPONENTS=TruffleRuby,suite:tools,Graal.js`