From 56d3d1039c945d630da3187a7e86d8c25b325340 Mon Sep 17 00:00:00 2001 From: frjohnst Date: Wed, 15 May 2024 09:44:29 -0400 Subject: [PATCH] Revert "resolve second_ conflict which breaks xlf timef" This reverts commit 9b24b3141985de115e6191b376b435117a32404a. 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. --- lapack-netlib/SRC/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 205a32d31..de2242701 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -101,10 +101,8 @@ SCLAUX = la_constants.o \ slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \ slasr.o slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \ ssteqr.o ssterf.o slaisnan.o sisnan.o \ - slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o -ifneq ($(F_COMPILER), IBM) -SCLAUX += ../INSTALL/second_$(TIMER).o -endif + slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o \ + ../INSTALL/second_$(TIMER).o endif ifneq "$(or $(BUILD_DOUBLE),$(BUILD_COMPLEX16))" "" @@ -126,10 +124,7 @@ DZLAUX = la_constants.o\ dlasr.o dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \ dsteqr.o dsterf.o dlaisnan.o disnan.o \ dlartgp.o dlartgs.o ../INSTALL/droundup_lwork.o \ - ../INSTALL/dlamch.o -ifneq ($(F_COMPILER), IBM) -DZLAUX += ../INSTALL/dsecnd_$(TIMER).o -endif + ../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o endif #ifeq ($(BUILD_SINGLE),1)