p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Do not apply -Wl,--fix-cortex-a8 to Cortex-A9" am: 3027e5fca9 am: 180d60a086 

am: cb268e126f

* commit 'cb268e126fd7acfb518b269a7a1fd1cc2c9ff379':
  Do not apply -Wl,--fix-cortex-a8 to Cortex-A9

Change-Id: I89192ea78f6c30ecf9295659970582441ed8f63c
This commit is contained in:
Dan Willemsen 2016-05-10 23:45:20 +00:00 committed by android-build-merger
parent 73e6461e88 cb268e126f
commit 4e148a2cfd
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/combo/arch/arm/armv7-a-neon.mk
View File

@ -30,6 +30,11 @@ ifneq (,$(filter cortex-a7 cortex-a53 cortex-a53.a57,$(TARGET_$(combo_2nd_arch_p
local_arch_has_lpae := true local_arch_has_lpae := true
arch_variant_ldflags := \ arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8 -Wl,--no-fix-cortex-a8
else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a9)
arch_variant_cflags := -march=armv7-a
arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8
else else
arch_variant_cflags := -march=armv7-a arch_variant_cflags := -march=armv7-a
# Generic ARM might be a Cortex A8 -- better safe than sorry # Generic ARM might be a Cortex A8 -- better safe than sorry
@ -38,6 +43,7 @@ else
endif endif
endif endif
endif endif
endif
ifeq (true,$(local_arch_has_lpae)) ifeq (true,$(local_arch_has_lpae))
# Fake an ARM compiler flag as these processors support LPAE which GCC/clang # Fake an ARM compiler flag as these processors support LPAE which GCC/clang