Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 144314 | Differences between
and this patch

Collapse All | Expand All

(-)ATLAS.orig/CONFIG/src/Makefile (+12 lines)
Lines 302-307 Link Here
302
	$(MAKE) -f Make.top sanity_test
302
	$(MAKE) -f Make.top sanity_test
303
pttest :
303
pttest :
304
	$(MAKE) -f Make.top ptsanity_test
304
	$(MAKE) -f Make.top ptsanity_test
305
shared :
306
	$(MAKE) -f Make.top shared arch=$(arch)
307
shared-strip :
308
	$(MAKE) -f Make.top shared-strip arch=$(arch)
309
ptshared :
310
	$(MAKE) -f Make.top ptshared arch=$(arch)
311
ptshared-strip :
312
	$(MAKE) -f Make.top ptshared-strip arch=$(arch)
313
liblapack.so :
314
	$(MAKE) -f Make.top liblapack.so arch=$(arch)
315
316
305
$(INCINSTdir) :
317
$(INCINSTdir) :
306
	mkdir -p $(INCINSTdir)
318
	mkdir -p $(INCINSTdir)
307
	chmod 0755 $(INCINSTdir)
319
	chmod 0755 $(INCINSTdir)
(-)ATLAS.orig/CONFIG/src/SpewMakeInc.c (-10 / +14 lines)
Lines 434-440 Link Here
434
      fprintf(fpout, "   PTCBLASlib = $(LIBdir)/libptcblas.a\n");
434
      fprintf(fpout, "   PTCBLASlib = $(LIBdir)/libptcblas.a\n");
435
      fprintf(fpout, "   PTF77BLASlib = $(LIBdir)/libptf77blas.a\n");
435
      fprintf(fpout, "   PTF77BLASlib = $(LIBdir)/libptf77blas.a\n");
436
   }
436
   }
437
   fprintf(fpout, "   LAPACKlib = $(LIBdir)/liblapack.a\n");
437
   fprintf(fpout, "   LAPACKlib = \n");
438
   fprintf(fpout, "   TESTlib = $(LIBdir)/libtstatlas.a\n\n");
438
   fprintf(fpout, "   TESTlib = $(LIBdir)/libtstatlas.a\n\n");
439
439
440
   fprintf(fpout, "#  -------------------------------------------\n");
440
   fprintf(fpout, "#  -------------------------------------------\n");
Lines 510-524 Link Here
510
   fprintf(fpout, "\n\n");
510
   fprintf(fpout, "\n\n");
511
   for (i=0; i < NCOMP; i++)
511
   for (i=0; i < NCOMP; i++)
512
   {
512
   {
513
      fprintf(fpout, "   %s = %s\n", COMPNAME[i], comps[i]);
514
      if (i == F77_)
513
      if (i == F77_)
515
         fprintf(fpout, "   %sFLAGS = %s\n", COMPNAME[i], comps[NCOMP+i]);
514
	fprintf(fpout, "   %s = GENTOO_FORTRAN\n", COMPNAME[i]);
515
      else 
516
	fprintf(fpout, "   %s = GENTOO_GCC\n", COMPNAME[i]);
517
      if (i == F77_)
518
         fprintf(fpout, "   %sFLAGS = GENTOO_FFLAGS\n", COMPNAME[i]);
516
      else if (i == ICC_ || i == XCC_)
519
      else if (i == ICC_ || i == XCC_)
517
         fprintf(fpout, "   %sFLAGS = $(CDEFS) %s\n",
520
         fprintf(fpout, "   %sFLAGS = $(CDEFS) GENTOO_CFLAGS\n",
518
                 COMPNAME[i], comps[NCOMP+i]);
521
                 COMPNAME[i]);
519
      else /* non-interf comps don't include CDEFS by default (added later) */
522
      else /* non-interf comps don't include CDEFS by default (added later) */
520
         fprintf(fpout, "   %sFLAGS = %s\n",
523
         fprintf(fpout, "   %sFLAGS = GENTOO_CFLAGS\n",
521
                 COMPNAME[i], comps[NCOMP+i]);
524
                 COMPNAME[i]);
522
   }
525
   }
523
   for (i=0; i < NCOMP; i++)
526
   for (i=0; i < NCOMP; i++)
524
   {
527
   {
Lines 529-542 Link Here
529
         break;
532
         break;
530
   }
533
   }
531
   if (j < NCOMP)
534
   if (j < NCOMP)
532
      fprintf(fpout, "   GOODGCC = %s\n", comps[j]);
535
      fprintf(fpout, "   GOODGCC = GENTOO_GCC\n");
533
   else
536
   else
534
      fprintf(fpout, "   GOODGCC = gcc\n");
537
      fprintf(fpout, "   GOODGCC = GENTOO_GCC\n");
535
   fprintf(fpout, "   BC = $(ICC)\n");
538
   fprintf(fpout, "   BC = $(ICC)\n");
536
   fprintf(fpout, "   NCFLAGS = $(ICCFLAGS)\n");
539
   fprintf(fpout, "   NCFLAGS = $(ICCFLAGS)\n");
537
   fprintf(fpout, "\n   CLINKER = $(ICC)\n   CLINKFLAGS = $(ICCFLAGS)\n");
540
   fprintf(fpout, "\n   CLINKER = $(ICC)\n   CLINKFLAGS = $(ICCFLAGS)\n");
538
   fprintf(fpout, "   FLINKER = $(F77)\n   FLINKFLAGS = $(F77FLAGS)\n");
541
   fprintf(fpout, "   FLINKER = $(F77)\n   FLINKFLAGS = $(F77FLAGS)\n");
539
   fprintf(fpout, "   ARCHIVER = ar\n");
542
    fprintf(fpout, "   LIBTOOL = libtool --mode=compile\n");
543
    fprintf(fpout, "   ARCHIVER = $(BLDdir)/war ar\n");
540
   fprintf(fpout, "   ARFLAGS  = r\n");
544
   fprintf(fpout, "   ARFLAGS  = r\n");
541
   fprintf(fpout, "   RANLIB   = echo\n\n");
545
   fprintf(fpout, "   RANLIB   = echo\n\n");
542
546
(-)ATLAS.orig/include/contrib/camm_dpa.h (-1 / +1 lines)
Lines 1485-1491 Link Here
1485
    NO_INLINE
1485
    NO_INLINE
1486
    unsigned u1=stride*sizeof(*fixm),u2=lda*sizeof(*a),u3=len*sizeof(*movm)/sizeof(float);
1486
    unsigned u1=stride*sizeof(*fixm),u2=lda*sizeof(*a),u3=len*sizeof(*movm)/sizeof(float);
