Merge branch 'develop' into develop_arm_softfp

diff --cc Makefile.system
index 4face0e,bb55dd6..c4cf619
--- 1/Makefile.system
--- 2/Makefile.system
+++ b/Makefile.system
@@@ -490,12 -486,21 +490,19 @@@ BINARY_DEFINED  = 
  CCOMMON_OPT += -marm
  FCOMMON_OPT += -marm
  
 +# If softfp abi is mentioned on the command line, force it.
  ifeq ($(ARM_SOFTFP_ABI), 1)
 -CCOMMON_OPT += -mfloat-abi=softfp -DARM_SOFTFP_ABI
 -FCOMMON_OPT += -mfloat-abi=softfp -DARM_SOFTFP_ABI
 -else
 -CCOMMON_OPT += -mfloat-abi=hard
 -FCOMMON_OPT += -mfloat-abi=hard
 +CCOMMON_OPT += -mfloat-abi=softfp
 +FCOMMON_OPT += -mfloat-abi=softfp
  endif
  
+ ifeq ($(OSNAME), Android)
+ ifeq ($(ARM_SOFTFP_ABI), 1)
+ EXTRALIB      += -lm
+ else
+ EXTRALIB      += -Wl,-lm_hard
+ endif
+ endif
  endif
  
  ifeq ($(ARCH), arm64)