Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."
diff --git a/core/clang/config.mk b/core/clang/config.mk
index 91073ba..72a880f 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -58,6 +58,7 @@
-finline-limit=64 \
-fno-canonical-system-headers \
-fno-tree-sra \
+ -fprefetch-loop-arrays \
-funswitch-loops \
-Wmaybe-uninitialized \
-Wno-error=maybe-uninitialized \
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 9dc8af3..bee5d40 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -106,5 +106,6 @@
--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
--include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \
+ --abort-on-hard-verifier-error \
$(PRIVATE_DEX_PREOPT_FLAGS)
endef