android: R600(AMDGPU)/AsmParser: fix tblgen related building errors

[android-x86/external-llvm.git] / llvm-device-build.mk

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index a0691e7..823209d 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -16,10 +16,6 @@ LOCAL_CFLAGS :=      \
         -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
-# ARM64 builds seem to miscompile libLLVM without fno-inline.
-# Test and eventually remove after a future rebase.
-LOCAL_CFLAGS_arm64 += -fno-inline
-
 # The three inline options together reduce libbcc.so almost 1MB.
 # We move them from global build/core/combo/TARGET_linux-arm.mk
 # to here.
@@ -62,14 +58,11 @@ LOCAL_CPPFLAGS :=   \
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
        bionic \
-       external/libcxx/include \
        $(LLVM_ROOT_PATH)       \
        $(LLVM_ROOT_PATH)/include       \
        $(LLVM_ROOT_PATH)/device/include        \
        $(LOCAL_C_INCLUDES)
 
-include external/libcxx/libcxx.mk
-
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ###########################################################