Gentoo Attachment #94883 for bug #144314

View | Details | Raw Unified
Collapse All | Expand All

(-) ATLAS.orig/CONFIG/src/Makefile (+16 lines)

Lines 310-312	Link Here

clean :

clean :

	rm -f *.o x*

	rm -f *.o x*

	$(MAKE) -f Make.top clean

	$(MAKE) -f Make.top clean

#Gentoo stuff:

shared :

	$(MAKE) -f Make.top shared

shared-strip :

	$(MAKE) -f Make.top shared-strip

ptshared :

	$(MAKE) -f Make.top ptshared

ptshared-strip :

	$(MAKE) -f Make.top ptshared-strip

liblapack.so :

	$(MAKE) -f Make.top liblapack.so

(-) ATLAS.orig/CONFIG/src/SpewMakeInc.c (+5 lines)

Lines 538-544	Link Here

   fprintf(fpout, "   NCFLAGS = $(ICCFLAGS)\n");

   fprintf(fpout, "   NCFLAGS = $(ICCFLAGS)\n");

   fprintf(fpout, "\n   CLINKER = $(ICC)\n   CLINKFLAGS = $(ICCFLAGS)\n");

   fprintf(fpout, "\n   CLINKER = $(ICC)\n   CLINKFLAGS = $(ICCFLAGS)\n");

   fprintf(fpout, "   FLINKER = $(F77)\n   FLINKFLAGS = $(F77FLAGS)\n");

   fprintf(fpout, "   FLINKER = $(F77)\n   FLINKFLAGS = $(F77FLAGS)\n");

#ifdef USE_LIBTOOL

   fprintf(fpout, "   LIBTOOL = libtool --mode=compile\n");

   fprintf(fpout, "   ARCHIVER = $(BLDdir)/war ar\n");

#else

   fprintf(fpout, "   ARCHIVER = ar\n");

   fprintf(fpout, "   ARCHIVER = ar\n");

#endif

   fprintf(fpout, "   ARFLAGS  = r\n");

   fprintf(fpout, "   ARFLAGS  = r\n");

   fprintf(fpout, "   RANLIB   = echo\n\n");

   fprintf(fpout, "   RANLIB   = echo\n\n");