1487
1487
1488
    ASM (
1488
    ASM VOLATILE (
1489
1489
1490
	 "pushl %%ebx\n\t"
1490
	 "pushl %%ebx\n\t"
1491
	 a(4,sp)
1491
	 a(4,sp)
(-)ATLAS.orig/makes/Make.aux (+11 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/auxil
2
mySRCdir = $(SRCdir)/src/auxil
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
4
ptobj = ATL_ptflushcache.o
11
ptobj = ATL_ptflushcache.o
5
obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \
12
obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \
6
      ATL_buildinfo.o ATL_sgemove.o ATL_sgecopy.o ATL_sgezero.o ATL_sgeadd.o \
13
      ATL_buildinfo.o ATL_sgemove.o ATL_sgecopy.o ATL_sgezero.o ATL_sgeadd.o \
Lines 114-125 Link Here
114
121
115
ATL_cputime.o : $(SYSdir)/ATL_cputime.o
122
ATL_cputime.o : $(SYSdir)/ATL_cputime.o
116
	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
123
	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
124
	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo
125
	ln -sf $(SYSdir)/.libs/ATL_cputime.o .libs/ATL_cputime.o
117
$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c
126
$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c
118
	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
127
	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
119
$(SYSdir)/ATL_cputime.c:
128
$(SYSdir)/ATL_cputime.c:
120
	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
129
	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
121
ATL_walltime.o : $(SYSdir)/ATL_walltime.o
130
ATL_walltime.o : $(SYSdir)/ATL_walltime.o
122
	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o
131
	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o
132
	ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo
133
	ln -sf $(SYSdir)/.libs/ATL_walltime.o .libs/ATL_walltime.o
123
$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
134
$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
124
	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
135
	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
125
$(SYSdir)/ATL_walltime.c:
136
$(SYSdir)/ATL_walltime.c:
(-)ATLAS.orig/makes/Make.bin (-5 / +5 lines)
Lines 58-68 Link Here
58
	cd $(BLDdir)/src/blas/level3 ; $(MAKE) lib
58
	cd $(BLDdir)/src/blas/level3 ; $(MAKE) lib
59
	cd $(BLDdir)/src/blas/pklevel3 ; $(MAKE) lib
59
	cd $(BLDdir)/src/blas/pklevel3 ; $(MAKE) lib
60
	cd $(BLDdir)/src/blas/reference/level3 ; $(MAKE) lib
60
	cd $(BLDdir)/src/blas/reference/level3 ; $(MAKE) lib
61
	cd $(BLDdir)/src/lapack ; $(MAKE) lib
61
#	cd $(BLDdir)/src/lapack ; $(MAKE) lib
62
	cd $(BLDdir)/interfaces/blas/C/src ; $(MAKE) all
62
	cd $(BLDdir)/interfaces/blas/C/src ; $(MAKE) all
63
	- cd $(BLDdir)/interfaces/blas/F77/src ; $(MAKE) lib
63
	- cd $(BLDdir)/interfaces/blas/F77/src ; $(MAKE) lib
64
	cd $(BLDdir)/interfaces/lapack/C/src ; $(MAKE) lib
64
#	cd $(BLDdir)/interfaces/lapack/C/src ; $(MAKE) lib
65
	- cd $(BLDdir)/interfaces/lapack/F77/src ; $(MAKE) lib
65
#	- cd $(BLDdir)/interfaces/lapack/F77/src ; $(MAKE) lib
66
66
67
IPostTune:
67
IPostTune:
68
	cd $(L3Tdir) ; $(MAKE) res/atlas_trsmNB.h
68
	cd $(L3Tdir) ; $(MAKE) res/atlas_trsmNB.h
Lines 783-789 Link Here
783
	cd $(L1Bdir) ; $(MAKE) slvl1
783
	cd $(L1Bdir) ; $(MAKE) slvl1
784
784
785
slapack :
785
slapack :
786
	cd $(BLDdir)/src/lapack ; $(MAKE) slib
786
#	cd $(BLDdir)/src/lapack ; $(MAKE) slib
787
787
788
xsprintblk : sprintblk.o
788
xsprintblk : sprintblk.o
789
	$(CLINKER) -o $@ sprintblk.o $(ATLASlib)
789
	$(CLINKER) -o $@ sprintblk.o $(ATLASlib)
Lines 1363-1369 Link Here
1363
	cd $(L1Bdir) ; $(MAKE) dlvl1
1363
	cd $(L1Bdir) ; $(MAKE) dlvl1
1364
1364
1365
dlapack :
1365
dlapack :
1366
	cd $(BLDdir)/src/lapack ; $(MAKE) dlib
1366
#	cd $(BLDdir)/src/lapack ; $(MAKE) dlib
1367
1367
1368
xdprintblk : dprintblk.o
1368
xdprintblk : dprintblk.o
1369
	$(CLINKER) -o $@ dprintblk.o $(ATLASlib)
1369
	$(CLINKER) -o $@ dprintblk.o $(ATLASlib)
(-)ATLAS.orig/makes/Make.cblas (+3 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/interfaces/blas/C/src/
2
mySRCdir = $(SRCdir)/interfaces/blas/C/src/
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
6
4
aobj = cblas_xerbla.o cblas_errprn.o
7
aobj = cblas_xerbla.o cblas_errprn.o
5
sptlvl3obj = cblas_sptgemm.o cblas_sptsymm.o cblas_sptsyr2k.o cblas_sptsyrk.o \
8
sptlvl3obj = cblas_sptgemm.o cblas_sptsymm.o cblas_sptsyr2k.o cblas_sptsyrk.o \
6
             cblas_spttrmm.o cblas_spttrsm.o
9
             cblas_spttrmm.o cblas_spttrsm.o
(-)ATLAS.orig/makes/Make.Clp (+7 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/interfaces/lapack/C/src
2
mySRCdir = $(SRCdir)/interfaces/lapack/C/src
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
4
sobj = clapack_sgesv.o clapack_sgetrf.o clapack_sgetri.o clapack_sgetrs.o \
11
sobj = clapack_sgesv.o clapack_sgetrf.o clapack_sgetri.o clapack_sgetrs.o \
5
       clapack_slauum.o clapack_sposv.o clapack_spotrf.o clapack_spotri.o \
12
       clapack_slauum.o clapack_sposv.o clapack_spotrf.o clapack_spotri.o \
6
       clapack_spotrs.o clapack_strtri.o
13
       clapack_spotrs.o clapack_strtri.o
(-)ATLAS.orig/makes/Make.f77blas (+4 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/interfaces/blas/F77/src
46
mySRCdir = $(SRCdir)/interfaces/blas/F77/src
47
48
ICC:=$(LIBTOOL) --tag=CC $(ICC)
49
F77:=$(LIBTOOL) --tag=F77 $(F77)
50
47
#
51
#
48
########################################################################
52
########################################################################
49
#
53
#
(-)ATLAS.orig/makes/Make.Flp (+8 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/interfaces/lapack/F77/src
2
mySRCdir = $(SRCdir)/interfaces/lapack/F77/src
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
F77:=$(LIBTOOL) --tag=F77 $(F77)
11
4
sobj = ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o ATL_f77wrap_sgetrf.o \
12
sobj = ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o ATL_f77wrap_sgetrf.o \
5
       ATL_f77wrap_sgetri.o ATL_f77wrap_sgetrs.o ATL_f77wrap_slauum.o \
13
       ATL_f77wrap_sgetri.o ATL_f77wrap_sgetrs.o ATL_f77wrap_slauum.o \
6
       ATL_f77wrap_sposv.o ATL_f77wrap_spotrf.o ATL_f77wrap_spotrs.o \
14
       ATL_f77wrap_sposv.o ATL_f77wrap_spotrf.o ATL_f77wrap_spotrs.o \
(-)ATLAS.orig/makes/Make.gpmm (+2 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm
2
mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
4
all : lib
6
all : lib
5
lib : dlib slib zlib clib
7
lib : dlib slib zlib clib
6
clean : sclean dclean cclean zclean
8
clean : sclean dclean cclean zclean
(-)ATLAS.orig/makes/Make.l1ptblas (+7 lines)
Lines 1-3 Link Here
1
ICC:=$(LIBTOOL) --tag=CC $(ICC)
2
SMC:=$(LIBTOOL) --tag=CC $(SMC)
3
DMC:=$(LIBTOOL) --tag=CC $(DMC)
4
SKC:=$(LIBTOOL) --tag=CC $(SKC)
5
DKC:=$(LIBTOOL) --tag=CC $(DKC)
6
XCC:=$(LIBTOOL) --tag=CC $(XCC)
7
1
slib:
8
slib:
2
dlib:
9
dlib:
3
clib:
10
clib:
(-)ATLAS.orig/makes/Make.l1ref (+4 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/reference/level1
46
mySRCdir = $(SRCdir)/src/blas/reference/level1
47
48
ICC:=$(LIBTOOL) --tag=CC $(ICC)
49
50
47
#
51
#
48
########################################################################
52
########################################################################
49
#
53
#
(-)ATLAS.orig/makes/Make.l1src (-50 / +54 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/level1
2
mySRCdir = $(SRCdir)/src/blas/level1
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SKC:=$(LIBTOOL) --tag=CC $(SKC)
6
DKC:=$(LIBTOOL) --tag=CC $(DKC)
7
4
sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o
8
sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o
5
9
6
dobj = ATL_drotg.o ATL_drotm.o ATL_drotmg.o
10
dobj = ATL_drotg.o ATL_drotm.o ATL_drotmg.o
Lines 17-45 Link Here
17
21
18
sgen :
22
sgen :
19
	$(MAKE) Make_srot
23
	$(MAKE) Make_srot
20
	$(MAKE) -f Make_srot lib
24
	$(MAKE) -f Make_srot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
21
	$(MAKE) Make_saxpby
25
	$(MAKE) Make_saxpby
22
	$(MAKE) -f Make_saxpby lib
26
	$(MAKE) -f Make_saxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
23
	$(MAKE) Make_scpsc
27
	$(MAKE) Make_scpsc
24
	$(MAKE) -f Make_scpsc lib
28
	$(MAKE) -f Make_scpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
25
	$(MAKE) Make_sset
29
	$(MAKE) Make_sset
26
	$(MAKE) -f Make_sset lib
30
	$(MAKE) -f Make_sset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
27
	$(MAKE) Make_snrm2
31
	$(MAKE) Make_snrm2
28
	$(MAKE) -f Make_snrm2 lib
32
	$(MAKE) -f Make_snrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
29
	$(MAKE) Make_sasum
33
	$(MAKE) Make_sasum
30
	$(MAKE) -f Make_sasum lib
34
	$(MAKE) -f Make_sasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
31
	$(MAKE) Make_sdot
35
	$(MAKE) Make_sdot
32
	$(MAKE) -f Make_sdot lib
36
	$(MAKE) -f Make_sdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
33
	$(MAKE) Make_sswap
37
	$(MAKE) Make_sswap
34
	$(MAKE) -f Make_sswap lib
38
	$(MAKE) -f Make_sswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
35
	$(MAKE) Make_sscal
39
	$(MAKE) Make_sscal
36
	$(MAKE) -f Make_sscal lib
40
	$(MAKE) -f Make_sscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
37
	$(MAKE) Make_scopy
41
	$(MAKE) Make_scopy
38
	$(MAKE) -f Make_scopy lib
42
	$(MAKE) -f Make_scopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
39
	$(MAKE) Make_saxpy
43
	$(MAKE) Make_saxpy
40
	$(MAKE) -f Make_saxpy lib
44
	$(MAKE) -f Make_saxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
41
	$(MAKE) Make_siamax
45
	$(MAKE) Make_siamax
42
	$(MAKE) -f Make_siamax lib
46
	$(MAKE) -f Make_siamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
43
slvl1 : slib
47
slvl1 : slib
44
slib :   slib.grd
48
slib :   slib.grd
45
	$(MAKE) sgen
49
	$(MAKE) sgen
Lines 52-80 Link Here
52
	rm -f $(sobj) s*.grd
56
	rm -f $(sobj) s*.grd
53
dgen :
57
dgen :
54
	$(MAKE) Make_drot
58
	$(MAKE) Make_drot
55
	$(MAKE) -f Make_drot lib
59
	$(MAKE) -f Make_drot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
56
	$(MAKE) Make_daxpby
60
	$(MAKE) Make_daxpby
57
	$(MAKE) -f Make_daxpby lib
61
	$(MAKE) -f Make_daxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
58
	$(MAKE) Make_dcpsc
62
	$(MAKE) Make_dcpsc
59
	$(MAKE) -f Make_dcpsc lib
63
	$(MAKE) -f Make_dcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
60
	$(MAKE) Make_dset
64
	$(MAKE) Make_dset
61
	$(MAKE) -f Make_dset lib
65
	$(MAKE) -f Make_dset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
62
	$(MAKE) Make_dnrm2
66
	$(MAKE) Make_dnrm2
63
	$(MAKE) -f Make_dnrm2 lib
67
	$(MAKE) -f Make_dnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
64
	$(MAKE) Make_dasum
68
	$(MAKE) Make_dasum
65
	$(MAKE) -f Make_dasum lib
69
	$(MAKE) -f Make_dasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
66
	$(MAKE) Make_ddot
70
	$(MAKE) Make_ddot
67
	$(MAKE) -f Make_ddot lib
71
	$(MAKE) -f Make_ddot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
68
	$(MAKE) Make_dswap
72
	$(MAKE) Make_dswap
69
	$(MAKE) -f Make_dswap lib
73
	$(MAKE) -f Make_dswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
70
	$(MAKE) Make_dscal
74
	$(MAKE) Make_dscal
71
	$(MAKE) -f Make_dscal lib
75
	$(MAKE) -f Make_dscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
72
	$(MAKE) Make_dcopy
76
	$(MAKE) Make_dcopy
73
	$(MAKE) -f Make_dcopy lib
77
	$(MAKE) -f Make_dcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
74
	$(MAKE) Make_daxpy
78
	$(MAKE) Make_daxpy
75
	$(MAKE) -f Make_daxpy lib
79
	$(MAKE) -f Make_daxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
76
	$(MAKE) Make_diamax
80
	$(MAKE) Make_diamax
77
	$(MAKE) -f Make_diamax lib
81
	$(MAKE) -f Make_diamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
78
dlvl1 : dlib
82
dlvl1 : dlib
79
dlib :   dlib.grd
83
dlib :   dlib.grd
80
	$(MAKE) dgen
84
	$(MAKE) dgen
Lines 87-117 Link Here
87
	rm -f $(dobj) d*.grd
91
	rm -f $(dobj) d*.grd
88
cgen :
92
cgen :
89
	$(MAKE) Make_crot
93
	$(MAKE) Make_crot
90
	$(MAKE) -f Make_crot lib
94
	$(MAKE) -f Make_crot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
91
	$(MAKE) Make_caxpby
95
	$(MAKE) Make_caxpby
92
	$(MAKE) -f Make_caxpby lib
96
	$(MAKE) -f Make_caxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
93
	$(MAKE) Make_ccpsc
97
	$(MAKE) Make_ccpsc
94
	$(MAKE) -f Make_ccpsc lib
98
	$(MAKE) -f Make_ccpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
95
	$(MAKE) Make_cset
99
	$(MAKE) Make_cset
96
	$(MAKE) -f Make_cset lib
100
	$(MAKE) -f Make_cset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
97
	$(MAKE) Make_cnrm2
101
	$(MAKE) Make_cnrm2
98
	$(MAKE) -f Make_cnrm2 lib
102
	$(MAKE) -f Make_cnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
99
	$(MAKE) Make_casum
103
	$(MAKE) Make_casum
100
	$(MAKE) -f Make_casum lib
104
	$(MAKE) -f Make_casum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
101
	$(MAKE) Make_cdot
105
	$(MAKE) Make_cdot
102
	$(MAKE) -f Make_cdot lib
106
	$(MAKE) -f Make_cdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
103
	$(MAKE) Make_cswap
107
	$(MAKE) Make_cswap
104
	$(MAKE) -f Make_cswap lib
108
	$(MAKE) -f Make_cswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
105
	$(MAKE) Make_cscal
109
	$(MAKE) Make_cscal
106
	$(MAKE) -f Make_cscal lib
110
	$(MAKE) -f Make_cscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
107
	$(MAKE) Make_ccopy
111
	$(MAKE) Make_ccopy
108
	$(MAKE) -f Make_ccopy lib
112
	$(MAKE) -f Make_ccopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
109
	$(MAKE) Make_caxpy
113
	$(MAKE) Make_caxpy
110
	$(MAKE) -f Make_caxpy lib
114
	$(MAKE) -f Make_caxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
111
	$(MAKE) Make_ciamax
115
	$(MAKE) Make_ciamax
112
	$(MAKE) -f Make_ciamax lib
116
	$(MAKE) -f Make_ciamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
113
	$(MAKE) Make_cdotc
117
	$(MAKE) Make_cdotc
114
	$(MAKE) -f Make_cdotc lib
118
	$(MAKE) -f Make_cdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
115
clvl1 : clib
119
clvl1 : clib
116
clib : slib clib.grd
120
clib : slib clib.grd
117
	$(MAKE) cgen
121
	$(MAKE) cgen
Lines 124-154 Link Here
124
	rm -f $(cobj) c*.grd
128
	rm -f $(cobj) c*.grd
125
zgen :
129
zgen :
126
	$(MAKE) Make_zrot
130
	$(MAKE) Make_zrot
127
	$(MAKE) -f Make_zrot lib
131
	$(MAKE) -f Make_zrot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
128
	$(MAKE) Make_zaxpby
132
	$(MAKE) Make_zaxpby
129
	$(MAKE) -f Make_zaxpby lib
133
	$(MAKE) -f Make_zaxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
130
	$(MAKE) Make_zcpsc
134
	$(MAKE) Make_zcpsc
131
	$(MAKE) -f Make_zcpsc lib
135
	$(MAKE) -f Make_zcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
132
	$(MAKE) Make_zset
136
	$(MAKE) Make_zset
133
	$(MAKE) -f Make_zset lib
137
	$(MAKE) -f Make_zset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
134
	$(MAKE) Make_znrm2
138
	$(MAKE) Make_znrm2
135
	$(MAKE) -f Make_znrm2 lib
139
	$(MAKE) -f Make_znrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
136
	$(MAKE) Make_zasum
140
	$(MAKE) Make_zasum
137
	$(MAKE) -f Make_zasum lib
141
	$(MAKE) -f Make_zasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
138
	$(MAKE) Make_zdot
142
	$(MAKE) Make_zdot
139
	$(MAKE) -f Make_zdot lib
143
	$(MAKE) -f Make_zdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
140
	$(MAKE) Make_zswap
144
	$(MAKE) Make_zswap
141
	$(MAKE) -f Make_zswap lib
145
	$(MAKE) -f Make_zswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
142
	$(MAKE) Make_zscal
146
	$(MAKE) Make_zscal
143
	$(MAKE) -f Make_zscal lib
147
	$(MAKE) -f Make_zscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
144
	$(MAKE) Make_zcopy
148
	$(MAKE) Make_zcopy
145
	$(MAKE) -f Make_zcopy lib
149
	$(MAKE) -f Make_zcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
146
	$(MAKE) Make_zaxpy
150
	$(MAKE) Make_zaxpy
147
	$(MAKE) -f Make_zaxpy lib
151
	$(MAKE) -f Make_zaxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
148
	$(MAKE) Make_ziamax
152
	$(MAKE) Make_ziamax
149
	$(MAKE) -f Make_ziamax lib
153
	$(MAKE) -f Make_ziamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
150
	$(MAKE) Make_zdotc
154
	$(MAKE) Make_zdotc
151
	$(MAKE) -f Make_zdotc lib
155
	$(MAKE) -f Make_zdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
152
zlvl1 : zlib
156
zlvl1 : zlib
153
zlib : dlib zlib.grd
157
zlib : dlib zlib.grd
154
	$(MAKE) zgen
158
	$(MAKE) zgen
(-)ATLAS.orig/makes/Make.l1tune (-1 / +1 lines)
Lines 1221-1227 Link Here
1221
	./xaxpysrch -p c
1221
	./xaxpysrch -p c
1222
	cp -f GEN/* $(L1Bdir)/.
1222
	cp -f GEN/* $(L1Bdir)/.
1223
ATL_caxpy_stub.o : $(mySRCdir)/AXPY/axpy_stub.c
1223
ATL_caxpy_stub.o : $(mySRCdir)/AXPY/axpy_stub.c
1224
	$(ICC) $(ICCFLAGS) -DSCPLX -c -o $@ $(mySRCdir)/AXPY/axpy_stub.c
1224
	$(LIBTOOL) --tag=CC $(ICC) $(ICCFLAGS) -DSCPLX -c -o $@ $(mySRCdir)/AXPY/axpy_stub.c
1225
caxpytime.o : $(mySRCdir)/axpytime.c
1225
caxpytime.o : $(mySRCdir)/axpytime.c
1226
	$(ICC) $(ICCFLAGS) -o caxpytime.o -c -DSCPLX $(mySRCdir)/axpytime.c
1226
	$(ICC) $(ICCFLAGS) -o caxpytime.o -c -DSCPLX $(mySRCdir)/axpytime.c
1227
caxpytest.o : $(mySRCdir)/axpytest.c tstlib.grd
1227
caxpytest.o : $(mySRCdir)/axpytest.c tstlib.grd
(-)ATLAS.orig/makes/Make.l2 (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/level2/
46
mySRCdir = $(SRCdir)/src/blas/level2/
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.l2aux (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/level2/kernel
46
mySRCdir = $(SRCdir)/src/blas/level2/kernel
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.l2ptblas (+7 lines)
Lines 1-3 Link Here
1
ICC:=$(LIBTOOL) --tag=CC $(ICC)
2
SMC:=$(LIBTOOL) --tag=CC $(SMC)
3
DMC:=$(LIBTOOL) --tag=CC $(DMC)
4
SKC:=$(LIBTOOL) --tag=CC $(SKC)
5
DKC:=$(LIBTOOL) --tag=CC $(DKC)
6
XCC:=$(LIBTOOL) --tag=CC $(XCC)
7
1
slib:
8
slib:
2
dlib:
9
dlib:
3
clib:
10
clib:
(-)ATLAS.orig/makes/Make.l2ref (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/reference/level2
46
mySRCdir = $(SRCdir)/src/blas/reference/level2
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
# 
51
# 
(-)ATLAS.orig/makes/Make.l2src (+2 lines)
Lines 1-5 Link Here
1
include Make.inc
1
include Make.inc
2
2
3
ICC:=$(LIBTOOL) --tag=CC $(ICC)
4
3
sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \
5
sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \
4
       ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \
6
       ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \
5
       ATL_strmv.o ATL_strmvLN.o ATL_strmvLT.o ATL_strmvUN.o ATL_strmvUT.o
7
       ATL_strmv.o ATL_strmvLN.o ATL_strmvLT.o ATL_strmvUN.o ATL_strmvUT.o
(-)ATLAS.orig/makes/Make.l3 (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/level3
46
mySRCdir = $(SRCdir)/src/blas/level3
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.l3aux (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/level3/rblas
46
mySRCdir = $(SRCdir)/src/blas/level3/rblas
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.l3kern (+1 lines)
Lines 1-5 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/level3/kernel
2
mySRCdir = $(SRCdir)/src/blas/level3/kernel
3
ICC:=$(LIBTOOL) --tag=CC $(ICC)
3
4
4
sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \
5
sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \
5
       ATL_ssycopyU_aX.o ATL_ssymmLL.o ATL_ssymmLU.o ATL_ssymmRL.o \
6
       ATL_ssycopyU_aX.o ATL_ssymmLL.o ATL_ssymmLU.o ATL_ssymmRL.o \
(-)ATLAS.orig/makes/Make.l3ptblas (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/pthreads/blas/level3
46
mySRCdir = $(SRCdir)/src/pthreads/blas/level3
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.l3ref (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/blas/reference/level3
46
mySRCdir = $(SRCdir)/src/blas/reference/level3
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.l3tune (-12 / +12 lines)
Lines 33-48 Link Here
33
33
34
force_build :
34
force_build :
35
35
36
res/atlas_trsmNB.h : xgen_trsmnb res/sTRSM_NB res/dTRSM_NB
36
res/atlas_trsmNB.h : 
37
	./xgen_trsmnb
37
#	./xgen_trsmnb
38
	rm -f $(INCAdir)/atlas_trsmNB.h
38
#	rm -f $(INCAdir)/atlas_trsmNB.h
39
	cp res/atlas_trsmNB.h $(INCAdir)/.
39
#	cp res/atlas_trsmNB.h $(INCAdir)/.
40
xgen_trsmnb : $(mySRCdir)/gen_trsmnb.c
40
xgen_trsmnb : $(mySRCdir)/gen_trsmnb.c
41
	$(XCC) $(XCCFLAGS) -o $@ $(mySRCdir)/gen_trsmnb.c
41
	$(XCC) $(XCCFLAGS) -o $@ $(mySRCdir)/gen_trsmnb.c
42
42
43
res/sTRSM_NB :
43
res/sTRSM_NB :
44
	$(MAKE) xsinvtrsm
44
#	$(MAKE) xsinvtrsm
45
	$(ATLRUN) $(L3Tdir) xsinvtrsm
45
#	$(ATLRUN) $(L3Tdir) xsinvtrsm
46
xsinvtrsm : sinvtrsm.o ATL_strsm.o 
46
xsinvtrsm : sinvtrsm.o ATL_strsm.o 
47
	$(MAKE) sbindep
47
	$(MAKE) sbindep
48
	$(FLINKER) $(FCLINKFLAGS) -o $@ sinvtrsm.o ATL_strsm.o \
48
	$(FLINKER) $(FCLINKFLAGS) -o $@ sinvtrsm.o ATL_strsm.o \
Lines 57-64 Link Here
57
	$(ICC) -o $@ -c $(ICCFLAGS) -DSREAL $(mySRCdir)/ATL_trsm.c
57
	$(ICC) -o $@ -c $(ICCFLAGS) -DSREAL $(mySRCdir)/ATL_trsm.c
58
58
59
res/dTRSM_NB :
59
res/dTRSM_NB :
60
	$(MAKE) xdinvtrsm
60
#	$(MAKE) xdinvtrsm
61
	$(ATLRUN) $(L3Tdir) xdinvtrsm
61
#	$(ATLRUN) $(L3Tdir) xdinvtrsm
62
xdinvtrsm : dinvtrsm.o ATL_dtrsm.o 
62
xdinvtrsm : dinvtrsm.o ATL_dtrsm.o 
63
	$(MAKE) dbindep
63
	$(MAKE) dbindep
64
	$(FLINKER) $(FCLINKFLAGS) -o $@ dinvtrsm.o ATL_dtrsm.o \
64
	$(FLINKER) $(FCLINKFLAGS) -o $@ dinvtrsm.o ATL_dtrsm.o \
Lines 73-80 Link Here
73
	$(ICC) -o $@ -c $(ICCFLAGS) -DDREAL $(mySRCdir)/ATL_trsm.c
73
	$(ICC) -o $@ -c $(ICCFLAGS) -DDREAL $(mySRCdir)/ATL_trsm.c
74
74
75
res/cTRSM_NB :
75
res/cTRSM_NB :
76
	$(MAKE) xcinvtrsm
76
#	$(MAKE) xcinvtrsm
77
	$(ATLRUN) $(L3Tdir) xcinvtrsm
77
#	$(ATLRUN) $(L3Tdir) xcinvtrsm
78
xcinvtrsm : cinvtrsm.o ATL_ctrsm.o 
78
xcinvtrsm : cinvtrsm.o ATL_ctrsm.o 
79
	$(MAKE) cbindep
79
	$(MAKE) cbindep
80
	$(FLINKER) $(FCLINKFLAGS) -o $@ cinvtrsm.o ATL_ctrsm.o \
80
	$(FLINKER) $(FCLINKFLAGS) -o $@ cinvtrsm.o ATL_ctrsm.o \
Lines 89-96 Link Here
89
	$(ICC) -o $@ -c $(ICCFLAGS) -DSCPLX $(mySRCdir)/ATL_trsm.c
89
	$(ICC) -o $@ -c $(ICCFLAGS) -DSCPLX $(mySRCdir)/ATL_trsm.c
90
90
91
res/zTRSM_NB :
91
res/zTRSM_NB :
92
	$(MAKE) xzinvtrsm
92
#	$(MAKE) xzinvtrsm
93
	$(ATLRUN) $(L3Tdir) xzinvtrsm
93
#	$(ATLRUN) $(L3Tdir) xzinvtrsm
94
xzinvtrsm : zinvtrsm.o ATL_ztrsm.o 
94
xzinvtrsm : zinvtrsm.o ATL_ztrsm.o 
95
	$(MAKE) zbindep
95
	$(MAKE) zbindep
96
	$(FLINKER) $(FCLINKFLAGS) -o $@ zinvtrsm.o ATL_ztrsm.o \
96
	$(FLINKER) $(FCLINKFLAGS) -o $@ zinvtrsm.o ATL_ztrsm.o \
(-)ATLAS.orig/makes/Make.lpsrc (+7 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/lapack
2
mySRCdir = $(SRCdir)/src/lapack
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
4
all : lib
11
all : lib
5
lib : dlib slib zlib clib
12
lib : dlib slib zlib clib
6
clean : sclean dclean cclean zclean
13
clean : sclean dclean cclean zclean
(-)ATLAS.orig/makes/Make.miptblas (+2 lines)
Lines 44-49 Link Here
44
#
44
#
45
include Make.inc
45
include Make.inc
46
mySRCdir = $(SRCdir)/src/pthreads/misc
46
mySRCdir = $(SRCdir)/src/pthreads/misc
47
ICC:=$(LIBTOOL) --tag=CC $(ICC)
48
47
#
49
#
48
########################################################################
50
########################################################################
49
#
51
#
(-)ATLAS.orig/makes/Make.mmsrc (-4 / +5 lines)
Lines 1-5 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/gemm
2
mySRCdir = $(SRCdir)/src/blas/gemm
3
ICC:=$(LIBTOOL) --tag=CC $(ICC)
3
4
4
$(INCAdir)/atlas_type.h :
5
$(INCAdir)/atlas_type.h :
5
	cd $(SYSdir) ; $(MAKE) RunTyp
6
	cd $(SYSdir) ; $(MAKE) RunTyp
Lines 82-88 Link Here
82
sclean :
83
sclean :
83
	rm -f $(sobj) s*.grd
84
	rm -f $(sobj) s*.grd
84
scleanuplib :
85
scleanuplib :
85
	cd KERNEL ; $(MAKE) -f sMakefile slib
86
	cd KERNEL ; $(MAKE) -f sMakefile slib ICC="$(ICC)"
86
87
87
slib : 
88
slib : 
88
	$(MAKE) auxillib scleanuplib susergemm
89
	$(MAKE) auxillib scleanuplib susergemm
Lines 205-211 Link Here
205
dclean :
206
dclean :
206
	rm -f $(dobj) d*.grd
207
	rm -f $(dobj) d*.grd
207
dcleanuplib :
208
dcleanuplib :
208
	cd KERNEL ; $(MAKE) -f dMakefile dlib
209
	cd KERNEL ; $(MAKE) -f dMakefile dlib ICC="$(ICC)"
209
210
210
dlib : 
211
dlib : 
211
	$(MAKE) auxillib dcleanuplib dusergemm
212
	$(MAKE) auxillib dcleanuplib dusergemm
Lines 328-334 Link Here
328
cclean :
329
cclean :
329
	rm -f $(cobj) c*.grd
330
	rm -f $(cobj) c*.grd
330
ccleanuplib :
331
ccleanuplib :
331
	cd KERNEL ; $(MAKE) -f cMakefile clib
332
	cd KERNEL ; $(MAKE) -f cMakefile clib ICC="$(ICC)"
332
333
333
clib : 
334
clib : 
334
	$(MAKE) auxillib ccleanuplib cusergemm
335
	$(MAKE) auxillib ccleanuplib cusergemm
Lines 515-521 Link Here
515
zclean :
516
zclean :
516
	rm -f $(zobj) z*.grd
517
	rm -f $(zobj) z*.grd
517
zcleanuplib :
518
zcleanuplib :
518
	cd KERNEL ; $(MAKE) -f zMakefile zlib
519
	cd KERNEL ; $(MAKE) -f zMakefile zlib ICC="$(ICC)"
519
520
520
zlib : 
521
zlib : 
521
	$(MAKE) auxillib zcleanuplib zusergemm
522
	$(MAKE) auxillib zcleanuplib zusergemm
(-)ATLAS.orig/makes/Make.mvsrc (-4 / +12 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/gemv
2
mySRCdir = $(SRCdir)/src/blas/gemv
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
11
4
sobj = ATL_sgemv.o
12
sobj = ATL_sgemv.o
5
13
6
dobj = ATL_dgemv.o
14
dobj = ATL_dgemv.o
Lines 19-25 Link Here
19
clean : sclean dclean cclean zclean
27
clean : sclean dclean cclean zclean
20
28
21
dlib : 
29
dlib : 
22
	$(PMAKE) -f Make_dmv dlib
30
	$(PMAKE) -f Make_dmv dlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
23
	$(PMAKE) dlib.grd
31
	$(PMAKE) dlib.grd
24
dlib.grd : $(dobj)
32
dlib.grd : $(dobj)
25
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
33
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
Lines 28-34 Link Here
28
dclean : 
36
dclean : 
29
	rm -f $(dobj) d*.grd
37
	rm -f $(dobj) d*.grd
30
slib : 
38
slib : 
31
	$(PMAKE) -f Make_smv slib
39
	$(PMAKE) -f Make_smv slib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
32
	$(PMAKE) slib.grd
40
	$(PMAKE) slib.grd
33
slib.grd : $(sobj)
41
slib.grd : $(sobj)
34
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
42
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
Lines 37-43 Link Here
37
sclean : 
45
sclean : 
38
	rm -f $(sobj) s*.grd
46
	rm -f $(sobj) s*.grd
39
clib : 
47
clib : 
40
	$(PMAKE) -f Make_cmv clib
48
	$(PMAKE) -f Make_cmv clib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
41
	$(PMAKE) clib.grd
49
	$(PMAKE) clib.grd
42
clib.grd : $(cobj)
50
clib.grd : $(cobj)
43
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
51
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
Lines 46-52 Link Here
46
cclean : 
54
cclean : 
47
	rm -f $(cobj) c*.grd
55
	rm -f $(cobj) c*.grd
48
zlib : 
56
zlib : 
49
	$(PMAKE) -f Make_zmv zlib
57
	$(PMAKE) -f Make_zmv zlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
50
	$(PMAKE) zlib.grd
58
	$(PMAKE) zlib.grd
51
zlib.grd : $(zobj)
59
zlib.grd : $(zobj)
52
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
60
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
(-)ATLAS.orig/makes/Make.mvtune (-50 / +50 lines)
Lines 180-203 Link Here
180
ATL_ssymv.o : $(mySRCdir)/ATL_symv.c atlas_smvN.h atlas_smvS.h
180
ATL_ssymv.o : $(mySRCdir)/ATL_symv.c atlas_smvN.h atlas_smvS.h
181
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL $(mySRCdir)/ATL_symv.c
181
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL $(mySRCdir)/ATL_symv.c
182
ATL_sgemv.o : ATL_gemv.c atlas_smv.h atlas_smvN.h atlas_smvT.h
182
ATL_sgemv.o : ATL_gemv.c atlas_smv.h atlas_smvN.h atlas_smvT.h
183
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL ATL_gemv.c
183
	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL ATL_gemv.c
184
ATL_sgemvN_b0.o : ATL_sgemvN.c
184
ATL_sgemvN_b0.o : ATL_sgemvN.c
185
	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
185
	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
186
              -DSREAL -DBETA0 -DALPHA1 ATL_sgemvN.c
186
              -DSREAL -DBETA0 -DALPHA1 ATL_sgemvN.c
187
ATL_sgemvN_b1.o : ATL_sgemvN.c
187
ATL_sgemvN_b1.o : ATL_sgemvN.c
188
	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
188
	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
189
              -DSREAL -DBETA1 -DALPHA1 ATL_sgemvN.c
189
              -DSREAL -DBETA1 -DALPHA1 ATL_sgemvN.c
190
ATL_sgemvN_bX.o : ATL_sgemvN.c
190
ATL_sgemvN_bX.o : ATL_sgemvN.c
191
	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
191
	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
192
              -DSREAL -DBETAX -DALPHA1 ATL_sgemvN.c
192
              -DSREAL -DBETAX -DALPHA1 ATL_sgemvN.c
193
ATL_sgemvT_b0.o : ATL_sgemvT.c
193
ATL_sgemvT_b0.o : ATL_sgemvT.c
194
	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
194
	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
195
              -DSREAL -DBETA0 -DALPHA1 ATL_sgemvT.c
195
              -DSREAL -DBETA0 -DALPHA1 ATL_sgemvT.c
196
ATL_sgemvT_b1.o : ATL_sgemvT.c
196
ATL_sgemvT_b1.o : ATL_sgemvT.c
197
	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
197
	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
198
              -DSREAL -DBETA1 -DALPHA1 ATL_sgemvT.c
198
              -DSREAL -DBETA1 -DALPHA1 ATL_sgemvT.c
199
ATL_sgemvT_bX.o : ATL_sgemvT.c
199
ATL_sgemvT_bX.o : ATL_sgemvT.c
200
	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
200
	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
201
              -DSREAL -DBETAX -DALPHA1 ATL_sgemvT.c
201
              -DSREAL -DBETAX -DALPHA1 ATL_sgemvT.c
202
202
203
res/sMVRES : xmvsearch force_build
203
res/sMVRES : xmvsearch force_build
Lines 325-348 Link Here
325
ATL_dsymv.o : $(mySRCdir)/ATL_symv.c atlas_dmvN.h atlas_dmvS.h
325
ATL_dsymv.o : $(mySRCdir)/ATL_symv.c atlas_dmvN.h atlas_dmvS.h
326
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL $(mySRCdir)/ATL_symv.c
326
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL $(mySRCdir)/ATL_symv.c
327
ATL_dgemv.o : ATL_gemv.c atlas_dmv.h atlas_dmvN.h atlas_dmvT.h
327
ATL_dgemv.o : ATL_gemv.c atlas_dmv.h atlas_dmvN.h atlas_dmvT.h
328
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL ATL_gemv.c
328
	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL ATL_gemv.c
329
ATL_dgemvN_b0.o : ATL_dgemvN.c
329
ATL_dgemvN_b0.o : ATL_dgemvN.c
330
	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
330
	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
331
              -DDREAL -DBETA0 -DALPHA1 ATL_dgemvN.c
331
              -DDREAL -DBETA0 -DALPHA1 ATL_dgemvN.c
332
ATL_dgemvN_b1.o : ATL_dgemvN.c
332
ATL_dgemvN_b1.o : ATL_dgemvN.c
333
	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
333
	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
334
              -DDREAL -DBETA1 -DALPHA1 ATL_dgemvN.c
334
              -DDREAL -DBETA1 -DALPHA1 ATL_dgemvN.c
335
ATL_dgemvN_bX.o : ATL_dgemvN.c
335
ATL_dgemvN_bX.o : ATL_dgemvN.c
336
	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
336
	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
337
              -DDREAL -DBETAX -DALPHA1 ATL_dgemvN.c
337
              -DDREAL -DBETAX -DALPHA1 ATL_dgemvN.c
338
ATL_dgemvT_b0.o : ATL_dgemvT.c
338
ATL_dgemvT_b0.o : ATL_dgemvT.c
339
	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
339
	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
340
              -DDREAL -DBETA0 -DALPHA1 ATL_dgemvT.c
340
              -DDREAL -DBETA0 -DALPHA1 ATL_dgemvT.c
341
ATL_dgemvT_b1.o : ATL_dgemvT.c
341
ATL_dgemvT_b1.o : ATL_dgemvT.c
342
	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
342
	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
343
              -DDREAL -DBETA1 -DALPHA1 ATL_dgemvT.c
343
              -DDREAL -DBETA1 -DALPHA1 ATL_dgemvT.c
344
ATL_dgemvT_bX.o : ATL_dgemvT.c
344
ATL_dgemvT_bX.o : ATL_dgemvT.c
345
	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
345
	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
346
              -DDREAL -DBETAX -DALPHA1 ATL_dgemvT.c
346
              -DDREAL -DBETAX -DALPHA1 ATL_dgemvT.c
347
347
348
res/dMVRES : xmvsearch force_build
348
res/dMVRES : xmvsearch force_build
Lines 464-519 Link Here
464
cgemvtune.o : $(mySRCdir)/gemvtune.c
464
cgemvtune.o : $(mySRCdir)/gemvtune.c
465
	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/gemvtune.c
465
	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/gemvtune.c
466
ATL_csymv.o : $(mySRCdir)/ATL_symv.c atlas_cmvN.h atlas_cmvS.h
466
ATL_csymv.o : $(mySRCdir)/ATL_symv.c atlas_cmvN.h atlas_cmvS.h
467
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ATL_symv.c
467
	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ATL_symv.c
468
ATL_cgemv.o : ATL_gemv.c atlas_cmv.h atlas_cmvN.h atlas_cmvT.h
468
ATL_cgemv.o : ATL_gemv.c atlas_cmv.h atlas_cmvN.h atlas_cmvT.h
469
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX ATL_gemv.c
469
	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX ATL_gemv.c
470
ATL_cgemvN_b0.o : ATL_cgemvN.c
470
ATL_cgemvN_b0.o : ATL_cgemvN.c
471
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
471
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
472
              -DSCPLX -DBETA0 -DALPHA1 ATL_cgemvN.c
472
              -DSCPLX -DBETA0 -DALPHA1 ATL_cgemvN.c
473
ATL_cgemvN_b1.o : ATL_cgemvN.c
473
ATL_cgemvN_b1.o : ATL_cgemvN.c
474
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
474
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
475
              -DSCPLX -DBETA1 -DALPHA1 ATL_cgemvN.c
475
              -DSCPLX -DBETA1 -DALPHA1 ATL_cgemvN.c
476
ATL_cgemvN_bX.o : ATL_cgemvN.c
476
ATL_cgemvN_bX.o : ATL_cgemvN.c
477
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
477
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
478
              -DSCPLX -DBETAX -DALPHA1 ATL_cgemvN.c
478
              -DSCPLX -DBETAX -DALPHA1 ATL_cgemvN.c
479
ATL_cgemvN_bXi0.o : ATL_cgemvN.c
479
ATL_cgemvN_bXi0.o : ATL_cgemvN.c
480
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
480
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
481
              -DSCPLX -DBETAXI0 -DALPHA1 ATL_cgemvN.c
481
              -DSCPLX -DBETAXI0 -DALPHA1 ATL_cgemvN.c
482
ATL_cgemvT_b0.o : ATL_cgemvT.c
482
ATL_cgemvT_b0.o : ATL_cgemvT.c
483
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
483
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
484
              -DSCPLX -DBETA0 -DALPHA1 ATL_cgemvT.c
484
              -DSCPLX -DBETA0 -DALPHA1 ATL_cgemvT.c
485
ATL_cgemvT_b1.o : ATL_cgemvT.c
485
ATL_cgemvT_b1.o : ATL_cgemvT.c
486
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
486
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
487
              -DSCPLX -DBETA1 -DALPHA1 ATL_cgemvT.c
487
              -DSCPLX -DBETA1 -DALPHA1 ATL_cgemvT.c
488
ATL_cgemvT_bX.o : ATL_cgemvT.c
488
ATL_cgemvT_bX.o : ATL_cgemvT.c
489
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
489
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
490
              -DSCPLX -DBETAX -DALPHA1 ATL_cgemvT.c
490
              -DSCPLX -DBETAX -DALPHA1 ATL_cgemvT.c
491
ATL_cgemvT_bXi0.o : ATL_cgemvT.c
491
ATL_cgemvT_bXi0.o : ATL_cgemvT.c
492
	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
492
	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
493
              -DSCPLX -DBETAXI0 -DALPHA1 ATL_cgemvT.c
493
              -DSCPLX -DBETAXI0 -DALPHA1 ATL_cgemvT.c
494
ATL_cgemvC_b0.o : ATL_cgemvT.c
494
ATL_cgemvC_b0.o : ATL_cgemvT.c
495
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
495
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
496
              -DSCPLX -DBETA0 -DALPHA1 -DConj_ ATL_cgemvT.c
496
              -DSCPLX -DBETA0 -DALPHA1 -DConj_ ATL_cgemvT.c
497
ATL_cgemvC_b1.o : ATL_cgemvT.c
497
ATL_cgemvC_b1.o : ATL_cgemvT.c
498
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
498
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
499
              -DSCPLX -DBETA1 -DALPHA1 -DConj_ ATL_cgemvT.c
499
              -DSCPLX -DBETA1 -DALPHA1 -DConj_ ATL_cgemvT.c
500
ATL_cgemvC_bX.o : ATL_cgemvT.c
500
ATL_cgemvC_bX.o : ATL_cgemvT.c
501
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
501
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
502
              -DSCPLX -DBETAX -DALPHA1 -DConj_ ATL_cgemvT.c
502
              -DSCPLX -DBETAX -DALPHA1 -DConj_ ATL_cgemvT.c
503
ATL_cgemvC_bXi0.o : ATL_cgemvT.c
503
ATL_cgemvC_bXi0.o : ATL_cgemvT.c
504
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
504
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
505
              -DSCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_cgemvT.c
505
              -DSCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_cgemvT.c
506
ATL_cgemvNc_b0.o : ATL_cgemvN.c
506
ATL_cgemvNc_b0.o : ATL_cgemvN.c
507
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
507
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
508
              -DSCPLX -DBETA0 -DALPHA1 -DConj_ ATL_cgemvN.c
508
              -DSCPLX -DBETA0 -DALPHA1 -DConj_ ATL_cgemvN.c
509
ATL_cgemvNc_b1.o : ATL_cgemvN.c
509
ATL_cgemvNc_b1.o : ATL_cgemvN.c
510
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
510
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
511
              -DSCPLX -DBETA1 -DALPHA1 -DConj_ ATL_cgemvN.c
511
              -DSCPLX -DBETA1 -DALPHA1 -DConj_ ATL_cgemvN.c
512
ATL_cgemvNc_bX.o : ATL_cgemvN.c
512
ATL_cgemvNc_bX.o : ATL_cgemvN.c
513
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
513
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
514
              -DSCPLX -DBETAX -DALPHA1 -DConj_ ATL_cgemvN.c
514
              -DSCPLX -DBETAX -DALPHA1 -DConj_ ATL_cgemvN.c
515
ATL_cgemvNc_bXi0.o : ATL_cgemvN.c
515
ATL_cgemvNc_bXi0.o : ATL_cgemvN.c
516
	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
516
	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
517
              -DSCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_cgemvN.c
517
              -DSCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_cgemvN.c
518
518
519
res/cMVRES : xmvsearch force_build
519
res/cMVRES : xmvsearch force_build
Lines 635-690 Link Here
635
zgemvtune.o : $(mySRCdir)/gemvtune.c
635
zgemvtune.o : $(mySRCdir)/gemvtune.c
636
	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/gemvtune.c
636
	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/gemvtune.c
637
ATL_zsymv.o : $(mySRCdir)/ATL_symv.c atlas_zmvN.h atlas_zmvS.h
637
ATL_zsymv.o : $(mySRCdir)/ATL_symv.c atlas_zmvN.h atlas_zmvS.h
638
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ATL_symv.c
638
	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ATL_symv.c
639
ATL_zgemv.o : ATL_gemv.c atlas_zmv.h atlas_zmvN.h atlas_zmvT.h
639
ATL_zgemv.o : ATL_gemv.c atlas_zmv.h atlas_zmvN.h atlas_zmvT.h
640
	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX ATL_gemv.c
640
	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX ATL_gemv.c
641
ATL_zgemvN_b0.o : ATL_zgemvN.c
641
ATL_zgemvN_b0.o : ATL_zgemvN.c
642
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
642
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
643
              -DDCPLX -DBETA0 -DALPHA1 ATL_zgemvN.c
643
              -DDCPLX -DBETA0 -DALPHA1 ATL_zgemvN.c
644
ATL_zgemvN_b1.o : ATL_zgemvN.c
644
ATL_zgemvN_b1.o : ATL_zgemvN.c
645
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
645
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
646
              -DDCPLX -DBETA1 -DALPHA1 ATL_zgemvN.c
646
              -DDCPLX -DBETA1 -DALPHA1 ATL_zgemvN.c
647
ATL_zgemvN_bX.o : ATL_zgemvN.c
647
ATL_zgemvN_bX.o : ATL_zgemvN.c
648
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
648
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
649
              -DDCPLX -DBETAX -DALPHA1 ATL_zgemvN.c
649
              -DDCPLX -DBETAX -DALPHA1 ATL_zgemvN.c
650
ATL_zgemvN_bXi0.o : ATL_zgemvN.c
650
ATL_zgemvN_bXi0.o : ATL_zgemvN.c
651
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
651
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
652
              -DDCPLX -DBETAXI0 -DALPHA1 ATL_zgemvN.c
652
              -DDCPLX -DBETAXI0 -DALPHA1 ATL_zgemvN.c
653
ATL_zgemvT_b0.o : ATL_zgemvT.c
653
ATL_zgemvT_b0.o : ATL_zgemvT.c
654
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
654
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
655
              -DDCPLX -DBETA0 -DALPHA1 ATL_zgemvT.c
655
              -DDCPLX -DBETA0 -DALPHA1 ATL_zgemvT.c
656
ATL_zgemvT_b1.o : ATL_zgemvT.c
656
ATL_zgemvT_b1.o : ATL_zgemvT.c
657
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
657
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
658
              -DDCPLX -DBETA1 -DALPHA1 ATL_zgemvT.c
658
              -DDCPLX -DBETA1 -DALPHA1 ATL_zgemvT.c
659
ATL_zgemvT_bX.o : ATL_zgemvT.c
659
ATL_zgemvT_bX.o : ATL_zgemvT.c
660
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
660
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
661
              -DDCPLX -DBETAX -DALPHA1 ATL_zgemvT.c
661
              -DDCPLX -DBETAX -DALPHA1 ATL_zgemvT.c
662
ATL_zgemvT_bXi0.o : ATL_zgemvT.c
662
ATL_zgemvT_bXi0.o : ATL_zgemvT.c
663
	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
663
	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
664
              -DDCPLX -DBETAXI0 -DALPHA1 ATL_zgemvT.c
664
              -DDCPLX -DBETAXI0 -DALPHA1 ATL_zgemvT.c
665
ATL_zgemvC_b0.o : ATL_zgemvT.c
665
ATL_zgemvC_b0.o : ATL_zgemvT.c
666
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
666
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
667
              -DDCPLX -DBETA0 -DALPHA1 -DConj_ ATL_zgemvT.c
667
              -DDCPLX -DBETA0 -DALPHA1 -DConj_ ATL_zgemvT.c
668
ATL_zgemvC_b1.o : ATL_zgemvT.c
668
ATL_zgemvC_b1.o : ATL_zgemvT.c
669
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
669
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
670
              -DDCPLX -DBETA1 -DALPHA1 -DConj_ ATL_zgemvT.c
670
              -DDCPLX -DBETA1 -DALPHA1 -DConj_ ATL_zgemvT.c
671
ATL_zgemvC_bX.o : ATL_zgemvT.c
671
ATL_zgemvC_bX.o : ATL_zgemvT.c
672
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
672
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
673
              -DDCPLX -DBETAX -DALPHA1 -DConj_ ATL_zgemvT.c
673
              -DDCPLX -DBETAX -DALPHA1 -DConj_ ATL_zgemvT.c
674
ATL_zgemvC_bXi0.o : ATL_zgemvT.c
674
ATL_zgemvC_bXi0.o : ATL_zgemvT.c
675
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
675
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
676
              -DDCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_zgemvT.c
676
              -DDCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_zgemvT.c
677
ATL_zgemvNc_b0.o : ATL_zgemvN.c
677
ATL_zgemvNc_b0.o : ATL_zgemvN.c
678
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
678
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
679
              -DDCPLX -DBETA0 -DALPHA1 -DConj_ ATL_zgemvN.c
679
              -DDCPLX -DBETA0 -DALPHA1 -DConj_ ATL_zgemvN.c
680
ATL_zgemvNc_b1.o : ATL_zgemvN.c
680
ATL_zgemvNc_b1.o : ATL_zgemvN.c
681
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
681
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
682
              -DDCPLX -DBETA1 -DALPHA1 -DConj_ ATL_zgemvN.c
682
              -DDCPLX -DBETA1 -DALPHA1 -DConj_ ATL_zgemvN.c
683
ATL_zgemvNc_bX.o : ATL_zgemvN.c
683
ATL_zgemvNc_bX.o : ATL_zgemvN.c
684
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
684
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
685
              -DDCPLX -DBETAX -DALPHA1 -DConj_ ATL_zgemvN.c
685
              -DDCPLX -DBETAX -DALPHA1 -DConj_ ATL_zgemvN.c
686
ATL_zgemvNc_bXi0.o : ATL_zgemvN.c
686
ATL_zgemvNc_bXi0.o : ATL_zgemvN.c
687
	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
687
	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
688
              -DDCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_zgemvN.c
688
              -DDCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_zgemvN.c
689
689
690
res/zMVRES : xmvsearch force_build
690
res/zMVRES : xmvsearch force_build
(-)ATLAS.orig/makes/Make.pkl3 (+8 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/pklevel3
2
mySRCdir = $(SRCdir)/src/blas/pklevel3
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
11
4
all : lib
12
all : lib
5
lib : dlib slib zlib clib
13
lib : dlib slib zlib clib
6
clean : sclean dclean cclean zclean
14
clean : sclean dclean cclean zclean
(-)ATLAS.orig/makes/Make.r1src (-4 / +12 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/ger
2
mySRCdir = $(SRCdir)/src/blas/ger
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
11
4
sobj = ATL_sger.o
12
sobj = ATL_sger.o
5
dobj = ATL_dger.o
13
dobj = ATL_dger.o
6
cobj = ATL_cgeru.o ATL_cgerc.o
14
cobj = ATL_cgeru.o ATL_cgerc.o
Lines 17-23 Link Here
17
25
18
dlib :
26
dlib :
19
	$(PMAKE) dlib.grd
27
	$(PMAKE) dlib.grd
20
	$(PMAKE) -f Make_dr1 lib
28
	$(PMAKE) -f Make_dr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
21
dlib.grd : $(dobj)
29
dlib.grd : $(dobj)
22
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
30
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
23
	$(RANLIB) $(ATLASlib)
31
	$(RANLIB) $(ATLASlib)
Lines 26-32 Link Here
26
	rm -f $(dobj) d*.grd
34
	rm -f $(dobj) d*.grd
27
slib :
35
slib :
28
	$(PMAKE) slib.grd
36
	$(PMAKE) slib.grd
29
	$(PMAKE) -f Make_sr1 lib
37
	$(PMAKE) -f Make_sr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
30
slib.grd : $(sobj)
38
slib.grd : $(sobj)
31
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
39
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
32
	$(RANLIB) $(ATLASlib)
40
	$(RANLIB) $(ATLASlib)
Lines 35-41 Link Here
35
	rm -f $(sobj) s*.grd
43
	rm -f $(sobj) s*.grd
36
clib :
44
clib :
37
	$(PMAKE) clib.grd
45
	$(PMAKE) clib.grd
38
	$(PMAKE) -f Make_cr1 lib
46
	$(PMAKE) -f Make_cr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
39
clib.grd : $(cobj)
47
clib.grd : $(cobj)
40
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
48
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
41
	$(RANLIB) $(ATLASlib)
49
	$(RANLIB) $(ATLASlib)
Lines 44-50 Link Here
44
	rm -f $(cobj) c*.grd
52
	rm -f $(cobj) c*.grd
45
zlib :
53
zlib :
46
	$(PMAKE) zlib.grd
54
	$(PMAKE) zlib.grd
47
	$(PMAKE) -f Make_zr1 lib
55
	$(PMAKE) -f Make_zr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
48
zlib.grd : $(zobj)
56
zlib.grd : $(zobj)
49
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
57
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
50
	$(RANLIB) $(ATLASlib)
58
	$(RANLIB) $(ATLASlib)
(-)ATLAS.orig/makes/Make.r1tune (-11 / +11 lines)
Lines 74-85 Link Here
74
ATL_sger.o : ATL_ger.c atlas_sr1.h
74
ATL_sger.o : ATL_ger.c atlas_sr1.h
75
	$(ICC) -c $(ICCFLAGS) -o $@ -DSREAL -I$(R1Tdir) ATL_ger.c
75
	$(ICC) -c $(ICCFLAGS) -o $@ -DSREAL -I$(R1Tdir) ATL_ger.c
76
ATL_sger1.o : ATL_sger1.c
76
ATL_sger1.o : ATL_sger1.c
77
	$(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1.c
77
	$(LIBTOOL) --tag=CC $(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1.c
78
ATL_sger1c.o : ATL_sger1.c
78
ATL_sger1c.o : ATL_sger1.c
79
	$(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL -DConj_ \
79
	$(LIBTOOL) --tag=CC $(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL -DConj_ \
80
              ATL_sger1.c
80
              ATL_sger1.c
81
ATL_sger1_dummy.o : ATL_sger1_dummy.c
81
ATL_sger1_dummy.o : ATL_sger1_dummy.c
82
	$(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1_dummy.c
82
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1_dummy.c
83
83
84
res/sR1RES : xr1search force_build
84
res/sR1RES : xr1search force_build
85
	./xr1search -p s
85
	./xr1search -p s
Lines 177-190 Link Here
177
cger1tune.o : $(mySRCdir)/ger1tune.c
177
cger1tune.o : $(mySRCdir)/ger1tune.c
178
	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ger1tune.c
178
	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ger1tune.c
179
ATL_cger.o : ATL_ger.c atlas_cr1.h
179
ATL_cger.o : ATL_ger.c atlas_cr1.h
180
	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX -I$(R1Tdir) ATL_ger.c
180
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX -I$(R1Tdir) ATL_ger.c
181
ATL_cger1.o : ATL_cger1.c
181
ATL_cger1.o : ATL_cger1.c
182
	$(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1.c
182
	$(LIBTOOL) --tag=CC $(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1.c
183
ATL_cger1c.o : ATL_cger1.c
183
ATL_cger1c.o : ATL_cger1.c
184
	$(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX -DConj_ \
184
	$(LIBTOOL) --tag=CC $(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX -DConj_ \
185
              ATL_cger1.c
185
              ATL_cger1.c
186
ATL_cger1_dummy.o : ATL_cger1_dummy.c
186
ATL_cger1_dummy.o : ATL_cger1_dummy.c
187
	$(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1_dummy.c
187
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1_dummy.c
188
188
189
res/cR1RES : xr1search force_build
189
res/cR1RES : xr1search force_build
190
	./xr1search -p c
190
	./xr1search -p c
Lines 230-243 Link Here
230
zger1tune.o : $(mySRCdir)/ger1tune.c
230
zger1tune.o : $(mySRCdir)/ger1tune.c
231
	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ger1tune.c
231
	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ger1tune.c
232
ATL_zger.o : ATL_ger.c atlas_zr1.h
232
ATL_zger.o : ATL_ger.c atlas_zr1.h
233
	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX -I$(R1Tdir) ATL_ger.c
233
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX -I$(R1Tdir) ATL_ger.c
234
ATL_zger1.o : ATL_zger1.c
234
ATL_zger1.o : ATL_zger1.c
235
	$(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1.c
235
	$(LIBTOOL) --tag=CC $(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1.c
236
ATL_zger1c.o : ATL_zger1.c
236
ATL_zger1c.o : ATL_zger1.c
237
	$(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX -DConj_ \
237
	$(LIBTOOL) --tag=CC $(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX -DConj_ \
238
              ATL_zger1.c
238
              ATL_zger1.c
239
ATL_zger1_dummy.o : ATL_zger1_dummy.c
239
ATL_zger1_dummy.o : ATL_zger1_dummy.c
240
	$(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1_dummy.c
240
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1_dummy.c
241
241
242
res/zR1RES : xr1search force_build
242
res/zR1RES : xr1search force_build
243
	./xr1search -p z
243
	./xr1search -p z
(-)ATLAS.orig/makes/Make.sprk (+8 lines)
Lines 1-6 Link Here
1
include Make.inc
1
include Make.inc
2
mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk
2
mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk
3
3
4
ICC:=$(LIBTOOL) --tag=CC $(ICC)
5
SMC:=$(LIBTOOL) --tag=CC $(SMC)
6
DMC:=$(LIBTOOL) --tag=CC $(DMC)
7
SKC:=$(LIBTOOL) --tag=CC $(SKC)
8
DKC:=$(LIBTOOL) --tag=CC $(DKC)
9
XCC:=$(LIBTOOL) --tag=CC $(XCC)
10
11
4
all : lib
12
all : lib
5
lib : dlib slib zlib clib
13
lib : dlib slib zlib clib
6
clean : sclean dclean cclean zclean
14
clean : sclean dclean cclean zclean
(-)ATLAS.orig/makes/Make.sysinfo (-2 / +2 lines)
Lines 103-114 Link Here
103
ATL_cputime.c : 
103
ATL_cputime.c : 
104
	cp $(mySRCdir)/ATL_cputime.c .
104
	cp $(mySRCdir)/ATL_cputime.c .
105
ATL_cputime.o : ATL_cputime.c
105
ATL_cputime.o : ATL_cputime.c
106
	$(ICC) -c $(ICCFLAGS) ATL_cputime.c
106
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_cputime.c
107
107
108
ATL_walltime.c : 
108
ATL_walltime.c : 
109
	cp $(mySRCdir)/ATL_walltime.c .
109
	cp $(mySRCdir)/ATL_walltime.c .
110
ATL_walltime.o : ATL_walltime.c
110
ATL_walltime.o : ATL_walltime.c
111
	$(ICC) -c $(ICCFLAGS) ATL_walltime.c
111
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_walltime.c
112
112
113
ATL_Xwalltime.o : ATL_walltime.o
113
ATL_Xwalltime.o : ATL_walltime.o
114
	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c
114
	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c
(-)ATLAS.orig/Make.top (+63 lines)
Lines 24-29 Link Here
24
	- fgrep -e fault -e FAULT -e error -e ERROR -e fail -e FAIL \
24
	- fgrep -e fault -e FAULT -e error -e ERROR -e fail -e FAIL \
25
	        bin/sanity.out
25
	        bin/sanity.out
26
	@ echo "DONE"
26
	@ echo "DONE"
27
28
29
shared: INSTALLER = cp
30
shared: libatlas.so libblas.so libcblas.so
31
32
shared-strip: INSTALLER = install -s
33
shared-strip: libatlas.so libblas.so libcblas.so
34
35
ptshared: INSTALLER = cp
36
ptshared: libptblas.so libptcblas.so
37
38
ptshared-strip: INSTALLER = install -s
39
ptshared-strip: libptblas.so libptcblas.so
40
41
liblapack.so: RPATH = /usr/lib/lapack/atlas
42
43
libatlas.so:
44
	      mkdir -p gentoo/libs
45
	      @echo
46
	      @echo Linking a really big library, please be patient...
47
	      @echo
48
	      cd gentoo/libatlas.a ; \
49
	      libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libatlas.la *.lo -rpath /usr/lib ; \
50
	      libtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs
51
52
53
libblas.so:
54
	cd gentoo/libf77blas.a ; \
55
       libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libblas.la ../libs/libatlas.la *.lo -rpath $(RPATH); \
56
       rm -f .libs/libblas.so.0.0.0; \
57
       $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
58
       libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs
59
60
libcblas.so:
61
	cd gentoo/libcblas.a ; \
62
       libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libcblas.la ../libs/libatlas.la *.lo -rpath $(RPATH) ; \
63
       rm -f .libs/libcblas.so.0.0.0; \
64
       $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
65
       libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs
66
67
libptblas.so:
68
	      mkdir -p gentoo/threaded-libs
69
	      cd gentoo/libptf77blas.a ; \
70
	      libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libblas.la ../libs/libatlas.la *.lo -rpath $(RPATH); \
71
       rm -f .libs/libblas.so.0.0.0; \
72
	      $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
73
	      libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/threaded-libs
74
75
libptcblas.so:
76
       cd gentoo/libptcblas.a ; \
77
       libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libcblas.la ../libs/libatlas.la *.lo -rpath $(RPATH); \
78
       rm -f .libs/libcblas.so.0.0.0; \
79
       $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
80
       libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/threaded-libs
81
82
liblapack.so:
83
		mkdir -p gentoo/libs
84
		cd gentoo/liblapack.a ; \
85
       libtool --mode=link --tag=CC $(CC) -o liblapack.la *.lo \
86
               -rpath $(RPATH) -lblas -lcblas -latlas SHRD_LNK; \
87
       libtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs
88
89
27
sanity_test :
90
sanity_test :
28
	@ echo "BUILDING TESTERS:"
91
	@ echo "BUILDING TESTERS:"
29
	cd bin ; $(MAKE) sanity_test
92
	cd bin ; $(MAKE) sanity_test
(-)ATLAS.orig/tune/blas/gemm/emit_mm.c (-1 / +7 lines)
Lines 2444-2449 Link Here
2444
   assert(fp);
2444
   assert(fp);
2445
2445
2446
   fprintf(fp, "include ../Make.inc\n\n");
2446
   fprintf(fp, "include ../Make.inc\n\n");
2447
   fprintf(fp, "ICC:=$(LIBTOOL) --tag=CC $(ICC)\n\n");
2448
   fprintf(fp, "SMC:=$(LIBTOOL) --tag=CC $(SMC)\n\n");
2449
   fprintf(fp, "DMC:=$(LIBTOOL) --tag=CC $(DMC)\n\n");
2450
   fprintf(fp, "SKC:=$(LIBTOOL) --tag=CC $(SKC)\n\n");
2451
   fprintf(fp, "DKC:=$(LIBTOOL) --tag=CC $(DKC)\n\n");
2452
   fprintf(fp, "XCC:=$(LIBTOOL) --tag=CC $(XCC)\n\n");
2447
   fprintf(fp, "CDEFS2 = $(CDEFS)");
2453
   fprintf(fp, "CDEFS2 = $(CDEFS)");
2448
   for (i=0; i < 3; i++)
2454
   for (i=0; i < 3; i++)
2449
      if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);
2455
      if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);
Lines 2523-2529 Link Here
2523
                             wp->NBs[k], wp->imult, wp->fixed, betas[j]);
2529
                             wp->NBs[k], wp->imult, wp->fixed, betas[j]);
2524
                  else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);
2530
                  else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);
2525
                     fprintf(fp, "%s.o : %s.c \n", fnam, fnam);
2531
                     fprintf(fp, "%s.o : %s.c \n", fnam, fnam);
2526
                  fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
2532
		     fprintf(fp, "\t$(LIBTOOL) --tag=CC %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
2527
                          wp->CC, betas[j], wp->CCFLAGS, fnam);
2533
                          wp->CC, betas[j], wp->CCFLAGS, fnam);
2528
               }
2534
               }
2529
            }
2535
            }
(-)ATLAS.orig/tune/blas/gemv/mvsearch.c (-3 / +3 lines)
Lines 512-518 Link Here
512
   fprintf(fp, "include Make.inc\n\n");
512
   fprintf(fp, "include Make.inc\n\n");
513
513
514
   if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR);
514
   if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR);
515
   else fprintf(fp, "MVNCC = %s\n", ccN);
515
   else fprintf(fp, "MVNCC = $(LIBTOOL) --tag=CC %s\n", ccN);
516
   if (ccN[0] == '\0' && ccflagsN[0] != '\0')
516
   if (ccN[0] == '\0' && ccflagsN[0] != '\0')
517
      fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
517
      fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
518
              UPR, ccflagsN, typ);
518
              UPR, ccflagsN, typ);
Lines 526-532 Link Here
526
   }
526
   }
527
527
528
   if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR);
528
   if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR);
529
   else fprintf(fp, "MVTCC = %s\n", ccT);
529
   else fprintf(fp, "MVTCC = $(LIBTOOL) --tag=CC %s\n", ccT);
530
   if (ccT[0] == '\0' && ccflagsT[0] != '\0')
530
   if (ccT[0] == '\0' && ccflagsT[0] != '\0')
531
      fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
531
      fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
532
              UPR, ccflagsT, typ);
532
              UPR, ccflagsT, typ);
Lines 540-546 Link Here
540
   }
540
   }
541
541
542
   if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR);
542
   if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR);
543
   else fprintf(fp, "MVSCC = %s\n", ccS);
543
   else fprintf(fp, "MVSCC = $(LIBTOOL) --tag=CC %s\n", ccS);
544
   if (ccS[0] == '\0' && ccflagsS[0] != '\0')
544
   if (ccS[0] == '\0' && ccflagsS[0] != '\0')
545
      fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s",
545
      fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s",
546
              UPR, ccflagsS, typ);
546
              UPR, ccflagsS, typ);
(-)ATLAS.orig/tune/blas/level1/asumsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 180-186 Link Here
180
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         FixFlags(cc);
182
         FixFlags(cc);
182
         FixFlags(ccflags);
183
         FixFlags(ccflags);
183
         pcc = cc;
184
        /* Gentoo         pcc = cc; */
185
	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
186
	 strcat(temp, cc);
187
	 pcc = temp;
184
         pccflags = ccflags;
188
         pccflags = ccflags;
185
      }
189
      }
186
      else pcc = pccflags = NULL;
190
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/axpbysrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 188-194 Link Here
188
         assert(fgets(ccflags, 512, fpin) != NULL);
189
         assert(fgets(ccflags, 512, fpin) != NULL);
189
         FixFlags(cc);
190
         FixFlags(cc);
190
         FixFlags(ccflags);
191
         FixFlags(ccflags);
191
         pcc = cc;
192
         /* Gentoo         pcc = cc; */
193
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
194
         strcat(temp, cc);
195
         pcc = temp;
192
         pccflags = ccflags;
196
         pccflags = ccflags;
193
      }
197
      }
194
      else pcc = pccflags = NULL;
198
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/axpysrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 186-192 Link Here
186
         assert(fgets(ccflags, 512, fpin) != NULL);
187
         assert(fgets(ccflags, 512, fpin) != NULL);
187
         FixFlags(cc);
188
         FixFlags(cc);
188
         FixFlags(ccflags);
189
         FixFlags(ccflags);
189
         pcc = cc;
190
         /* Gentoo         pcc = cc; */
191
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
192
         strcat(temp, cc);
193
         pcc = temp;
190
         pccflags = ccflags;
194
         pccflags = ccflags;
191
      }
195
      }
192
      else pcc = pccflags = NULL;
196
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/copysrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 180-186 Link Here
180
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         FixFlags(cc);
182
         FixFlags(cc);
182
         FixFlags(ccflags);
183
         FixFlags(ccflags);
183
         pcc = cc;
184
         /* Gentoo         pcc = cc; */
185
	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
186
	 strcat(temp, cc);
187
	 pcc = temp;
184
         pccflags = ccflags;
188
         pccflags = ccflags;
185
      }
189
      }
186
      else pcc = pccflags = NULL;
190
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/cpscsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 186-192 Link Here
186
         assert(fgets(ccflags, 512, fpin) != NULL);
187
         assert(fgets(ccflags, 512, fpin) != NULL);
187
         FixFlags(cc);
188
         FixFlags(cc);
188
         FixFlags(ccflags);
189
         FixFlags(ccflags);
189
         pcc = cc;
190
         /* Gentoo         pcc = cc; */
191
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
192
         strcat(temp, cc);
193
         pcc = temp;
190
         pccflags = ccflags;
194
         pccflags = ccflags;
191
      }
195
      }
