replace ARCH with AR in lapack-netlib

This commit is contained in:
Dumi Loghin 2018-09-05 12:49:37 +08:00
parent cbc46163bd
commit db17ce896f
25 changed files with 79 additions and 75 deletions

View File

@ -237,8 +237,8 @@ ifndef NOFORTRAN
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "ARCHFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "AR = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "ARFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "TMGLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc

View File

@ -121,6 +121,10 @@ if (($architecture eq "x86") && ($os ne Darwin) && ($os ne SunOS)) {
$binary =32;
}
if ($architecture eq "riscv64") {
$defined = 1;
}
if ($compiler eq "PGI") {
$compiler_name .= " -tp p7" if ($binary eq "32");
$compiler_name .= " -tp p7-64" if ($binary eq "64");

View File

@ -138,23 +138,23 @@ ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
$(BLASLIB): $(ALLOBJ)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
$(AR) $(ARFLAGS) $(BLASLIB) $^
$(RANLIB) $(BLASLIB)
double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3)
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
$(AR) $(ARFLAGS) $(BLASLIB) $^
$(RANLIB) $(BLASLIB)
complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3)
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
$(AR) $(ARFLAGS) $(BLASLIB) $^
$(RANLIB) $(BLASLIB)
complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
$(AR) $(ARFLAGS) $(BLASLIB) $^
$(RANLIB) $(BLASLIB)
FRC:

View File

@ -45,22 +45,22 @@ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
# Single precision real
slib1: $(slev1) $(sclev1)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Double precision real
dlib1: $(dlev1)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Single precision complex
clib1: $(clev1) $(sclev1)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Double precision complex
zlib1: $(zlev1)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
#
@ -97,22 +97,22 @@ zlev2 = cblas_zgemv.o cblas_zgbmv.o cblas_zhemv.o cblas_zhbmv.o cblas_zhpmv.o \
# Single precision real
slib2: $(slev2) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Double precision real
dlib2: $(dlev2) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Single precision complex
clib2: $(clev2) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Double precision complex
zlib2: $(zlev2) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
#
@ -143,22 +143,22 @@ zlev3 = cblas_zgemm.o cblas_zsymm.o cblas_zhemm.o cblas_zherk.o \
# Single precision real
slib3: $(slev3) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Double precision real
dlib3: $(dlev3) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Single precision complex
clib3: $(clev3) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# Double precision complex
zlib3: $(zlev3) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
@ -168,22 +168,22 @@ alev3 = $(slev3) $(dlev3) $(clev3) $(zlev3)
# All level 1
all1: $(alev1)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# All level 2
all2: $(alev2) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# All level 3
all3: $(alev3) $(errhand)
$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
$(AR) $(ARFLAGS) $(CBLASLIB) $^
$(RANLIB) $(CBLASLIB)
# All levels and precisions
$(CBLASLIB): $(alev1) $(alev2) $(alev3) $(errhand)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
FRC:

View File

