IMPR: adapt build for llvm project

Author: ser-mk

AddressInterceptPass/AddressIntercept.cpp

@@ -137,6 +137,8 @@ using namespace adin;
 
 char AddressInterceptor::ID = 0;
 
+#ifdef ADIN_LOAD_MODULE
+
 static RegisterPass<AddressInterceptor> X("adin", "Hello World Pass",
                              false /* Only looks at CFG */,
                              false /* Analysis Pass */);
@@ -151,3 +153,6 @@ static RegisterStandardPasses
   RegisterMyPass(PassManagerBuilder::EP_EarlyAsPossible,
                  registerAddressInterceptPass);
 
+#else
+
+#endif

AddressInterceptPass/CMakeLists.txt

@@ -1,25 +1,48 @@
-add_library(AddressInterceptPass MODULE
-    # List your source files here.
-    AddressIntercept.cpp
-    AllocaRecognize
-    MemoryOperationRecognize
-    InlineInstrumentation
-    Logger
-)
-
-# Use C++11 to compile your pass (i.e., supply -std=c++11).
-target_compile_features(AddressInterceptPass PRIVATE cxx_range_for cxx_auto_type)
-
-# LLVM is (typically) built with no C++ RTTI. We need to match that;
-# otherwise, we'll get linker errors about missing RTTI data.
-set_target_properties(AddressInterceptPass PROPERTIES
-    COMPILE_FLAGS "-fno-rtti"
-)
-
-# Get proper shared-library behavior (where symbols are not necessarily
-# resolved when the shared library is linked) on OS X.
-if(APPLE)
+if(NOT DEFINED ENV{YOUR_LLVM_PATH})
+
+    add_llvm_library( LLVMAddressInterceptor
+        # List your source files here.
+        AddressIntercept.cpp
+        AllocaRecognize.cpp
+        MemoryOperationRecognize.cpp
+        InlineInstrumentation.cpp
+        Logger.cpp
+
+      ADDITIONAL_HEADER_DIRS
+      ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
+
+      DEPENDS
+      intrinsics_gen
+      )
+
+else ()
+
+    add_library(AddressInterceptPass MODULE
+        # List your source files here.
+        AddressIntercept.cpp
+        AllocaRecognize
+        MemoryOperationRecognize
+        InlineInstrumentation
+        Logger
+    )
+
+    add_definitions(-DADIN_LOAD_MODULE)
+
+    # Use C++11 to compile your pass (i.e., supply -std=c++11).
+    target_compile_features(AddressInterceptPass PRIVATE cxx_range_for cxx_auto_type)
+
+    # LLVM is (typically) built with no C++ RTTI. We need to match that;
+    # otherwise, we'll get linker errors about missing RTTI data.
     set_target_properties(AddressInterceptPass PROPERTIES
-        LINK_FLAGS "-undefined dynamic_lookup"
+        COMPILE_FLAGS "-fno-rtti"
     )
-endif(APPLE)
+
+    # Get proper shared-library behavior (where symbols are not necessarily
+    # resolved when the shared library is linked) on OS X.
+    if(APPLE)
+        set_target_properties(AddressInterceptPass PROPERTIES
+            LINK_FLAGS "-undefined dynamic_lookup"
+        )
+    endif(APPLE)
+
+endif()

CMakeLists.txt

@@ -1,15 +1,17 @@
 cmake_minimum_required(VERSION 3.4)
 
-# we need LLVM_HOME in order not automatically set LLVM_DIR
-if(NOT DEFINED LLVM_HOME)
-    message(FATAL_ERROR "$LLVM_HOME is not defined")
+message("YOUR_LLVM_PATH PATH : $ENV{YOUR_LLVM_PATH} ##################################")
+
+# we need YOUR_LLVM_PATH in order not automatically set LLVM_DIR
+if(NOT DEFINED ENV{YOUR_LLVM_PATH})
+    message(AUTHOR_WARNING "ENV{YOUR_LLVM_PATH} is not defined")
+    message(AUTHOR_WARNING "Pass is built in to llvm project")
 else ()
-    set(ENV{LLVM_DIR} $ENV{LLVM_HOME}/lib/cmake/llvm)
+    set(ENV{LLVM_DIR} $ENV{YOUR_LLVM_PATH}/lib/cmake/llvm)
+    find_package(LLVM REQUIRED CONFIG)
+    add_definitions(${LLVM_DEFINITIONS})
+    include_directories(${LLVM_INCLUDE_DIRS})
+    link_directories(${LLVM_LIBRARY_DIRS})
 endif()
 
-find_package(LLVM REQUIRED CONFIG)
-add_definitions(${LLVM_DEFINITIONS})
-include_directories(${LLVM_INCLUDE_DIRS})
-link_directories(${LLVM_LIBRARY_DIRS})
-
 add_subdirectory(AddressInterceptPass)  # Use your pass name here.