192
      else pcc = pccflags = NULL;
196
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/dotsrch.c (-1 / +5 lines)
Lines 161-166 Link Here
161
   FILE *fpin;
161
   FILE *fpin;
162
   FILENODE *fbase, *fn, *fp=NULL;
162
   FILENODE *fbase, *fn, *fp=NULL;
163
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
163
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
164
   char temp[256];
164
   char *pcc, *pccflags;
165
   char *pcc, *pccflags;
165
   int i, n, ID, alpha, beta, incX, incY;
166
   int i, n, ID, alpha, beta, incX, incY;
166
167
Lines 182-188 Link Here
182
         assert(fgets(ccflags, 512, fpin) != NULL);
183
         assert(fgets(ccflags, 512, fpin) != NULL);
183
         FixFlags(cc);
184
         FixFlags(cc);
184
         FixFlags(ccflags);
185
         FixFlags(ccflags);
185
         pcc = cc;
186
         /* Gentoo         pcc = cc; */
187
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
188
         strcat(temp, cc);
189
         pcc = temp;
186
         pccflags = ccflags;
190
         pccflags = ccflags;
187
      }
191
      }
188
      else pcc = pccflags = NULL;
192
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/iamaxsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 179-185 Link Here
179
         assert(fgets(ccflags, 512, fpin) != NULL);
