am 76ec0c4c: Merge "Set mcpu targets based on cpu variant."

* commit '76ec0c4c53aab6fca7af1badab882518962a9755':
  Set mcpu targets based on cpu variant.
This commit is contained in:
Christopher Ferris
2015-09-25 16:35:56 +00:00
committed by Android Git Automerger

View File

@@ -24,7 +24,7 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
arch_variant_ldflags := \ arch_variant_ldflags := \
-Wl,--fix-cortex-a8 -Wl,--fix-cortex-a8
else else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7) ifneq (,$(filter cortex-a7 cortex-a53 cortex-a53.a57,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
arch_variant_cflags := -mcpu=cortex-a7 arch_variant_cflags := -mcpu=cortex-a7
arch_variant_ldflags := \ arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8 -Wl,--no-fix-cortex-a8