[GR-18411] Update to latest graal to get Sulong fixes for Xcode 15 an…

…d the new exceptionCheck() function in NFI PullRequest: truffleruby/4047
oracle · Nov 2, 2023 · 5dbdd31 · 5dbdd31
2 parents 1c34b1e + 5b7622b
commit 5dbdd31
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Bug fixes:
 
 Compatibility:
 
+* Fix problems with the LLVM toolchain wrappers with Xcode 15 on macOS.
 * Add `Exception#detailed_message` method (#3257, @andrykonchin).
 * Fix `rb_enc_vsprintf` and force String encoding instead of converting it (@andrykonchin).
 * Add `rb_gc_mark_movable` function (@andrykonchin).

diff --git a/lib/cext/ABI_version.txt b/lib/cext/ABI_version.txt
@@ -1 +1 @@
-3
+4
diff --git a/lib/truffle/rbconfig.rb b/lib/truffle/rbconfig.rb
@@ -85,7 +85,7 @@ module RbConfig
   defs = "-DTRUFFLERUBY_ABI_VERSION=#{ruby_abi_version}"
   cppflags = ''
   ldflags = ''
-  dldflags = Truffle::Platform.darwin? ? '-Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress' : ''
+  dldflags = Truffle::Platform.darwin? ? '-Wl,-undefined,dynamic_lookup' : ''
 
   cext_dir = "#{prefix}/lib/cext"
   soext = Truffle::Platform::SOEXT

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "fd835286ab2f56989324305e45056281800b3054",
+                "version": "6a6e17d8c52f964ca499823e461411579cbb2b20",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "fd835286ab2f56989324305e45056281800b3054",
+                "version": "6a6e17d8c52f964ca499823e461411579cbb2b20",
                 "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/spec/tags/truffle/posix_tags.txt b/spec/tags/truffle/posix_tags.txt
@@ -0,0 +1,2 @@
+slow:Truffle::POSIX returns the correct value for an identity function returning the maximum unsigned short
+slow:Truffle::POSIX returns the correct value for an identity function returning the maximum unsigned int
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		slow:Truffle::POSIX returns the correct value for an identity function returning the maximum unsigned short
		slow:Truffle::POSIX returns the correct value for an identity function returning the maximum unsigned int