Skip to content

Commit 4f685af

Browse files
committed
Update config files for the new LLVM toolchain
* Since the graal import now includes a newer LLVM toolchain
1 parent 3e36206 commit 4f685af

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

lib/cext/ABI_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5
1+
6

lib/cext/include/truffleruby/config_linux_aarch64.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,10 @@
165165
#define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)
166166
#define HAVE_GCC_ATOMIC_BUILTINS 1
167167
#define HAVE_GCC_SYNC_BUILTINS 1
168+
#define UNREACHABLE __builtin_unreachable()
168169
#define RUBY_FUNC_EXPORTED __attribute__ ((__visibility__("default"))) extern
169170
#define RUBY_FUNC_NONNULL(n,x) __attribute__ ((__nonnull__(n))) x
171+
#define RUBY_FUNCTION_NAME_STRING __func__
170172
#define ENUM_OVER_INT 1
171173
#define HAVE_DECL_SYS_NERR 1
172174
#define HAVE_DECL_GETENV 1

lib/cext/include/truffleruby/config_linux_amd64.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,10 @@
168168
#define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)
169169
#define HAVE_GCC_ATOMIC_BUILTINS 1
170170
#define HAVE_GCC_SYNC_BUILTINS 1
171+
#define UNREACHABLE __builtin_unreachable()
171172
#define RUBY_FUNC_EXPORTED __attribute__ ((__visibility__("default"))) extern
172173
#define RUBY_FUNC_NONNULL(n,x) __attribute__ ((__nonnull__(n))) x
174+
#define RUBY_FUNCTION_NAME_STRING __func__
173175
#define ENUM_OVER_INT 1
174176
#define HAVE_DECL_SYS_NERR 1
175177
#define HAVE_DECL_GETENV 1
@@ -431,9 +433,8 @@
431433
#define DLEXT_MAXLEN 3
432434
#define DLEXT ".so"
433435
#define HAVE__SETJMP 1
434-
#define RUBY_SETJMP(env) _setjmp((env))
435-
#define RUBY_LONGJMP(env,val) _longjmp((env),val)
436-
#define RUBY_JMP_BUF jmp_buf
436+
#define RUBY_SETJMP(env) __builtin_setjmp((void **)(env))
437+
#define RUBY_LONGJMP(env,val) __builtin_longjmp((void **)(env),val)
437438
#define USE_MJIT 1
438439
#define HAVE_PTHREAD_H 1
439440
#define THREAD_IMPL_H "thread_pthread.h"

0 commit comments

Comments
 (0)