Fixed linking error when compiling ARMv7 for Android (disabled -lpthread and added...

diff --git a/Makefile.arm b/Makefile.arm
index 272220c..62bf275 100644 (file)
--- a/Makefile.arm
+++ b/Makefile.arm
@@ -11,8 +11,8 @@ endif
 
 ifeq ($(CORE), ARMV7)
 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 += -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
 else
 CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
@@ -29,5 +29,3 @@ ifeq ($(CORE), ARMV5)
 CCOMMON_OPT += -marm -march=armv5
 FCOMMON_OPT += -marm -march=armv5
 endif
-
-

diff --git a/Makefile.system b/Makefile.system
index 18dbb8d..b89f60e 100644 (file)
--- a/Makefile.system
+++ b/Makefile.system
@@ -296,12 +296,14 @@ endif
 ifneq ($(OSNAME), WINNT)
 ifneq ($(OSNAME), CYGWIN_NT)
 ifneq ($(OSNAME), Interix)
+ifneq ($(OSNAME), Android)
 ifdef SMP
 EXTRALIB   += -lpthread
 endif
 endif
 endif
 endif
+endif
 
 # ifeq logical or
 ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT Interix))
@@ -379,7 +381,7 @@ FCOMMON_OPT += -m128bit-long-double
 endif
 ifeq ($(C_COMPILER), CLANG)
 EXPRECISION    = 1
-CCOMMON_OPT    += -DEXPRECISION 
+CCOMMON_OPT    += -DEXPRECISION
 FCOMMON_OPT    += -m128bit-long-double
 endif
 endif
@@ -393,7 +395,7 @@ endif
 
 ifeq ($(USE_OPENMP), 1)
 
-#check 
+#check
 ifeq ($(USE_THREAD), 0)
 $(error OpenBLAS: Cannot set both USE_OPENMP=1 and USE_THREAD=0. The USE_THREAD=0 is only for building single thread version.)
 endif
@@ -1185,4 +1187,3 @@ SUNPATH           = /opt/sunstudio12.1
 else
 SUNPATH                = /opt/SUNWspro
 endif
-