floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed linking error when compiling ARMv7 for Android (disabled -lpthread and added -Wl,--no-warn-mismatch).

This commit is contained in:
buffer51 2016-02-04 17:05:31 -05:00
parent 4e1b521e27
commit 7f7d04dcd2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.arm
View File

@ -11,8 +11,8 @@ endif
ifeq ($(CORE), ARMV7) ifeq ($(CORE), ARMV7)
ifeq ($(OSNAME), Android) ifeq ($(OSNAME), Android)
CCOMMON_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 FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch
else else
CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a
FCOMMON_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 CCOMMON_OPT += -marm -march=armv5
FCOMMON_OPT += -marm -march=armv5 FCOMMON_OPT += -marm -march=armv5
endif endif

3
Makefile.system
View File

@ -296,12 +296,14 @@ endif
ifneq ($(OSNAME), WINNT) ifneq ($(OSNAME), WINNT)
ifneq ($(OSNAME), CYGWIN_NT) ifneq ($(OSNAME), CYGWIN_NT)
ifneq ($(OSNAME), Interix) ifneq ($(OSNAME), Interix)
ifneq ($(OSNAME), Android)
ifdef SMP ifdef SMP
EXTRALIB += -lpthread EXTRALIB += -lpthread
endif endif
endif endif
endif endif
endif endif
endif
# ifeq logical or # ifeq logical or
ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT Interix)) ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT Interix))
@ -1185,4 +1187,3 @@ SUNPATH = /opt/sunstudio12.1
else else
SUNPATH = /opt/SUNWspro SUNPATH = /opt/SUNWspro
endif endif