Browse Source

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

tags/v0.2.16.rc1
buffer51 10 years ago
parent
commit
7f7d04dcd2
2 changed files with 6 additions and 7 deletions
  1. +2
    -4
      Makefile.arm
  2. +4
    -3
      Makefile.system

+ 2
- 4
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
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 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



+ 4
- 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))
@@ -379,7 +381,7 @@ FCOMMON_OPT += -m128bit-long-double
endif endif
ifeq ($(C_COMPILER), CLANG) ifeq ($(C_COMPILER), CLANG)
EXPRECISION = 1 EXPRECISION = 1
CCOMMON_OPT += -DEXPRECISION
CCOMMON_OPT += -DEXPRECISION
FCOMMON_OPT += -m128bit-long-double FCOMMON_OPT += -m128bit-long-double
endif endif
endif endif
@@ -393,7 +395,7 @@ endif


ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)


#check
#check
ifeq ($(USE_THREAD), 0) 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.) $(error OpenBLAS: Cannot set both USE_OPENMP=1 and USE_THREAD=0. The USE_THREAD=0 is only for building single thread version.)
endif endif
@@ -1185,4 +1187,3 @@ SUNPATH = /opt/sunstudio12.1
else else
SUNPATH = /opt/SUNWspro SUNPATH = /opt/SUNWspro
endif endif


Loading…
Cancel
Save