(-) ATLAS.orig/makes/Make.aux (+7 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

SKC:=$(LIBTOOL) --tag=CC $(SKC)

DKC:=$(LIBTOOL) --tag=CC $(DKC)

mySRCdir = $(SRCdir)/src/auxil

mySRCdir = $(SRCdir)/src/auxil

ptobj = ATL_ptflushcache.o

ptobj = ATL_ptflushcache.o

Lines 114-125	Link Here

ATL_cputime.o : $(SYSdir)/ATL_cputime.o

ATL_cputime.o : $(SYSdir)/ATL_cputime.o

	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o

	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o

	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo

	ln -sf $(SYSdir)/.libs/ATL_cputime.o .libs/ATL_cputime.o

$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c

$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c

	cd $(SYSdir) ; $(MAKE) ATL_cputime.o

	cd $(SYSdir) ; $(MAKE) ATL_cputime.o

$(SYSdir)/ATL_cputime.c:

$(SYSdir)/ATL_cputime.c:

	cd $(SYSdir) ; $(MAKE) ATL_cputime.o

	cd $(SYSdir) ; $(MAKE) ATL_cputime.o

ATL_walltime.o : $(SYSdir)/ATL_walltime.o

ATL_walltime.o : $(SYSdir)/ATL_walltime.o

	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o

	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o

	ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo

	ln -sf $(SYSdir)/.libs/ATL_walltime.o .libs/ATL_walltime.o

$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c

$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c

	cd $(SYSdir) ; $(MAKE) ATL_walltime.o

	cd $(SYSdir) ; $(MAKE) ATL_walltime.o

$(SYSdir)/ATL_walltime.c:

$(SYSdir)/ATL_walltime.c:

(-) ATLAS.orig/makes/Make.cblas (+1 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:= $(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/interfaces/blas/C/src/

mySRCdir = $(SRCdir)/interfaces/blas/C/src/

aobj = cblas_xerbla.o cblas_errprn.o

aobj = cblas_xerbla.o cblas_errprn.o

(-) ATLAS.orig/makes/Make.f77blas (+2 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

F77:=$(LIBTOOL) --tag=F77 $(F77)

mySRCdir = $(SRCdir)/interfaces/blas/F77/src

mySRCdir = $(SRCdir)/interfaces/blas/F77/src

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.gpmm (+1 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm

mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm

all : lib

all : lib

(-) ATLAS.orig/makes/Make.l1ref (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/reference/level1

mySRCdir = $(SRCdir)/src/blas/reference/level1

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l1src (-50 / +53 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

SKC:=$(LIBTOOL) --tag=CC $(SKC)

DKC:=$(LIBTOOL) --tag=CC $(DKC)

mySRCdir = $(SRCdir)/src/blas/level1

mySRCdir = $(SRCdir)/src/blas/level1

sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o

sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o

Lines 17-45	Link Here

sgen :

sgen :

	$(MAKE) Make_srot

	$(MAKE) Make_srot

	$(MAKE) -f Make_srot lib

	$(MAKE) -f Make_srot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_saxpby

	$(MAKE) Make_saxpby

	$(MAKE) -f Make_saxpby lib

	$(MAKE) -f Make_saxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_scpsc

	$(MAKE) Make_scpsc

	$(MAKE) -f Make_scpsc lib

	$(MAKE) -f Make_scpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_sset

	$(MAKE) Make_sset

	$(MAKE) -f Make_sset lib

	$(MAKE) -f Make_sset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_snrm2

	$(MAKE) Make_snrm2

	$(MAKE) -f Make_snrm2 lib

	$(MAKE) -f Make_snrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_sasum

	$(MAKE) Make_sasum

	$(MAKE) -f Make_sasum lib

	$(MAKE) -f Make_sasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_sdot

	$(MAKE) Make_sdot

	$(MAKE) -f Make_sdot lib

	$(MAKE) -f Make_sdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_sswap

	$(MAKE) Make_sswap

	$(MAKE) -f Make_sswap lib

	$(MAKE) -f Make_sswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_sscal

	$(MAKE) Make_sscal

	$(MAKE) -f Make_sscal lib

	$(MAKE) -f Make_sscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_scopy

	$(MAKE) Make_scopy

	$(MAKE) -f Make_scopy lib

	$(MAKE) -f Make_scopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_saxpy

	$(MAKE) Make_saxpy

	$(MAKE) -f Make_saxpy lib

	$(MAKE) -f Make_saxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_siamax

	$(MAKE) Make_siamax

	$(MAKE) -f Make_siamax lib

	$(MAKE) -f Make_siamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

slvl1 : slib

slvl1 : slib

slib :   slib.grd

slib :   slib.grd

	$(MAKE) sgen

	$(MAKE) sgen

Lines 52-80	Link Here

	rm -f $(sobj) s*.grd

	rm -f $(sobj) s*.grd

dgen :

dgen :

	$(MAKE) Make_drot

	$(MAKE) Make_drot

	$(MAKE) -f Make_drot lib

	$(MAKE) -f Make_drot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_daxpby

	$(MAKE) Make_daxpby

	$(MAKE) -f Make_daxpby lib

	$(MAKE) -f Make_daxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dcpsc

	$(MAKE) Make_dcpsc

	$(MAKE) -f Make_dcpsc lib

	$(MAKE) -f Make_dcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dset

	$(MAKE) Make_dset

	$(MAKE) -f Make_dset lib

	$(MAKE) -f Make_dset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dnrm2

	$(MAKE) Make_dnrm2

	$(MAKE) -f Make_dnrm2 lib

	$(MAKE) -f Make_dnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dasum

	$(MAKE) Make_dasum

	$(MAKE) -f Make_dasum lib

	$(MAKE) -f Make_dasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_ddot

	$(MAKE) Make_ddot

	$(MAKE) -f Make_ddot lib

	$(MAKE) -f Make_ddot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dswap

	$(MAKE) Make_dswap

	$(MAKE) -f Make_dswap lib

	$(MAKE) -f Make_dswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dscal

	$(MAKE) Make_dscal

	$(MAKE) -f Make_dscal lib

	$(MAKE) -f Make_dscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_dcopy

	$(MAKE) Make_dcopy

	$(MAKE) -f Make_dcopy lib

	$(MAKE) -f Make_dcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_daxpy

	$(MAKE) Make_daxpy

	$(MAKE) -f Make_daxpy lib

	$(MAKE) -f Make_daxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_diamax

	$(MAKE) Make_diamax

	$(MAKE) -f Make_diamax lib

	$(MAKE) -f Make_diamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

dlvl1 : dlib

dlvl1 : dlib

dlib :   dlib.grd

dlib :   dlib.grd

	$(MAKE) dgen

	$(MAKE) dgen

Lines 87-117	Link Here

	rm -f $(dobj) d*.grd

	rm -f $(dobj) d*.grd

cgen :

cgen :

	$(MAKE) Make_crot

	$(MAKE) Make_crot

	$(MAKE) -f Make_crot lib

	$(MAKE) -f Make_crot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_caxpby

	$(MAKE) Make_caxpby

	$(MAKE) -f Make_caxpby lib

	$(MAKE) -f Make_caxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_ccpsc

	$(MAKE) Make_ccpsc

	$(MAKE) -f Make_ccpsc lib

	$(MAKE) -f Make_ccpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_cset

	$(MAKE) Make_cset

	$(MAKE) -f Make_cset lib

	$(MAKE) -f Make_cset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_cnrm2

	$(MAKE) Make_cnrm2

	$(MAKE) -f Make_cnrm2 lib

	$(MAKE) -f Make_cnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_casum

	$(MAKE) Make_casum

	$(MAKE) -f Make_casum lib

	$(MAKE) -f Make_casum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_cdot

	$(MAKE) Make_cdot

	$(MAKE) -f Make_cdot lib

	$(MAKE) -f Make_cdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_cswap

	$(MAKE) Make_cswap

	$(MAKE) -f Make_cswap lib

	$(MAKE) -f Make_cswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_cscal

	$(MAKE) Make_cscal

	$(MAKE) -f Make_cscal lib

	$(MAKE) -f Make_cscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_ccopy

	$(MAKE) Make_ccopy

	$(MAKE) -f Make_ccopy lib

	$(MAKE) -f Make_ccopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_caxpy

	$(MAKE) Make_caxpy

	$(MAKE) -f Make_caxpy lib

	$(MAKE) -f Make_caxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_ciamax

	$(MAKE) Make_ciamax

	$(MAKE) -f Make_ciamax lib

	$(MAKE) -f Make_ciamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_cdotc

	$(MAKE) Make_cdotc

	$(MAKE) -f Make_cdotc lib

	$(MAKE) -f Make_cdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

clvl1 : clib

clvl1 : clib

clib : slib clib.grd

clib : slib clib.grd

	$(MAKE) cgen

	$(MAKE) cgen

Lines 124-154	Link Here

	rm -f $(cobj) c*.grd

	rm -f $(cobj) c*.grd

zgen :

zgen :

	$(MAKE) Make_zrot

	$(MAKE) Make_zrot

	$(MAKE) -f Make_zrot lib

	$(MAKE) -f Make_zrot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zaxpby

	$(MAKE) Make_zaxpby

	$(MAKE) -f Make_zaxpby lib

	$(MAKE) -f Make_zaxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zcpsc

	$(MAKE) Make_zcpsc

	$(MAKE) -f Make_zcpsc lib

	$(MAKE) -f Make_zcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zset

	$(MAKE) Make_zset

	$(MAKE) -f Make_zset lib

	$(MAKE) -f Make_zset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_znrm2

	$(MAKE) Make_znrm2

	$(MAKE) -f Make_znrm2 lib

	$(MAKE) -f Make_znrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zasum

	$(MAKE) Make_zasum

	$(MAKE) -f Make_zasum lib

	$(MAKE) -f Make_zasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zdot

	$(MAKE) Make_zdot

	$(MAKE) -f Make_zdot lib

	$(MAKE) -f Make_zdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zswap

	$(MAKE) Make_zswap

	$(MAKE) -f Make_zswap lib

	$(MAKE) -f Make_zswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zscal

	$(MAKE) Make_zscal

	$(MAKE) -f Make_zscal lib

	$(MAKE) -f Make_zscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zcopy

	$(MAKE) Make_zcopy

	$(MAKE) -f Make_zcopy lib

	$(MAKE) -f Make_zcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zaxpy

	$(MAKE) Make_zaxpy

	$(MAKE) -f Make_zaxpy lib

	$(MAKE) -f Make_zaxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_ziamax

	$(MAKE) Make_ziamax

	$(MAKE) -f Make_ziamax lib

	$(MAKE) -f Make_ziamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(MAKE) Make_zdotc

	$(MAKE) Make_zdotc

	$(MAKE) -f Make_zdotc lib

	$(MAKE) -f Make_zdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

zlvl1 : zlib

zlvl1 : zlib

zlib : dlib zlib.grd

zlib : dlib zlib.grd

	$(MAKE) zgen

	$(MAKE) zgen

(-) ATLAS.orig/makes/Make.l2 (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/level2/

mySRCdir = $(SRCdir)/src/blas/level2/

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l2aux (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/level2/kernel

mySRCdir = $(SRCdir)/src/blas/level2/kernel

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l2ref (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/reference/level2

mySRCdir = $(SRCdir)/src/blas/reference/level2

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l2src (+1 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \

sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \

       ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \

       ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \

(-) ATLAS.orig/makes/Make.l3 (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/level3

mySRCdir = $(SRCdir)/src/blas/level3

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l3aux (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/level3/rblas

mySRCdir = $(SRCdir)/src/blas/level3/rblas

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l3kern (+1 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/level3/kernel

mySRCdir = $(SRCdir)/src/blas/level3/kernel

sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \

sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \

(-) ATLAS.orig/makes/Make.l3ptblas (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/pthreads/blas/level3

mySRCdir = $(SRCdir)/src/pthreads/blas/level3

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.l3ref (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/reference/level3

mySRCdir = $(SRCdir)/src/blas/reference/level3

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.miptblas (+1 lines)

Lines 43-48	Link Here

########################################################################

########################################################################

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/pthreads/misc

mySRCdir = $(SRCdir)/src/pthreads/misc

########################################################################

########################################################################

(-) ATLAS.orig/makes/Make.mmsrc (-4 / +7 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

SMC:=$(LIBTOOL) --tag=CC $(SMC)

DMC:=$(LIBTOOL) --tag=CC $(DMC)

mySRCdir = $(SRCdir)/src/blas/gemm

mySRCdir = $(SRCdir)/src/blas/gemm

$(INCAdir)/atlas_type.h :

$(INCAdir)/atlas_type.h :

Lines 82-88	Link Here

sclean :

sclean :

	rm -f $(sobj) s*.grd

	rm -f $(sobj) s*.grd

scleanuplib :

scleanuplib :

	cd KERNEL ; $(MAKE) -f sMakefile slib

	cd KERNEL ; $(MAKE) -f sMakefile slib SMC="$(SMC)"

slib :

slib :

	$(MAKE) auxillib scleanuplib susergemm

	$(MAKE) auxillib scleanuplib susergemm

Lines 205-211	Link Here

dclean :

dclean :

	rm -f $(dobj) d*.grd

	rm -f $(dobj) d*.grd

dcleanuplib :

dcleanuplib :

	cd KERNEL ; $(MAKE) -f dMakefile dlib

	cd KERNEL ; $(MAKE) -f dMakefile dlib DMC="$(DMC)"

dlib :

dlib :

	$(MAKE) auxillib dcleanuplib dusergemm

	$(MAKE) auxillib dcleanuplib dusergemm

Lines 328-334	Link Here

cclean :

cclean :

	rm -f $(cobj) c*.grd

	rm -f $(cobj) c*.grd

ccleanuplib :

ccleanuplib :

	cd KERNEL ; $(MAKE) -f cMakefile clib

	cd KERNEL ; $(MAKE) -f cMakefile clib SMC="$(SMC)"

clib :

clib :

	$(MAKE) auxillib ccleanuplib cusergemm

	$(MAKE) auxillib ccleanuplib cusergemm

Lines 515-521	Link Here

zclean :

zclean :

	rm -f $(zobj) z*.grd

	rm -f $(zobj) z*.grd

zcleanuplib :

zcleanuplib :

	cd KERNEL ; $(MAKE) -f zMakefile zlib

	cd KERNEL ; $(MAKE) -f zMakefile zlib DMC="$(DMC)"

zlib :

zlib :

	$(MAKE) auxillib zcleanuplib zusergemm

	$(MAKE) auxillib zcleanuplib zusergemm

(-) ATLAS.orig/makes/Make.mvsrc (-4 / +7 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

SKC:=$(LIBTOOL) --tag=CC $(SKC)

DKC:=$(LIBTOOL) --tag=CC $(DKC)

mySRCdir = $(SRCdir)/src/blas/gemv

mySRCdir = $(SRCdir)/src/blas/gemv

sobj = ATL_sgemv.o

sobj = ATL_sgemv.o

Lines 19-25	Link Here

clean : sclean dclean cclean zclean

clean : sclean dclean cclean zclean

dlib :

dlib :

	$(PMAKE) -f Make_dmv dlib

	$(PMAKE) -f Make_dmv dlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(PMAKE) dlib.grd

	$(PMAKE) dlib.grd

dlib.grd : $(dobj)

dlib.grd : $(dobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)

Lines 28-34	Link Here

dclean :

dclean :

	rm -f $(dobj) d*.grd

	rm -f $(dobj) d*.grd

slib :

slib :

	$(PMAKE) -f Make_smv slib

	$(PMAKE) -f Make_smv slib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(PMAKE) slib.grd

	$(PMAKE) slib.grd

slib.grd : $(sobj)

slib.grd : $(sobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)

Lines 37-43	Link Here

sclean :

sclean :

	rm -f $(sobj) s*.grd

	rm -f $(sobj) s*.grd

clib :

clib :

	$(PMAKE) -f Make_cmv clib

	$(PMAKE) -f Make_cmv clib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(PMAKE) clib.grd

	$(PMAKE) clib.grd

clib.grd : $(cobj)

clib.grd : $(cobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)

Lines 46-52	Link Here

cclean :

cclean :

	rm -f $(cobj) c*.grd

	rm -f $(cobj) c*.grd

zlib :

zlib :

	$(PMAKE) -f Make_zmv zlib

	$(PMAKE) -f Make_zmv zlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

	$(PMAKE) zlib.grd

	$(PMAKE) zlib.grd

zlib.grd : $(zobj)

zlib.grd : $(zobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

(-) ATLAS.orig/makes/Make.r1src (-4 / +7 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

SKC:=$(LIBTOOL) --tag=CC $(SKC)

DKC:=$(LIBTOOL) --tag=CC $(DKC)

mySRCdir = $(SRCdir)/src/blas/ger

mySRCdir = $(SRCdir)/src/blas/ger

sobj = ATL_sger.o

sobj = ATL_sger.o

Lines 17-23	Link Here

dlib :

dlib :

	$(PMAKE) dlib.grd

	$(PMAKE) dlib.grd

	$(PMAKE) -f Make_dr1 lib

	$(PMAKE) -f Make_dr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

dlib.grd : $(dobj)

dlib.grd : $(dobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)

	$(RANLIB) $(ATLASlib)

	$(RANLIB) $(ATLASlib)

Lines 26-32	Link Here

	rm -f $(dobj) d*.grd

	rm -f $(dobj) d*.grd

slib :

slib :

	$(PMAKE) slib.grd

	$(PMAKE) slib.grd

	$(PMAKE) -f Make_sr1 lib

	$(PMAKE) -f Make_sr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

slib.grd : $(sobj)

slib.grd : $(sobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)

	$(RANLIB) $(ATLASlib)

	$(RANLIB) $(ATLASlib)

Lines 35-41	Link Here

	rm -f $(sobj) s*.grd

	rm -f $(sobj) s*.grd

clib :

clib :

	$(PMAKE) clib.grd

	$(PMAKE) clib.grd

	$(PMAKE) -f Make_cr1 lib

	$(PMAKE) -f Make_cr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

clib.grd : $(cobj)

clib.grd : $(cobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)

	$(RANLIB) $(ATLASlib)

	$(RANLIB) $(ATLASlib)

Lines 44-50	Link Here

	rm -f $(cobj) c*.grd

	rm -f $(cobj) c*.grd

zlib :

zlib :

	$(PMAKE) zlib.grd

	$(PMAKE) zlib.grd

	$(PMAKE) -f Make_zr1 lib

	$(PMAKE) -f Make_zr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"

zlib.grd : $(zobj)

zlib.grd : $(zobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

	$(RANLIB) $(ATLASlib)

	$(RANLIB) $(ATLASlib)

(-) ATLAS.orig/makes/Make.sprk (+1 lines)

Lines 1-4	Link Here

include Make.inc

include Make.inc

ICC:=$(LIBTOOL) --tag=CC $(ICC)

mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk

mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk

all : lib

all : lib

(-) ATLAS.orig/makes/Make.sysinfo (-2 / +2 lines)

Lines 103-114	Link Here

ATL_cputime.c :

ATL_cputime.c :

	cp $(mySRCdir)/ATL_cputime.c .

	cp $(mySRCdir)/ATL_cputime.c .

ATL_cputime.o : ATL_cputime.c

ATL_cputime.o : ATL_cputime.c

	$(ICC) -c $(ICCFLAGS) ATL_cputime.c

	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_cputime.c

ATL_walltime.c :

ATL_walltime.c :

	cp $(mySRCdir)/ATL_walltime.c .

	cp $(mySRCdir)/ATL_walltime.c .

ATL_walltime.o : ATL_walltime.c

ATL_walltime.o : ATL_walltime.c

	$(ICC) -c $(ICCFLAGS) ATL_walltime.c

	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_walltime.c

ATL_Xwalltime.o : ATL_walltime.o

ATL_Xwalltime.o : ATL_walltime.o

	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c

	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c

(-) ATLAS.orig/Make.top (+82 lines)

Lines 297-299	Link Here

	- cp $(LIBdir)/libptf77blas.a $(INSTdir)/.

	- cp $(LIBdir)/libptf77blas.a $(INSTdir)/.

	- chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a

	- chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a

shared: INSTALLER = cp

shared: RPATH = /usr/lib/blas/atlas

shared: libatlas.so libblas.so libcblas.so

shared-strip: INSTALLER = install -s

shared-strip: RPATH = /usr/lib/blas/atlas

shared-strip: libatlas.so libblas.so libcblas.so

ptshared: INSTALLER = cp

ptshared: RPATH = /usr/lib/blas/threaded-atlas

ptshared: libptblas.so libptcblas.so

ptshared-strip: INSTALLER = install -s

ptshared-strip: RPATH = /usr/lib/blas/threaded-atlas

ptshared-strip: libptblas.so libptcblas.so

liblapack.so: RPATH = /usr/lib/lapack/atlas

libatlas.so:

	mkdir -p gentoo/libs

	@echo

	@echo Linking a really big library, please be patient...

	@echo

	cd gentoo/libatlas.a ; \

	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libatlas.la *.lo \

		-rpath /usr/lib ; \

	libtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs

# libg2c is part of GNU gcc. It is listed here as a dependency for the F77

# BLAS libraries in case the user wants to link with the libraries using

# the Intel Fortran Compiler. The issue is with xerbla.f, which calls the

# STOP instrinsic. Linking with ifc will result in undefined symbols like

# e_wsfe and others. These symbols are contained in libg2c. If you will not

# use ifc, you most likely want to remove the '-lg2c' from libblas.so

# and possibly libptblas.so. Of course, you can just remove -lg2c, and

# specify it explicitly when using ifc.

libblas.so:

	cd gentoo/libf77blas.a ; \

	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libblas.la \

		../libs/libatlas.la *.lo -rpath $(RPATH); \

	rm -f .libs/libblas.so.0.0.0; \

	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \

		-Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \

	libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs

libcblas.so:

	cd gentoo/libcblas.a ; \

	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libcblas.la \

		../libs/libatlas.la *.lo -rpath $(RPATH) ; \

	rm -f .libs/libcblas.so.0.0.0; \

	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \

		-Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \

	libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs

libptblas.so:

	mkdir -p gentoo/threaded-libs

	cd gentoo/libptf77blas.a ; \

	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libblas.la \

		../libs/libatlas.la *.lo -rpath $(RPATH); \

	rm -f .libs/libblas.so.0.0.0; \

	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \

		-Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \

	libtool --mode=install $(INSTALLER) libblas.la \

		$(BLDdir)/gentoo/threaded-libs

libptcblas.so:

	cd gentoo/libptcblas.a ; \

	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libcblas.la \

		../libs/libatlas.la *.lo -rpath $(RPATH); \

	rm -f .libs/libcblas.so.0.0.0; \

	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \

		-Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \

	libtool --mode=install $(INSTALLER) libcblas.la \

		$(BLDdir)/gentoo/threaded-libs

liblapack.so:

	mkdir -p gentoo/libs

	cd gentoo/liblapack.a ; \

	libtool --mode=link --tag=CC $(ICC) -o liblapack.la *.lo \

	        -rpath $(RPATH) -lblas -lcblas -latlas SHRD_LNK; \

	libtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs

(-) ATLAS.orig/tune/blas/gemm/emit_mm.c (-1 / +2 lines)

Lines 2433-2438	Link Here

   assert(fp);

   assert(fp);

   fprintf(fp, "include ../Make.inc\n\n");

   fprintf(fp, "include ../Make.inc\n\n");

   fprintf(fp, "CC:=$(LIBTOOL) --tag=CC $(CC)\n\n");

   fprintf(fp, "CDEFS2 = $(CDEFS)");

   fprintf(fp, "CDEFS2 = $(CDEFS)");

   for (i=0; i < 3; i++)

   for (i=0; i < 3; i++)

      if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);

      if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);

Lines 2512-2518	Link Here

                             wp->NBs[k], wp->imult, wp->fixed, betas[j]);

                             wp->NBs[k], wp->imult, wp->fixed, betas[j]);

                  else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);

                  else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);

                     fprintf(fp, "%s.o : %s.c \n", fnam, fnam);

                     fprintf(fp, "%s.o : %s.c \n", fnam, fnam);

                  fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",

                  fprintf(fp, "\t$(LIBTOOL) --tag=CC %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",

                          wp->CC, betas[j], wp->CCFLAGS, fnam);

                          wp->CC, betas[j], wp->CCFLAGS, fnam);

(-) ATLAS.orig/tune/blas/gemv/mvsearch.c (-3 / +3 lines)

Lines 512-518	Link Here

   fprintf(fp, "include Make.inc\n\n");

   fprintf(fp, "include Make.inc\n\n");

   if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR);

   if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR);

   else fprintf(fp, "MVNCC = %s\n", ccN);

   else fprintf(fp, "MVNCC = $(LIBTOOL) --tag=CC %s\n", ccN);

   if (ccN[0] == '\0' && ccflagsN[0] != '\0')

   if (ccN[0] == '\0' && ccflagsN[0] != '\0')

      fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",

      fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",

              UPR, ccflagsN, typ);

              UPR, ccflagsN, typ);

Lines 526-532	Link Here

   if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR);

   if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR);

   else fprintf(fp, "MVTCC = %s\n", ccT);

   else fprintf(fp, "MVTCC = $(LIBTOOL) --tag=CC %s\n", ccT);

   if (ccT[0] == '\0' && ccflagsT[0] != '\0')

   if (ccT[0] == '\0' && ccflagsT[0] != '\0')

      fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",

      fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",

              UPR, ccflagsT, typ);

              UPR, ccflagsT, typ);

Lines 540-546	Link Here

   if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR);

   if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR);

   else fprintf(fp, "MVSCC = %s\n", ccS);

   else fprintf(fp, "MVSCC = $(LIBTOOL) --tag=CC %s\n", ccS);

   if (ccS[0] == '\0' && ccflagsS[0] != '\0')

   if (ccS[0] == '\0' && ccflagsS[0] != '\0')

      fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s",

      fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s",

              UPR, ccflagsS, typ);

              UPR, ccflagsS, typ);

(-) ATLAS.orig/tune/blas/level1/asumsrch.c (-1 / +14 lines)

Lines 159-164	Link Here

   FILE *fpin;

   FILE *fpin;

   FILENODE *fbase, *fn, *fp=NULL;

   FILENODE *fbase, *fn, *fp=NULL;

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char temp[256];

   char *pcc, *pccflags;

   char *pcc, *pccflags;

   int i, n, ID, alpha, beta, incX, incY;

   int i, n, ID, alpha, beta, incX, incY;

Lines 180-186	Link Here

         assert(fgets(ccflags, 512, fpin) != NULL);

         assert(fgets(ccflags, 512, fpin) != NULL);

         FixFlags(cc);

         FixFlags(cc);

         FixFlags(ccflags);

         FixFlags(ccflags);

         pcc = cc;

/* Gentoo         pcc = cc; */

	 strcpy(temp, "$(LIBTOOL) --tag=CC ");

	 strcat(temp, cc);

	 pcc = temp;

         pccflags = ccflags;

         pccflags = ccflags;

      else pcc = pccflags = NULL;

      else pcc = pccflags = NULL;

Lines 575-580	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "asum";

   char *rout = "asum";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 611-616	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/axpbysrch.c (+9 lines)

Lines 902-907	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "axpby";

   char *rout = "axpby";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 938-943	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/axpysrch.c (+9 lines)

Lines 744-749	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "axpy";

   char *rout = "axpy";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 780-785	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/copysrch.c (-1 / +14 lines)

Lines 159-164	Link Here

   FILE *fpin;

   FILE *fpin;

   FILENODE *fbase, *fn, *fp=NULL;

   FILENODE *fbase, *fn, *fp=NULL;

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char temp[256];

   char *pcc, *pccflags;

   char *pcc, *pccflags;

   int i, n, ID, alpha, beta, incX, incY;

   int i, n, ID, alpha, beta, incX, incY;

Lines 180-186	Link Here

         assert(fgets(ccflags, 512, fpin) != NULL);

         assert(fgets(ccflags, 512, fpin) != NULL);

         FixFlags(cc);

         FixFlags(cc);

         FixFlags(ccflags);

         FixFlags(ccflags);

         pcc = cc;

/* Gentoo         pcc = cc; */

	 strcpy(temp, "$(LIBTOOL) --tag=CC ");

	 strcat(temp, cc);

	 pcc = temp;

         pccflags = ccflags;

         pccflags = ccflags;

      else pcc = pccflags = NULL;

      else pcc = pccflags = NULL;

Lines 673-678	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "copy";

   char *rout = "copy";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 709-714	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/cpscsrch.c (+9 lines)

Lines 753-758	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "cpsc";

   char *rout = "cpsc";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 789-794	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/dotsrch.c (+9 lines)

Lines 688-693	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "dot";

   char *rout = "dot";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 733-738	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/iamaxsrch.c (-1 / +14 lines)

Lines 159-164	Link Here

   FILE *fpin;

   FILE *fpin;

   FILENODE *fbase, *fn, *fp=NULL;

   FILENODE *fbase, *fn, *fp=NULL;

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char temp[256];

   char *pcc, *pccflags;

   char *pcc, *pccflags;

   int i, n, ID, alpha, beta, incX, incY;

   int i, n, ID, alpha, beta, incX, incY;

Lines 179-185	Link Here

         assert(fgets(ccflags, 512, fpin) != NULL);

         assert(fgets(ccflags, 512, fpin) != NULL);

         FixFlags(cc);

         FixFlags(cc);

         FixFlags(ccflags);

         FixFlags(ccflags);

         pcc = cc;

/* Gentoo         pcc = cc; */

	 strcpy(temp, "$(LIBTOOL) --tag=CC ");

	 strcat(temp, cc);

	 pcc = temp;

         pccflags = ccflags;

         pccflags = ccflags;

      else pcc = pccflags = NULL;

      else pcc = pccflags = NULL;

Lines 574-579	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "iamax";

   char *rout = "iamax";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 610-615	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/nrm2srch.c (+9 lines)

Lines 575-580	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "nrm2";

   char *rout = "nrm2";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 611-616	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/rotsrch.c (+9 lines)

Lines 838-843	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "rot";

   char *rout = "rot";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 874-879	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/scalsrch.c (+9 lines)

Lines 647-652	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "scal";

   char *rout = "scal";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 683-688	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/setsrch.c (-1 / +14 lines)

Lines 159-164	Link Here

   FILE *fpin;

   FILE *fpin;

   FILENODE *fbase, *fn, *fp=NULL;

   FILENODE *fbase, *fn, *fp=NULL;

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char ln[512], rout[256], auth[256], cc[256], ccflags[256];

   char temp[256];

   char *pcc, *pccflags;

   char *pcc, *pccflags;

   int i, n, ID, alpha, beta, incX, incY;

   int i, n, ID, alpha, beta, incX, incY;

Lines 181-187	Link Here

         assert(fgets(ccflags, 512, fpin) != NULL);

         assert(fgets(ccflags, 512, fpin) != NULL);

         FixFlags(cc);

         FixFlags(cc);

         FixFlags(ccflags);

         FixFlags(ccflags);

         pcc = cc;

/* Gentoo         pcc = cc; */

	 strcpy(temp, "$(LIBTOOL) --tag=CC ");

	 strcat(temp, cc);

	 pcc = temp;

         pccflags = ccflags;

         pccflags = ccflags;

      else pcc = pccflags = NULL;

      else pcc = pccflags = NULL;

Lines 631-636	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "set";

   char *rout = "set";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 667-672	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

(-) ATLAS.orig/tune/blas/level1/swapsrch.c (+9 lines)

Lines 673-678	Link Here

   char *cc, *ccflags, *nam, *typ="";

   char *cc, *ccflags, *nam, *typ="";

   char ln[32];

   char ln[32];

/* Gentoo */

   char temp[256];

/* end Gentoo */

   char *rout = "swap";

   char *rout = "swap";

   int i;

   int i;

   FILE *fpout;

   FILE *fpout;

Lines 709-714	Link Here

      cc = bp[i]->cc;

      cc = bp[i]->cc;

      ccflags = bp[i]->ccflags;

      ccflags = bp[i]->ccflags;

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

      if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)";

/* Gentoo */

      else {

	strcpy(temp, "$(LIBTOOL) --tag=CC ");

	strcat(temp, cc);

/* end Gentoo */

      if (!ccflags)

      if (!ccflags)

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

         ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

      fprintf(fpout, "%s.o : %s.c\n", nam, nam);

Attachment #94883: 3.7.15-shared-libs.patch for bug #144314