@ -466,7 +466,7 @@ TIMER = EXT_ETIME
Refer to the section~\ref{second} to get more information.
Next, you will need to modify \texttt{ARCH}, \texttt{ARCHFLAGS}, and \texttt{RANLIB} to specify archiver,
Next, you will need to modify \texttt{AR}, \texttt{ARFLAGS}, and \texttt{RANLIB} to specify archiver,
archiver options, and ranlib for your machine. If your architecture
does not require \texttt{ranlib} to be run after each archive command (as
is the case with CRAY computers running UNICOS, Hewlett Packard

View File

@ -29,8 +29,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -29,8 +29,8 @@ LOADOPTS = -Aa +U77
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -32,8 +32,8 @@ LOADOPTS = -O3 -64 -mips4 -r10000 -OPT:IEEE_NaN_inf=ON
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -32,8 +32,8 @@ LOADOPTS = -O3 -64 -mips4 -r10000
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -29,8 +29,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -29,8 +29,8 @@ LOADOPTS = -dalign -O4 -fast
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -33,8 +33,8 @@ LOADOPTS = -f -dalign -native -xO2 -xarch=v8plusa
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -30,8 +30,8 @@ LOADOPTS = -qnosave
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -33,8 +33,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -33,8 +33,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -29,8 +29,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -29,8 +29,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -29,8 +29,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = echo
# Timer for the SECOND and DSECND routines

View File

@ -2455,16 +2455,16 @@ endif
all: ../../$(LAPACKELIB)
../../$(LAPACKELIB): $(OBJ_A) $(OBJ_B) $(DEPRECATED) $(EXTENDED) $(MATGEN)
$(ARCH) $(ARCHFLAGS) $@ $(OBJ_A)
$(ARCH) $(ARCHFLAGS) $@ $(OBJ_B)
$(AR) $(ARFLAGS) $@ $(OBJ_A)
$(AR) $(ARFLAGS) $@ $(OBJ_B)
ifdef BUILD_DEPRECATED
$(ARCH) $(ARCHFLAGS) $@ $(DEPRECATED)
$(AR) $(ARFLAGS) $@ $(DEPRECATED)
endif
ifdef (USEXBLAS)
$(ARCH) $(ARCHFLAGS) $@ $(EXTENDED)
$(AR) $(ARFLAGS) $@ $(EXTENDED)
endif
ifdef LAPACKE_WITH_TMG
$(ARCH) $(ARCHFLAGS) $@ $(MATGEN)
$(AR) $(ARFLAGS) $@ $(MATGEN)
endif
$(RANLIB) $@

View File

@ -186,7 +186,7 @@ OBJ = lapacke_cgb_nancheck.o \
all: lib
lib: $(OBJ)
$(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $^
$(AR) $(ARFLAGS) ../../$(LAPACKELIB) $^
$(RANLIB) ../../$(LAPACKELIB)
clean: cleanobj

View File

@ -553,26 +553,26 @@ endif
all: ../$(LAPACKLIB)
../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
$(AR) $(ARFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
$(RANLIB) $@
single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
$(AR) $(ARFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
$(SXLASRC) $(SCLAUX) $(ALLAUX)
$(RANLIB) ../$(LAPACKLIB)
complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
$(AR) $(ARFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
$(CXLASRC) $(SCLAUX) $(ALLAUX)
$(RANLIB) ../$(LAPACKLIB)
double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
$(AR) $(ARFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
$(DXLASRC) $(DZLAUX) $(ALLAUX)
$(RANLIB) ../$(LAPACKLIB)
complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
$(AR) $(ARFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
$(ZXLASRC) $(DZLAUX) $(ALLAUX)
$(RANLIB) ../$(LAPACKLIB)

View File

@ -33,27 +33,27 @@ QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a
cholrl.a: $(CHOLRL)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
choltop.a: $(CHOLTOP)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
lucr.a: $(LUCR)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
lull.a: $(LULL)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
lurec.a: $(LUREC)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
qrll.a: $(QRLL)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
clean: cleanobj cleanlib

View File

@ -58,23 +58,23 @@ ALLOBJ = $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN) $(ZMATGEN) \
$(DZATGEN)
../../$(TMGLIB): $(ALLOBJ)
$(ARCH) $(ARCHFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
single: $(SMATGEN) $(SCATGEN)
$(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
$(AR) $(ARFLAGS) ../../$(TMGLIB) $^
$(RANLIB) ../../$(TMGLIB)
complex: $(CMATGEN) $(SCATGEN)
$(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
$(AR) $(ARFLAGS) ../../$(TMGLIB) $^
$(RANLIB) ../../$(TMGLIB)
double: $(DMATGEN) $(DZATGEN)
$(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
$(AR) $(ARFLAGS) ../../$(TMGLIB) $^
$(RANLIB) ../../$(TMGLIB)
complex16: $(ZMATGEN) $(DZATGEN)
$(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
$(AR) $(ARFLAGS) ../../$(TMGLIB) $^
$(RANLIB) ../../$(TMGLIB)
$(SCATGEN): $(FRC)

View File

@ -33,8 +33,8 @@ LOADOPTS =
# The archiver and the flag(s) to use when building an archive
# (library). If your system has no ranlib, set RANLIB = echo.
#
ARCH = ar
ARCHFLAGS = cr
AR = ar
ARFLAGS = cr
RANLIB = ranlib
# Timer for the SECOND and DSECND routines

View File

@ -1,6 +1,6 @@
SHELL = /bin/sh
PLAT = _LINUX
DRVOPTS = $(NOOPT)
#ARCHFLAGS= $(ARFLAGS) -ru
#ARFLAGS= $(ARFLAGS) -ru
#RANLIB = ranlib