LLVM: Orbis support, fix typo in configure.ac

diff --git a/configure.ac b/configure.ac
index 584ab779d6053ebe3a7fcdb0f47699f100537220..28c6002a6d690e83e8b576aaf847db8349ae420a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3023,7 +3023,7 @@ if test "x$enable_llvm" = "xyes"; then
          LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
    fi   
 
-   AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
+   AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraries])
 
    AC_SUBST(LLVM_CFLAGS)
    AC_SUBST(LLVM_CXXFLAGS)

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 236bdd2d7b68cb82f057ff2f67e74417275ecb85..4b94301b046b13444c0f7c7037b503687c9c7bfd 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -8742,7 +8742,7 @@ emit_llvm_file (MonoAotCompile *acfg)
        g_string_append_printf (acfg->llc_args, " -disable-tail-calls");
 #endif
 
-#if defined(TARGET_MACH) && defined(TARGET_ARM)
+#if ( defined(TARGET_MACH) && defined(TARGET_ARM) ) || defined(TARGET_ORBIS)
        /* ios requires PIC code now */
        g_string_append_printf (acfg->llc_args, " -relocation-model=pic");
 #else