Fix hard floats on Android

This commit is contained in:
Jeffrey Walton 2019-10-16 17:00:28 -04:00
parent 3e171d51f7
commit c1d91eed59
No known key found for this signature in database
GPG Key ID: B36AB348921B1838

View File

@ -381,9 +381,9 @@ ifeq ($(IS_ARM32),1)
# Android needs -c compile flag for NEON. Otherwise there's an odd linker message.
ifeq ($(IS_ANDROID),1)
NEON_FLAG = -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=$(FP_ABI) -mfpu=neon
NEON_FLAG = -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -mfpu=neon
else
NEON_FLAG = -march=armv7-a -mfloat-abi=softfp -mfpu=neon
NEON_FLAG = -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon
endif
TPROG = TestPrograms/test_arm_neon.cxx
@ -605,11 +605,6 @@ ifeq ($(findstring lean,$(MAKECMDGOALS)),lean)
endif # MAKECMDGOALS
endif # Dead code stripping
# Andoid linker needs the NEON flags added.
ifeq ($(IS_ANDROID),1)
LDFLAGS += $(NEON_FLAG)
endif
###########################################################
##### Source and object files #####
###########################################################