Generate the native configs using the system compiler

Author: eregon

ci.jsonnet

@@ -383,18 +383,11 @@ local part_definitions = {
     generate_native_config: {
       setup+: [
         ["ruby", "-e", "pp RbConfig::MAKEFILE_CONFIG"], # For convenience
-        ["mx", "sforceimports"], # clone the graal repo
-        ["mx", "-p", "../graal/sulong", "build"],
-        ["set-export", "TOOLCHAIN_PATH", ["mx", "-p", "../graal/sulong", "lli", "--print-toolchain-path"]],
       ],
       run+: [
-        ["env",
-          "LD_LIBRARY_PATH=$BUILD_DIR/graal/sulong/mxbuild/" + self.os + "-" + self.arch + "/SULONG_HOME/native/lib:$LD_LIBRARY_PATH", # for finding libc++
-          "PATH=$TOOLCHAIN_PATH:$PATH",
-          "ruby", "tool/generate-native-config.rb"],
+        ["ruby", "tool/generate-native-config.rb"],
         ["cat", "src/main/java/org/truffleruby/platform/" + self.platform_name + "NativeConfiguration.java"],
 
-        # Uses the system compiler as using the toolchain for this does not work on macOS
         ["tool/generate-config-header.sh"],
         ["cat", "lib/cext/include/truffleruby/config_" + self.os + "_" + self.arch + ".h"],
       ],

lib/cext/include/truffleruby/config_linux_aarch64.h

@@ -51,6 +51,7 @@
 #define HAVE_LOCALE_H 1
 #define HAVE_MALLOC_H 1
 #define HAVE_PWD_H 1
+#define HAVE_SANITIZER_ASAN_INTERFACE_H 1
 #define HAVE_STDALIGN_H 1
 #define HAVE_STDIO_H 1
 #define HAVE_SYS_EVENTFD_H 1
@@ -155,7 +156,6 @@
 #define DEPRECATED_BY(n,x) __attribute__ ((__deprecated__("by "#n))) x
 #define NOINLINE(x) __attribute__ ((__noinline__)) x
 #define ALWAYS_INLINE(x) __attribute__ ((__always_inline__)) x
-#define NO_SANITIZE(san, x) __attribute__ ((__no_sanitize__(san))) x
 #define NO_SANITIZE_ADDRESS(x) __attribute__ ((__no_sanitize_address__)) x
 #define NO_ADDRESS_SAFETY_ANALYSIS(x) __attribute__ ((__no_address_safety_analysis__)) x
 #define WARN_UNUSED_RESULT(x) __attribute__ ((__warn_unused_result__)) x
@@ -166,7 +166,8 @@
 #define HAVE_FUNC_WEAK 1
 #define RUBY_CXX_DEPRECATED(msg) __attribute__((__deprecated__(msg)))
 #define HAVE_NULLPTR 1
-#define FUNC_CDECL(x) __attribute__ ((__cdecl__)) x
+#define FUNC_UNOPTIMIZED(x) __attribute__ ((__optimize__("O0"))) x
+#define FUNC_MINIMIZED(x) __attribute__ ((__optimize__("-Os","-fomit-frame-pointer"))) x
 #define HAVE_ATTRIBUTE_FUNCTION_ALIAS 1
 #define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) type prot __attribute__((alias(#name)));
 #define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)
@@ -406,6 +407,7 @@
 #define HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW 1
 #define HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW 1
 #define HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW 1
+#define HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P 1
 #define HAVE_BUILTIN___BUILTIN_CONSTANT_P 1
 #define HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR 1
 #define HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P 1
@@ -454,9 +456,8 @@
 #define DLEXT_MAXLEN 3
 #define DLEXT ".so"
 #define HAVE__SETJMP 1
-#define RUBY_SETJMP(env) _setjmp((env))
-#define RUBY_LONGJMP(env,val) _longjmp((env),val)
-#define RUBY_JMP_BUF jmp_buf
+#define RUBY_SETJMP(env) __builtin_setjmp((env))
+#define RUBY_LONGJMP(env,val) __builtin_longjmp((env),val)
 #define USE_MJIT 1
 #define USE_YJIT 0
 #define RUBY_PLATFORM "aarch64-linux"

lib/cext/include/truffleruby/config_linux_amd64.h

@@ -51,6 +51,7 @@
 #define HAVE_LOCALE_H 1
 #define HAVE_MALLOC_H 1
 #define HAVE_PWD_H 1
+#define HAVE_SANITIZER_ASAN_INTERFACE_H 1
 #define HAVE_STDALIGN_H 1
 #define HAVE_STDIO_H 1
 #define HAVE_SYS_EVENTFD_H 1
@@ -169,7 +170,8 @@
 #define HAVE_FUNC_WEAK 1
 #define RUBY_CXX_DEPRECATED(msg) __attribute__((__deprecated__(msg)))
 #define HAVE_NULLPTR 1
-#define FUNC_CDECL(x) __attribute__ ((__cdecl__)) x
+#define FUNC_UNOPTIMIZED(x) __attribute__ ((__optimize__("O0"))) x
+#define FUNC_MINIMIZED(x) __attribute__ ((__optimize__("-Os","-fomit-frame-pointer"))) x
 #define HAVE_ATTRIBUTE_FUNCTION_ALIAS 1
 #define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) type prot __attribute__((alias(#name)));
 #define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)
@@ -409,6 +411,7 @@
 #define HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW 1
 #define HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW 1
 #define HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW 1
+#define HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P 1
 #define HAVE_BUILTIN___BUILTIN_CONSTANT_P 1
 #define HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR 1
 #define HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P 1
@@ -457,8 +460,8 @@
 #define DLEXT_MAXLEN 3
 #define DLEXT ".so"
 #define HAVE__SETJMP 1
-#define RUBY_SETJMP(env) __builtin_setjmp((void **)(env))
-#define RUBY_LONGJMP(env,val) __builtin_longjmp((void **)(env),val)
+#define RUBY_SETJMP(env) __builtin_setjmp((env))
+#define RUBY_LONGJMP(env,val) __builtin_longjmp((env),val)
 #define USE_MJIT 1
 #define USE_YJIT 0
 #define RUBY_PLATFORM "x86_64-linux"

tool/generate-config-header.sh

@@ -22,14 +22,6 @@ arch=${arch/arm64/aarch64}
 
 mx_platform="${os}_${arch}"
 
-if [ "$os" != "darwin" ]; then
-    if [ -z "$TOOLCHAIN_PATH" ]; then
-        echo "TOOLCHAIN_PATH must be set"
-        exit 1
-    fi
-    export PATH="$TOOLCHAIN_PATH:$PATH"
-fi
-
 archive=$(basename "$url")
 
 if [ ! -e "$archive" ]; then

tool/generate-native-config.rb

@@ -188,7 +188,7 @@ def field(name)
   end
 
   def cc
-    ENV.fetch('CXX', 'clang++')
+    ENV.fetch('CXX', 'c++')
   end
 
   def source_file