revive LLVM support (WIP)

CMakeLists.txt

@@ -15,6 +15,7 @@ if(TARGET tcc::tcc)
 endif()
 
 if(WITH_LLVM)
+	if(FALSE)
 	    if(DEFINED ENV{LLVM_HOME})
 	        find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm)
 	    endif(DEFINED ENV{LLVM_HOME})
@@ -22,6 +23,9 @@ if(WITH_LLVM)
 	    message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 	    message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 	    llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser)
+	else()
+		find_package(LLVM REQUIRED LLVMSupport LLVMCore LLVMMCJIT LLVMX86CodeGen LLVMX86AsmParser)
+	endif()
 endif()
 
 #Mac needed variables (adapt for your needs - http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH)

src/main.cpp

@@ -39,7 +39,7 @@
 #include <boost/program_options.hpp>
 #include "iss/arch/tgc_mapper.h"
 #ifdef WITH_LLVM
-#include <iss/llvm/jit_helper.h>
+#include <iss/llvm/jit_init.h>
 #endif
 #include <iss/log_categories.h>
 #include "iss/plugin/cycle_estimate.h"