diff options
| author | Stephen Hines <srhines@google.com> | 2015-04-10 16:58:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 16:58:20 +0000 |
| commit | 594dd525e6cd389d5827a6d20168909ee9084535 (patch) | |
| tree | dc3db1b7ef5c5e316a3f2c9e23ad6fe23969692f /core/combo | |
| parent | 452196f8a09d05269d24f73ab80a383565a36f19 (diff) | |
| parent | 55acb92d825f12469e855485b23bfcd5e2461978 (diff) | |
| download | build-594dd525e6cd389d5827a6d20168909ee9084535.zip build-594dd525e6cd389d5827a6d20168909ee9084535.tar.gz build-594dd525e6cd389d5827a6d20168909ee9084535.tar.bz2 | |
am 55acb92d: am d263924f: am 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
* commit '55acb92d825f12469e855485b23bfcd5e2461978':
Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/arch/arm/armv7-a-neon.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index d535afc..99f17aa 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -16,14 +16,23 @@ ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VA # Fake an ARM compiler flag as these processors support LPAE which GCC/clang # don't advertise. arch_variant_cflags += -D__ARM_FEATURE_LPAE=1 + arch_variant_ldflags := \ + -Wl,--no-fix-cortex-a8 else ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8) arch_variant_cflags := -mcpu=cortex-a8 + arch_variant_ldflags := \ + -Wl,--fix-cortex-a8 else ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7) arch_variant_cflags := -mcpu=cortex-a7 + arch_variant_ldflags := \ + -Wl,--no-fix-cortex-a8 else arch_variant_cflags := -march=armv7-a + # Generic ARM might be a Cortex A8 -- better safe than sorry + arch_variant_ldflags := \ + -Wl,--fix-cortex-a8 endif endif endif @@ -31,6 +40,3 @@ endif arch_variant_cflags += \ -mfloat-abi=softfp \ -mfpu=neon - -arch_variant_ldflags := \ - -Wl,--fix-cortex-a8 |