180
         assert(fgets(ccflags, 512, fpin) != NULL);
180
         FixFlags(cc);
181
         FixFlags(cc);
181
         FixFlags(ccflags);
182
         FixFlags(ccflags);
182
         pcc = cc;
183
         /* Gentoo         pcc = cc; */
184
	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
185
	 strcat(temp, cc);
186
	 pcc = temp;
183
         pccflags = ccflags;
187
         pccflags = ccflags;
184
      }
188
      }
185
      else pcc = pccflags = NULL;
189
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/nrm2srch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 180-186 Link Here
180
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         FixFlags(cc);
182
         FixFlags(cc);
182
         FixFlags(ccflags);
183
         FixFlags(ccflags);
183
         pcc = cc;
184
         /* Gentoo         pcc = cc; */
185
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
186
         strcat(temp, cc);
187
         pcc = temp;
184
         pccflags = ccflags;
188
         pccflags = ccflags;
185
      }
189
      }
186
      else pcc = pccflags = NULL;
190
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/rotsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 189-195 Link Here
189
         assert(fgets(ccflags, 512, fpin) != NULL);
190
         assert(fgets(ccflags, 512, fpin) != NULL);
190
         FixFlags(cc);
191
         FixFlags(cc);
191
         FixFlags(ccflags);
192
         FixFlags(ccflags);
