Merge branch 'develop' into arm_soft_fp_abi

diff --cc Makefile.arm
index b93e48c,62bf275..11f8092
--- 1/Makefile.arm
--- 2/Makefile.arm
+++ b/Makefile.arm
@@@ -1,21 -1,21 +1,26 @@@
--# ifeq logical or
++ifeq logical or
  ifeq ($(CORE), $(filter $(CORE),CORTEXA9 CORTEXA15))
  ifeq ($(OSNAME), Android)
 -CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
 -FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
 +CCOMMON_OPT += -mfpu=neon  -march=armv7-a
 +FCOMMON_OPT += -mfpu=neon  -march=armv7-a
  else
 -CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 -FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 +CCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a
 +FCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a
  endif
  endif
  
  ifeq ($(CORE), ARMV7)
  ifeq ($(OSNAME), Android)
 -CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 -FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
++ifeq ($(ARM_SOFTFP), 1)
 +CCOMMON_OPT += -mfpu=neon -march=armv7-a
 +FCOMMON_OPT += -mfpu=neon -march=armv7-a
 +else
+ CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch
+ FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch
++endif
+ else
 +CCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a
 +FCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a
  endif
  endif
  

diff --cc Makefile.system
Simple merge

diff --cc common_arm.h
Simple merge