move cflag modification in Makefile and fixup lapack c compilation
This commit is contained in:
+4
-2
@@ -486,7 +486,6 @@ LIBSUFFIX = a
|
||||
|
||||
ifeq ($(C_COMPILER), CLANG)
|
||||
CCOMMON_OPT += -DMS_ABI
|
||||
CCOMMON_OPT += -fvisibility=hidden
|
||||
endif
|
||||
|
||||
#Version tests for supporting specific features (MS_ABI, POWER9 intrinsics)
|
||||
@@ -494,7 +493,6 @@ ifeq ($(GCCVERSIONGT4), 1)
|
||||
# GCC Major version > 4
|
||||
# It is compatible with MSVC ABI.
|
||||
CCOMMON_OPT += -DMS_ABI
|
||||
CCOMMON_OPT += -fvisibility=hidden
|
||||
endif
|
||||
|
||||
ifeq ($(GCCVERSIONGTEQ4), 1)
|
||||
@@ -594,11 +592,13 @@ ifeq ($(F_COMPILER), GFORTRAN)
|
||||
ifeq ($(C_COMPILER), $(filter $(C_COMPILER),GCC LSB))
|
||||
EXPRECISION = 1
|
||||
CCOMMON_OPT += -DEXPRECISION -m128bit-long-double
|
||||
CCOMMON_OPT += -fvisibility=hidden
|
||||
FCOMMON_OPT += -m128bit-long-double
|
||||
endif
|
||||
ifeq ($(C_COMPILER), CLANG)
|
||||
EXPRECISION = 1
|
||||
CCOMMON_OPT += -DEXPRECISION
|
||||
CCOMMON_OPT += -fvisibility=hidden
|
||||
FCOMMON_OPT += -m128bit-long-double
|
||||
endif
|
||||
endif
|
||||
@@ -617,11 +617,13 @@ ifeq ($(F_COMPILER), GFORTRAN)
|
||||
ifeq ($(C_COMPILER), $(filter $(C_COMPILER),GCC LSB))
|
||||
EXPRECISION = 1
|
||||
CCOMMON_OPT += -DEXPRECISION -m128bit-long-double
|
||||
CCOMMON_OPT += -fvisibility=hidden
|
||||
FCOMMON_OPT += -m128bit-long-double
|
||||
endif
|
||||
ifeq ($(C_COMPILER), CLANG)
|
||||
EXPRECISION = 1
|
||||
CCOMMON_OPT += -DEXPRECISION
|
||||
CCOMMON_OPT += -fvisibility=hidden
|
||||
FCOMMON_OPT += -m128bit-long-double
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -6,7 +6,8 @@ openblas_threads_callback openblas_threads_callback_ = 0;
|
||||
/* non-threadsafe function should be called before any other
|
||||
openblas function to change how threads are managed */
|
||||
|
||||
OPENBLAS_EXPORT
|
||||
void openblas_set_threads_callback_function(openblas_threads_callback callback)
|
||||
{
|
||||
openblas_threads_callback_ = callback;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ ALLMOD = la_xisnan.mod la_constants.mod
|
||||
else
|
||||
.SUFFIXES: .c .o
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
$(CC) $(filter-out -fvisibility=hidden, $(CFLAGS)) -c -o $@ $<
|
||||
endif
|
||||
|
||||
ALLAUX_O = ilaenv.o ilaenv2stage.o ieeeck.o lsamen.o xerbla.o xerbla_array.o \
|
||||
@@ -689,11 +689,11 @@ la_xisnan.o: la_xisnan.F90 la_constants.mod
|
||||
la_constants.o: la_constants.f90
|
||||
$(FC) $(FFLAGS) -c -o $@ $<
|
||||
else
|
||||
slaruv.o: slaruv.c ; $(CC) $(CFLAGS) -c -o $@ $<
|
||||
dlaruv.o: dlaruv.c ; $(CC) $(CFLAGS) -c -o $@ $<
|
||||
sla_wwaddw.o: sla_wwaddw.c ; $(CC) $(CFLAGS) -c -o $@ $<
|
||||
dla_wwaddw.o: dla_wwaddw.c ; $(CC) $(CFLAGS) -c -o $@ $<
|
||||
cla_wwaddw.o: cla_wwaddw.c ; $(CC) $(CFLAGS) -c -o $@ $<
|
||||
zla_wwaddw.o: zla_wwaddw.c ; $(CC) $(CFLAGS) -c -o $@ $<
|
||||
slaruv.o: slaruv.c ; $(CC) $(CFLAGS) -I../.. -c -o $@ $<
|
||||
dlaruv.o: dlaruv.c ; $(CC) $(CFLAGS) -I../.. -c -o $@ $<
|
||||
sla_wwaddw.o: sla_wwaddw.c ; $(CC) $(CFLAGS) -I../.. -c -o $@ $<
|
||||
dla_wwaddw.o: dla_wwaddw.c ; $(CC) $(CFLAGS) -I../.. -c -o $@ $<
|
||||
cla_wwaddw.o: cla_wwaddw.c ; $(CC) $(CFLAGS) -I../.. -c -o $@ $<
|
||||
zla_wwaddw.o: zla_wwaddw.c ; $(CC) $(CFLAGS) -I../.. -c -o $@ $<
|
||||
endif
|
||||
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <complex.h>
|
||||
|
||||
#include <exports.h>
|
||||
|
||||
#ifdef complex
|
||||
#undef complex
|
||||
#endif
|
||||
@@ -604,6 +607,7 @@ f"> */
|
||||
/* > \endverbatim */
|
||||
/* > */
|
||||
/* ===================================================================== */
|
||||
OPENBLAS_EXPORT
|
||||
/* Subroutine */ void dlaruv_(integer *iseed, integer *n, doublereal *x)
|
||||
{
|
||||
/* Initialized data */
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <complex.h>
|
||||
|
||||
#include <exports.h>
|
||||
|
||||
#ifdef complex
|
||||
#undef complex
|
||||
#endif
|
||||
@@ -604,6 +607,7 @@ f"> */
|
||||
/* > \endverbatim */
|
||||
/* > */
|
||||
/* ===================================================================== */
|
||||
OPENBLAS_EXPORT
|
||||
/* Subroutine */ void slaruv_(integer *iseed, integer *n, real *x)
|
||||
{
|
||||
/* Initialized data */
|
||||
|
||||
@@ -33,7 +33,12 @@
|
||||
TOPSRCDIR = ../..
|
||||
include $(TOPSRCDIR)/make.inc
|
||||
|
||||
ifneq ($(C_LAPACK), 1)
|
||||
ifeq ($(C_LAPACK), 1)
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o
|
||||
.c.o:
|
||||
$(CC) $(filter-out -fvisibility=hidden, $(CFLAGS)) -c -o $@ $<
|
||||
else
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .f .o
|
||||
.f.o:
|
||||
@@ -128,9 +133,9 @@ dlaran.o: dlaran.f ; $(FC) $(FFLAGS_NOOPT) -c -o $@ $<
|
||||
endif
|
||||
else
|
||||
ifeq ($(filter $(BUILD_SINGLE) $(BUILD_COMPLEX),1),)
|
||||
slaran.o: slaran.c ; $(CC) $(CFLAGS) -O0 -c -o $@ $<
|
||||
slaran.o: slaran.c ; $(CC) $(filter-out -fvisibility=hidden, $(CFLAGS)) -O0 -c -o $@ $<
|
||||
endif
|
||||
ifeq ($(filter $(BUILD_DOUBLE) $(BUILD_COMPLEX16),1),)
|
||||
dlaran.o: dlaran.c ; $(CC) $(CFLAGS) -O0 -c -o $@ $<
|
||||
dlaran.o: dlaran.c ; $(CC) $(filter-out -fvisibility=hidden, $(CFLAGS) -O0 -c -o $@ $<
|
||||
endif
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user