192
         pcc = cc;
193
         /* Gentoo         pcc = cc; */
194
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
195
         strcat(temp, cc);
196
         pcc = temp;
193
         pccflags = ccflags;
197
         pccflags = ccflags;
194
      }
198
      }
195
      else pcc = pccflags = NULL;
199
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/scalsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 187-193 Link Here
187
         assert(fgets(ccflags, 512, fpin) != NULL);
188
         assert(fgets(ccflags, 512, fpin) != NULL);
188
         FixFlags(cc);
189
         FixFlags(cc);
189
         FixFlags(ccflags);
190
         FixFlags(ccflags);
190
         pcc = cc;
191
         /* Gentoo         pcc = cc; */
192
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
193
         strcat(temp, cc);
194
         pcc = temp;
191
         pccflags = ccflags;
195
         pccflags = ccflags;
192
      }
196
      }
193
      else pcc = pccflags = NULL;
197
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/setsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 181-187 Link Here
181
         assert(fgets(ccflags, 512, fpin) != NULL);
182
         assert(fgets(ccflags, 512, fpin) != NULL);
182
         FixFlags(cc);
183
         FixFlags(cc);
183
         FixFlags(ccflags);
184
         FixFlags(ccflags);
184
         pcc = cc;
185
         /* Gentoo         pcc = cc; */
