Skip to content

Commit 9a2a6a2

Browse files
authored
Merge pull request #4696 from frjohnst/restore_second
Revert PRs 4515 and 4520 (restore second, dsecnd)
2 parents 6ca9ffa + 87026ac commit 9a2a6a2

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

exports/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,6 @@ test : linktest.c
315315

316316
linktest.c : $(GENSYM) ../Makefile.system ../getarch.c
317317
./$(GENSYM) linktest $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > linktest.c
318-
ifeq ($(F_COMPILER), IBM)
319-
mv linktest.c linktest.c.FIRST
320-
egrep -v 'second_|dsecnd_' linktest.c.FIRST > linktest.c
321-
rm linktest.c.FIRST
322-
endif
323318

324319
clean ::
325320
@rm -f *.def *.dylib __.SYMDEF* *.renamed

lapack-netlib/SRC/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ SCLAUX = la_constants.o \
101101
slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \
102102
slasr.o slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \
103103
ssteqr.o ssterf.o slaisnan.o sisnan.o \
104-
slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o
105-
ifneq ($(F_COMPILER), IBM)
106-
SCLAUX += ../INSTALL/second_$(TIMER).o
107-
endif
104+
slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o \
105+
../INSTALL/second_$(TIMER).o
108106
endif
109107

110108
ifneq "$(or $(BUILD_DOUBLE),$(BUILD_COMPLEX16))" ""
@@ -126,10 +124,7 @@ DZLAUX = la_constants.o\
126124
dlasr.o dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \
127125
dsteqr.o dsterf.o dlaisnan.o disnan.o \
128126
dlartgp.o dlartgs.o ../INSTALL/droundup_lwork.o \
129-
../INSTALL/dlamch.o
130-
ifneq ($(F_COMPILER), IBM)
131-
DZLAUX += ../INSTALL/dsecnd_$(TIMER).o
132-
endif
127+
../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o
133128
endif
134129

135130
#ifeq ($(BUILD_SINGLE),1)

0 commit comments

Comments
 (0)