aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Transforms/Scalar/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Transforms/Scalar/Android.mk')
-rw-r--r--lib/Transforms/Scalar/Android.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 60308c69b3..3894f93b75 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -2,8 +2,8 @@ LOCAL_PATH:= $(call my-dir)
transforms_scalar_SRC_FILES := \
ADCE.cpp \
- CodeGenPrepare.cpp \
ConstantProp.cpp \
+ ConstantHoisting.cpp \
CorrelatedValuePropagation.cpp \
DCE.cpp \
DeadStoreElimination.cpp \
@@ -30,6 +30,7 @@ transforms_scalar_SRC_FILES := \
SROA.cpp \
SampleProfile.cpp \
Scalar.cpp \
+ Scalarizer.cpp \
ScalarReplAggregates.cpp \
SimplifyCFGPass.cpp \
Sink.cpp \
@@ -53,13 +54,20 @@ include $(BUILD_HOST_STATIC_LIBRARY)
# For the device
# =====================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
LOCAL_MODULE:= libLLVMScalarOpts
+# Override the default optimization level to work around a SIGSEGV
+# on x86 target builds for SROA.cpp.
+# Bug: 8047767
+LOCAL_CFLAGS_x86 += -O1
+
LOCAL_MODULE_TAGS := optional
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
+endif