Fix the build, the stub for mono_llvm_cpp_throw_exception () was inside a DISABLE_JIT...
authorZoltan Varga <vargaz@gmail.com>
Wed, 28 Oct 2015 22:45:16 +0000 (18:45 -0400)
committerZoltan Varga <vargaz@gmail.com>
Wed, 28 Oct 2015 22:45:25 +0000 (18:45 -0400)
configure.ac
mono/mini/mini.c

index 4dbc44d64562cc2c86f726a8b0ca81eee1abf782..1d6ce70d909adf78fee67d871a44276071ea0181 100644 (file)
@@ -2700,6 +2700,9 @@ AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes])
 if test "x$enable_llvm" = "xyes"; then
    enable_llvm_runtime=yes
 fi
+if test "x$enable_llvm_runtime" = "xyes"; then
+   AC_DEFINE(ENABLE_LLVM_RUNTIME, 1, [Runtime support code for llvm enabled])
+fi
 AM_CONDITIONAL(ENABLE_LLVM_RUNTIME, [test x$enable_llvm_runtime = xyes])
 
 TARGET="unknown"
index 66262fe22bf51dfa31b696919c56b5dddf472999..d31ccb4d4e27294aae14d1713b18c0dcfcfcf026 100644 (file)
@@ -4494,6 +4494,16 @@ void mono_llvm_emit_aot_data (const char *symbol, guint8 *data, int data_len)
 
 #endif
 
+#if !defined(ENABLE_LLVM_RUNTIME) && !defined(ENABLE_LLVM)
+
+void
+mono_llvm_cpp_throw_exception (void)
+{
+       g_assert_not_reached ();
+}
+
+#endif
+
 #ifdef DISABLE_JIT
 
 MonoCompile*
@@ -4515,14 +4525,4 @@ mono_add_patch_info (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpoin
        g_assert_not_reached ();
 }
 
-#if !defined(ENABLE_LLVM_RUNTIME) && !defined(ENABLE_LLVM)
-
-void
-mono_llvm_cpp_throw_exception (void)
-{
-       g_assert_not_reached ();
-}
-
-#endif
-
 #endif /* DISABLE_JIT */