Merge pull request iovisor#1411 from iovisor/yhs_dev

bpf: fix a couple of issues related to arm64
sjtuhjh · Oct 26, 2017 · 1e7dc39 · 1e7dc39
2 parents 3d51c0f + 7abe63a
commit 1e7dc39
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/cmake/clang_libs.cmake b/cmake/clang_libs.cmake
@@ -9,6 +9,7 @@ if (${_llvm_coroutines} GREATER -1)
   list(APPEND llvm_raw_libs coroutines)
 endif()
 if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "5")
+  list(APPEND llvm_raw_libs bpfasmparser)
   list(APPEND llvm_raw_libs bpfdisassembler)
 endif()
 llvm_map_components_to_libnames(_llvm_libs ${llvm_raw_libs})

diff --git a/src/cc/bcc_proc.c b/src/cc/bcc_proc.c
@@ -311,6 +311,7 @@ static int load_ld_cache(const char *cache_path) {
 #define ABI_X8664_LIB64 0x0300
 #define ABI_S390_LIB64 0x0400
 #define ABI_POWERPC_LIB64 0x0500
+#define ABI_AARCH64_LIB64 0x0a00
 
 static bool match_so_flags(int flags) {
   if ((flags & FLAG_TYPE_MASK) != TYPE_ELF_LIBC6)
@@ -322,6 +323,7 @@ static bool match_so_flags(int flags) {
   case ABI_X8664_LIB64:
   case ABI_S390_LIB64:
   case ABI_POWERPC_LIB64:
+  case ABI_AARCH64_LIB64:
     return (sizeof(void *) == 8);
   }
 

diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
@@ -111,6 +111,7 @@ BPFModule::BPFModule(unsigned flags, TableStorage *ts)
   LLVMInitializeBPFTargetInfo();
   LLVMInitializeBPFAsmPrinter();
 #if LLVM_MAJOR_VERSION >= 6
+  LLVMInitializeBPFAsmParser();
   if (flags & DEBUG_SOURCE)
     LLVMInitializeBPFDisassembler();
 #endif