186
	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
187
	 strcat(temp, cc);
188
	 pcc = temp;
185
         pccflags = ccflags;
189
         pccflags = ccflags;
186
      }
190
      }
187
      else pcc = pccflags = NULL;
191
      else pcc = pccflags = NULL;
(-)ATLAS.orig/tune/blas/level1/swapsrch.c (-1 / +5 lines)
Lines 159-164 Link Here
159
   FILE *fpin;
159
   FILE *fpin;
160
   FILENODE *fbase, *fn, *fp=NULL;
160
   FILENODE *fbase, *fn, *fp=NULL;
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
161
   char ln[512], rout[256], auth[256], cc[256], ccflags[256];
162
   char temp[256];
162
   char *pcc, *pccflags;
163
   char *pcc, *pccflags;
163
   int i, n, ID, alpha, beta, incX, incY;
164
   int i, n, ID, alpha, beta, incX, incY;
164
165
Lines 180-186 Link Here
180
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         assert(fgets(ccflags, 512, fpin) != NULL);
181
         FixFlags(cc);
182
         FixFlags(cc);
182
         FixFlags(ccflags);
183
         FixFlags(ccflags);
183
         pcc = cc;
184
         /* Gentoo         pcc = cc; */
185
         strcpy(temp, "$(LIBTOOL) --tag=CC ");
186
         strcat(temp, cc);
187
         pcc = temp;
184
         pccflags = ccflags;
188
         pccflags = ccflags;
185
      }
189
      }
186
      else pcc = pccflags = NULL;
190
      else pcc = pccflags = NULL;

Return to bug 144314