Skip to content

Commit 56d3d10

Browse files
committed
Revert "resolve second_ conflict which breaks xlf timef"
This reverts commit 9b24b31. It turns out that PRs 4515 and 4520 break the tests under lapack-netlib/TESTING which require SECOND and DSECND. IBM has decided this is a bigger biger problem than the conflict between lapack second_ and the xlf run time.
1 parent 6ca9ffa commit 56d3d10

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

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)