am d933a4ab: Merge "Switch one other location from i386 -> x86_64 by default."

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

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index acdb0a8..172ecf1 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.
@@ -32,7 +28,7 @@ LOCAL_CFLAGS := -DANDROID_ENGINEERING_BUILD \
                 $(LOCAL_CFLAGS)
 endif
 
-ifeq ($(LLVM_ENABLE_ASSERTION),true)
+ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true)
 LOCAL_CFLAGS :=        \
        $(LOCAL_CFLAGS) \
        -D_DEBUG        \
@@ -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
 ###########################################################