Merge pull request iovisor#668 from iovisor/ast_dev

fix build with 4.0 llvm trunk
mwesolowski · Aug 19, 2016 · f9ada2c · f9ada2c
2 parents 545008a + 959e403
commit f9ada2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
@@ -44,7 +44,7 @@ add_library(bcc-static STATIC bpf_common.cc bpf_module.cc shared_table.cc export
 set_target_properties(bcc-static PROPERTIES OUTPUT_NAME bcc)
 
 set(llvm_raw_libs bitwriter bpfcodegen irreader linker
- mcjit objcarcopts option passes nativecodegen)
+ mcjit objcarcopts option passes nativecodegen lto)
 list(FIND LLVM_AVAILABLE_LIBS "LLVMCoverage" _llvm_coverage)
 if (${_llvm_coverage} GREATER -1)
  list(APPEND llvm_raw_libs coverage)

diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
@@ -42,6 +42,7 @@
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Transforms/IPO.h>
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
+#include <llvm-c/Transforms/IPO.h>
 
 #include "exception.h"
 #include "frontends/b/loader.h"
@@ -396,7 +397,14 @@ int BPFModule::run_pass_manager(Module &mod) {
  PassManagerBuilder PMB;
  PMB.OptLevel = 3;
  PM.add(createFunctionInliningPass());
- PM.add(createAlwaysInlinerPass());
+ /*
+ * llvm < 4.0 needs
+ * PM.add(createAlwaysInlinerPass());
+ * llvm >= 4.0 needs
+ * PM.add(createAlwaysInlinerLegacyPass());
+ * use below 'stable' workaround
+ */
+ LLVMAddAlwaysInlinerPass(reinterpret_cast<LLVMPassManagerRef>(&PM));
  PMB.populateModulePassManager(PM);
  if (flags_ & 1)
  PM.add(createPrintModulePass(outs()));