[xbuild] Remove ErrorTest.TestExecute1()

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7eed7e189e293475bbfb3f62f64a8118c077f73e..bf0e910961bee936d8a8ccaea91b02d2472813ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2643,19 +2643,16 @@ if test "x$enable_llvm" = "xyes"; then
    # This might include empty lines
    LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
    llvm_jit_supported=yes
+   llvm_jit_libs="jit mcjit $llvm_codegen"
    if test $llvm_api_version -gt 100; then
          # Based on llvm 3.9, only aot is currently supported
-         llvm_jit_supported=no
+      llvm_jit_libs="orcjit $llvm_codegen"
    elif test "x$host" != "x$target"; then
       # No need for jit libs
          llvm_jit_supported=no
+      llvm_jit_libs=""
    fi
-   if test $llvm_jit_supported = no; then
-      # No need for jit libs
-      LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter`
-   else
-      LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter jit mcjit $llvm_codegen`
-   fi
+   LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter $llvm_jit_libs`
    if test "x$LLVM_LIBS" == "x"; then
          echo "$LLVM_CONFIG --libs failed."
          exit 1
@@ -3103,6 +3100,45 @@ SPARC64)
        ;;
 esac
 
+case "$HOST" in
+X86)
+       AC_DEFINE(HOST_X86, 1, [...])
+       ;;
+AMD64)
+       AC_DEFINE(HOST_AMD64, 1, [...])
+       ;;
+ARM)
+       AC_DEFINE(HOST_ARM, 1, [...])
+       ;;
+ARM64)
+       AC_DEFINE(HOST_ARM64, 1, [...])
+       ;;
+POWERPC)
+       AC_DEFINE(HOST_POWERPC, 1, [...])
+       ;;
+POWERPC64)
+       AC_DEFINE(HOST_POWERPC, 1, [...])
+       AC_DEFINE(HOST_POWERPC64, 1, [...])
+       ;;
+S390X)
+       AC_DEFINE(HOST_S390X, 1, [...])
+       ;;
+MIPS)
+       AC_DEFINE(HOST_MIPS, 1, [...])
+       ;;
+IA64)
+       AC_DEFINE(HOST_IA64, 1, [...])
+       ;;
+SPARC)
+       AC_DEFINE(HOST_SPARC, 1, [...])
+       ;;
+SPARC64)
+       AC_DEFINE(HOST_SPARC64, 1, [...])
+       ;;
+esac
+
+
+
 dnl *************
 dnl *** VTUNE ***
 dnl *************