Attachment #94855 for bug #144314




clean :
	rm -f *.o x*
	$(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

Lines 538-544 Link Here

(-)ATLAS.orig/CONFIG/src/SpewMakeInc.c (+5 lines)
538	fprintf(fpout, " NCFLAGS = $(ICCFLAGS)\n");	538	fprintf(fpout, " NCFLAGS = $(ICCFLAGS)\n");
539	fprintf(fpout, "\n CLINKER = $(ICC)\n CLINKFLAGS = $(ICCFLAGS)\n");	539	fprintf(fpout, "\n CLINKER = $(ICC)\n CLINKFLAGS = $(ICCFLAGS)\n");
540	fprintf(fpout, " FLINKER = $(F77)\n FLINKFLAGS = $(F77FLAGS)\n");	540	fprintf(fpout, " FLINKER = $(F77)\n FLINKFLAGS = $(F77FLAGS)\n");
		541	#ifdef USE_LIBTOOL
		542	fprintf(fpout, " LIBTOOL = libtool --mode=compile\n");
		543	fprintf(fpout, " ARCHIVER = $(BLDdir)/war ar\n");
		544	#else
541	fprintf(fpout, " ARCHIVER = ar\n");	545	fprintf(fpout, " ARCHIVER = ar\n");
		546	#endif
542	fprintf(fpout, " ARFLAGS = r\n");	547	fprintf(fpout, " ARFLAGS = r\n");
543	fprintf(fpout, " RANLIB = echo\n\n");	548	fprintf(fpout, " RANLIB = echo\n\n");
544		549

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.aux (+7 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
		3	SKC:=$(LIBTOOL) --tag=CC $(SKC)
		4	DKC:=$(LIBTOOL) --tag=CC $(DKC)
2	mySRCdir = $(SRCdir)/src/auxil	5	mySRCdir = $(SRCdir)/src/auxil
3		6
4	ptobj = ATL_ptflushcache.o	7	ptobj = ATL_ptflushcache.o
Lines 114-125 Link Here
114		117
115	ATL_cputime.o : $(SYSdir)/ATL_cputime.o	118	ATL_cputime.o : $(SYSdir)/ATL_cputime.o
116	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o	119	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
		120	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo
		121	ln -sf $(SYSdir)/.libs/ATL_cputime.o .libs/ATL_cputime.o
117	$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c	122	$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c
118	cd $(SYSdir) ; $(MAKE) ATL_cputime.o	123	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
119	$(SYSdir)/ATL_cputime.c:	124	$(SYSdir)/ATL_cputime.c:
120	cd $(SYSdir) ; $(MAKE) ATL_cputime.o	125	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
121	ATL_walltime.o : $(SYSdir)/ATL_walltime.o	126	ATL_walltime.o : $(SYSdir)/ATL_walltime.o
122	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o	127	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o
		128	ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo
		129	ln -sf $(SYSdir)/.libs/ATL_walltime.o .libs/ATL_walltime.o
123	$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c	130	$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
124	cd $(SYSdir) ; $(MAKE) ATL_walltime.o	131	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
125	$(SYSdir)/ATL_walltime.c:	132	$(SYSdir)/ATL_walltime.c:

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.cblas (+1 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:= $(LIBTOOL) --tag=CC $(ICC)
2	mySRCdir = $(SRCdir)/interfaces/blas/C/src/	3	mySRCdir = $(SRCdir)/interfaces/blas/C/src/
3		4
4	aobj = cblas_xerbla.o cblas_errprn.o	5	aobj = cblas_xerbla.o cblas_errprn.o

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.f77blas (+2 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
		47	F77:=$(LIBTOOL) --tag=F77 $(F77)
46	mySRCdir = $(SRCdir)/interfaces/blas/F77/src	48	mySRCdir = $(SRCdir)/interfaces/blas/F77/src
47	#	49	#
48	########################################################################	50	########################################################################

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.gpmm (+1 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
2	mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm	3	mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm
3		4
4	all : lib	5	all : lib

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l1ref (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/reference/level1	47	mySRCdir = $(SRCdir)/src/blas/reference/level1
47	#	48	#
48	########################################################################	49	########################################################################




include Make.inc
ICC:=$(LIBTOOL) --tag=CC $(ICC)
SKC:=$(LIBTOOL) --tag=CC $(SKC)
DKC:=$(LIBTOOL) --tag=CC $(DKC)
mySRCdir = $(SRCdir)/src/blas/level1

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


sgen :
	$(MAKE) Make_srot
	$(MAKE) -f Make_srot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_saxpby
	$(MAKE) -f Make_saxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_scpsc
	$(MAKE) -f Make_scpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_sset
	$(MAKE) -f Make_sset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_snrm2
	$(MAKE) -f Make_snrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_sasum
	$(MAKE) -f Make_sasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_sdot
	$(MAKE) -f Make_sdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_sswap
	$(MAKE) -f Make_sswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_sscal
	$(MAKE) -f Make_sscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_scopy
	$(MAKE) -f Make_scopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_saxpy
	$(MAKE) -f Make_saxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_siamax
	$(MAKE) -f Make_siamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
slvl1 : slib
slib :   slib.grd
	$(MAKE) sgen

	rm -f $(sobj) s*.grd
dgen :
	$(MAKE) Make_drot
	$(MAKE) -f Make_drot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_daxpby
	$(MAKE) -f Make_daxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dcpsc
	$(MAKE) -f Make_dcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dset
	$(MAKE) -f Make_dset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dnrm2
	$(MAKE) -f Make_dnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dasum
	$(MAKE) -f Make_dasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_ddot
	$(MAKE) -f Make_ddot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dswap
	$(MAKE) -f Make_dswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dscal
	$(MAKE) -f Make_dscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_dcopy
	$(MAKE) -f Make_dcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_daxpy
	$(MAKE) -f Make_daxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_diamax
	$(MAKE) -f Make_diamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
dlvl1 : dlib
dlib :   dlib.grd
	$(MAKE) dgen

	rm -f $(dobj) d*.grd
cgen :
	$(MAKE) Make_crot
	$(MAKE) -f Make_crot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_caxpby
	$(MAKE) -f Make_caxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_ccpsc
	$(MAKE) -f Make_ccpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_cset
	$(MAKE) -f Make_cset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_cnrm2
	$(MAKE) -f Make_cnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_casum
	$(MAKE) -f Make_casum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_cdot
	$(MAKE) -f Make_cdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_cswap
	$(MAKE) -f Make_cswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_cscal
	$(MAKE) -f Make_cscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_ccopy
	$(MAKE) -f Make_ccopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_caxpy
	$(MAKE) -f Make_caxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_ciamax
	$(MAKE) -f Make_ciamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_cdotc
	$(MAKE) -f Make_cdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
clvl1 : clib
clib : slib clib.grd
	$(MAKE) cgen

	rm -f $(cobj) c*.grd
zgen :
	$(MAKE) Make_zrot
	$(MAKE) -f Make_zrot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zaxpby
	$(MAKE) -f Make_zaxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zcpsc
	$(MAKE) -f Make_zcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zset
	$(MAKE) -f Make_zset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_znrm2
	$(MAKE) -f Make_znrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zasum
	$(MAKE) -f Make_zasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zdot
	$(MAKE) -f Make_zdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zswap
	$(MAKE) -f Make_zswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zscal
	$(MAKE) -f Make_zscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zcopy
	$(MAKE) -f Make_zcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zaxpy
	$(MAKE) -f Make_zaxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_ziamax
	$(MAKE) -f Make_ziamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
	$(MAKE) Make_zdotc
	$(MAKE) -f Make_zdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
zlvl1 : zlib
zlib : dlib zlib.grd
	$(MAKE) zgen

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l2 (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/level2/	47	mySRCdir = $(SRCdir)/src/blas/level2/
47	#	48	#
48	########################################################################	49	########################################################################

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l2aux (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/level2/kernel	47	mySRCdir = $(SRCdir)/src/blas/level2/kernel
47	#	48	#
48	########################################################################	49	########################################################################

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l2ref (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/reference/level2	47	mySRCdir = $(SRCdir)/src/blas/reference/level2
47	#	48	#
48	########################################################################	49	########################################################################

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.l2src (+1 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
2		3
3	sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \	4	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 \	5	ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l3 (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/level3	47	mySRCdir = $(SRCdir)/src/blas/level3
47	#	48	#
48	########################################################################	49	########################################################################

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l3aux (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/level3/rblas	47	mySRCdir = $(SRCdir)/src/blas/level3/rblas
47	#	48	#
48	########################################################################	49	########################################################################

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.l3kern (+1 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
2	mySRCdir = $(SRCdir)/src/blas/level3/kernel	3	mySRCdir = $(SRCdir)/src/blas/level3/kernel
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 \

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l3ptblas (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/pthreads/blas/level3	47	mySRCdir = $(SRCdir)/src/pthreads/blas/level3
47	#	48	#
48	########################################################################	49	########################################################################

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.l3ref (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/blas/reference/level3	47	mySRCdir = $(SRCdir)/src/blas/reference/level3
47	#	48	#
48	########################################################################	49	########################################################################

Lines 43-48 Link Here

(-)ATLAS.orig/makes/Make.miptblas (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	ICC:=$(LIBTOOL) --tag=CC $(ICC)
46	mySRCdir = $(SRCdir)/src/pthreads/misc	47	mySRCdir = $(SRCdir)/src/pthreads/misc
47	#	48	#
48	########################################################################	49	########################################################################

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.mmsrc (-4 / +7 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
		3	SMC:=$(LIBTOOL) --tag=CC $(SMC)
		4	DMC:=$(LIBTOOL) --tag=CC $(DMC)
2	mySRCdir = $(SRCdir)/src/blas/gemm	5	mySRCdir = $(SRCdir)/src/blas/gemm
3		6
4	$(INCAdir)/atlas_type.h :	7	$(INCAdir)/atlas_type.h :
Lines 82-88 Link Here
82	sclean :	85	sclean :
83	rm -f $(sobj) s*.grd	86	rm -f $(sobj) s*.grd
84	scleanuplib :	87	scleanuplib :
85	cd KERNEL ; $(MAKE) -f sMakefile slib	88	cd KERNEL ; $(MAKE) -f sMakefile slib SMC="$(SMC)"
86		89
87	slib :	90	slib :
88	$(MAKE) auxillib scleanuplib susergemm	91	$(MAKE) auxillib scleanuplib susergemm
Lines 205-211 Link Here
205	dclean :	208	dclean :
206	rm -f $(dobj) d*.grd	209	rm -f $(dobj) d*.grd
207	dcleanuplib :	210	dcleanuplib :
208	cd KERNEL ; $(MAKE) -f dMakefile dlib	211	cd KERNEL ; $(MAKE) -f dMakefile dlib DMC="$(DMC)"
209		212
210	dlib :	213	dlib :
211	$(MAKE) auxillib dcleanuplib dusergemm	214	$(MAKE) auxillib dcleanuplib dusergemm
Lines 328-334 Link Here
328	cclean :	331	cclean :
329	rm -f $(cobj) c*.grd	332	rm -f $(cobj) c*.grd
330	ccleanuplib :	333	ccleanuplib :
331	cd KERNEL ; $(MAKE) -f cMakefile clib	334	cd KERNEL ; $(MAKE) -f cMakefile clib SMC="$(SMC)"
332		335
333	clib :	336	clib :
334	$(MAKE) auxillib ccleanuplib cusergemm	337	$(MAKE) auxillib ccleanuplib cusergemm
Lines 515-521 Link Here
515	zclean :	518	zclean :
516	rm -f $(zobj) z*.grd	519	rm -f $(zobj) z*.grd
517	zcleanuplib :	520	zcleanuplib :
518	cd KERNEL ; $(MAKE) -f zMakefile zlib	521	cd KERNEL ; $(MAKE) -f zMakefile zlib DMC="$(DMC)"
519		522
520	zlib :	523	zlib :
521	$(MAKE) auxillib zcleanuplib zusergemm	524	$(MAKE) auxillib zcleanuplib zusergemm

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.mvsrc (-4 / +7 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
		3	SKC:=$(LIBTOOL) --tag=CC $(SKC)
		4	DKC:=$(LIBTOOL) --tag=CC $(DKC)
2	mySRCdir = $(SRCdir)/src/blas/gemv	5	mySRCdir = $(SRCdir)/src/blas/gemv
3		6
4	sobj = ATL_sgemv.o	7	sobj = ATL_sgemv.o
Lines 19-25 Link Here
19	clean : sclean dclean cclean zclean	22	clean : sclean dclean cclean zclean
20		23
21	dlib :	24	dlib :
22	$(PMAKE) -f Make_dmv dlib	25	$(PMAKE) -f Make_dmv dlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
23	$(PMAKE) dlib.grd	26	$(PMAKE) dlib.grd
24	dlib.grd : $(dobj)	27	dlib.grd : $(dobj)
25	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)	28	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
Lines 28-34 Link Here
28	dclean :	31	dclean :
29	rm -f $(dobj) d*.grd	32	rm -f $(dobj) d*.grd
30	slib :	33	slib :
31	$(PMAKE) -f Make_smv slib	34	$(PMAKE) -f Make_smv slib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
32	$(PMAKE) slib.grd	35	$(PMAKE) slib.grd
33	slib.grd : $(sobj)	36	slib.grd : $(sobj)
34	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)	37	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
Lines 37-43 Link Here
37	sclean :	40	sclean :
38	rm -f $(sobj) s*.grd	41	rm -f $(sobj) s*.grd
39	clib :	42	clib :
40	$(PMAKE) -f Make_cmv clib	43	$(PMAKE) -f Make_cmv clib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
41	$(PMAKE) clib.grd	44	$(PMAKE) clib.grd
42	clib.grd : $(cobj)	45	clib.grd : $(cobj)
43	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)	46	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
Lines 46-52 Link Here
46	cclean :	49	cclean :
47	rm -f $(cobj) c*.grd	50	rm -f $(cobj) c*.grd
48	zlib :	51	zlib :
49	$(PMAKE) -f Make_zmv zlib	52	$(PMAKE) -f Make_zmv zlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
50	$(PMAKE) zlib.grd	53	$(PMAKE) zlib.grd
51	zlib.grd : $(zobj)	54	zlib.grd : $(zobj)
52	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)	55	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.r1src (-4 / +7 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
		3	SKC:=$(LIBTOOL) --tag=CC $(SKC)
		4	DKC:=$(LIBTOOL) --tag=CC $(DKC)
2	mySRCdir = $(SRCdir)/src/blas/ger	5	mySRCdir = $(SRCdir)/src/blas/ger
3		6
4	sobj = ATL_sger.o	7	sobj = ATL_sger.o
Lines 17-23 Link Here
17		20
18	dlib :	21	dlib :
19	$(PMAKE) dlib.grd	22	$(PMAKE) dlib.grd
20	$(PMAKE) -f Make_dr1 lib	23	$(PMAKE) -f Make_dr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
21	dlib.grd : $(dobj)	24	dlib.grd : $(dobj)
22	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)	25	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
23	$(RANLIB) $(ATLASlib)	26	$(RANLIB) $(ATLASlib)
Lines 26-32 Link Here
26	rm -f $(dobj) d*.grd	29	rm -f $(dobj) d*.grd
27	slib :	30	slib :
28	$(PMAKE) slib.grd	31	$(PMAKE) slib.grd
29	$(PMAKE) -f Make_sr1 lib	32	$(PMAKE) -f Make_sr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
30	slib.grd : $(sobj)	33	slib.grd : $(sobj)
31	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)	34	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
32	$(RANLIB) $(ATLASlib)	35	$(RANLIB) $(ATLASlib)
Lines 35-41 Link Here
35	rm -f $(sobj) s*.grd	38	rm -f $(sobj) s*.grd
36	clib :	39	clib :
37	$(PMAKE) clib.grd	40	$(PMAKE) clib.grd
38	$(PMAKE) -f Make_cr1 lib	41	$(PMAKE) -f Make_cr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
39	clib.grd : $(cobj)	42	clib.grd : $(cobj)
40	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)	43	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
41	$(RANLIB) $(ATLASlib)	44	$(RANLIB) $(ATLASlib)
Lines 44-50 Link Here
44	rm -f $(cobj) c*.grd	47	rm -f $(cobj) c*.grd
45	zlib :	48	zlib :
46	$(PMAKE) zlib.grd	49	$(PMAKE) zlib.grd
47	$(PMAKE) -f Make_zr1 lib	50	$(PMAKE) -f Make_zr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
48	zlib.grd : $(zobj)	51	zlib.grd : $(zobj)
49	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)	52	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
50	$(RANLIB) $(ATLASlib)	53	$(RANLIB) $(ATLASlib)

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.sprk (+1 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
2	mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk	3	mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk
3		4
4	all : lib	5	all : lib




ATL_cputime.c : 
	cp $(mySRCdir)/ATL_cputime.c .
ATL_cputime.o : ATL_cputime.c
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_cputime.c

ATL_walltime.c : 
	cp $(mySRCdir)/ATL_walltime.c .
ATL_walltime.o : ATL_walltime.c
	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_walltime.c

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




	- cp $(LIBdir)/libptf77blas.a $(INSTdir)/.
	- 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


Lines 2433-2438 Link Here

(-)ATLAS.orig/tune/blas/gemm/emit_mm.c (-1 / +2 lines)
2433	assert(fp);	2433	assert(fp);
2434		2434
2435	fprintf(fp, "include ../Make.inc\n\n");	2435	fprintf(fp, "include ../Make.inc\n\n");
		2436	fprintf(fp, "CC:=$(LIBTOOL) --tag=CC $(CC)\n\n");
2436	fprintf(fp, "CDEFS2 = $(CDEFS)");	2437	fprintf(fp, "CDEFS2 = $(CDEFS)");
2437	for (i=0; i < 3; i++)	2438	for (i=0; i < 3; i++)
2438	if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);	2439	if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);
Lines 2512-2518 Link Here
2512	wp->NBs[k], wp->imult, wp->fixed, betas[j]);	2513	wp->NBs[k], wp->imult, wp->fixed, betas[j]);
2513	else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);	2514	else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);
2514	fprintf(fp, "%s.o : %s.c \n", fnam, fnam);	2515	fprintf(fp, "%s.o : %s.c \n", fnam, fnam);
2515	fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",	2516	fprintf(fp, "\t$(LIBTOOL) --tag=CC %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
2516	wp->CC, betas[j], wp->CCFLAGS, fnam);	2517	wp->CC, betas[j], wp->CCFLAGS, fnam);
2517	}	2518	}
2518	}	2519	}




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

   if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR);
   else fprintf(fp, "MVNCC = $(LIBTOOL) --tag=CC %s\n", ccN);
   if (ccN[0] == '\0' && ccflagsN[0] != '\0')
      fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
              UPR, ccflagsN, typ);

   }

   if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR);
   else fprintf(fp, "MVTCC = $(LIBTOOL) --tag=CC %s\n", ccT);
   if (ccT[0] == '\0' && ccflagsT[0] != '\0')
      fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
              UPR, ccflagsT, typ);

   }

   if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR);
   else fprintf(fp, "MVSCC = $(LIBTOOL) --tag=CC %s\n", ccS);
   if (ccS[0] == '\0' && ccflagsS[0] != '\0')
      fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s",
              UPR, ccflagsS, typ);

Lines 159-164 Link Here

(-)ATLAS.orig/tune/blas/level1/asumsrch.c (-1 / +5 lines)
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;

Lines 159-164 Link Here

(-)ATLAS.orig/tune/blas/level1/copysrch.c (-1 / +5 lines)
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;

Lines 159-164 Link Here

(-)ATLAS.orig/tune/blas/level1/iamaxsrch.c (-1 / +5 lines)
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;

Lines 838-843 Link Here

(-)ATLAS.orig/tune/blas/level1/rotsrch.c (+9 lines)
838	{	838	{
839	char cc, ccflags, nam, typ="";	839	char cc, ccflags, nam, typ="";
840	char ln[32];	840	char ln[32];
		841	/* Gentoo */
		842	char temp[256];
		843	/* end Gentoo */
841	char *rout = "rot";	844	char *rout = "rot";
842	int i;	845	int i;
843	FILE *fpout;	846	FILE *fpout;
Lines 874-879 Link Here
874	cc = bp[i]->cc;	877	cc = bp[i]->cc;
875	ccflags = bp[i]->ccflags;	878	ccflags = bp[i]->ccflags;
876	if (!cc) cc = (pre == 's' \|\| pre == 'c') ? "$(SKC)" : "$(DKC)";	879	if (!cc) cc = (pre == 's' \|\| pre == 'c') ? "$(SKC)" : "$(DKC)";
		880	/* Gentoo */
		881	else {
		882	strcpy(temp, "$(LIBTOOL) --tag=CC ");
		883	strcat(temp, cc);
		884	}
		885	/* end Gentoo */
877	if (!ccflags)	886	if (!ccflags)
878	ccflags = (pre == 's' \|\| pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";	887	ccflags = (pre == 's' \|\| pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)";
879	fprintf(fpout, "%s.o : %s.c\n", nam, nam);	888	fprintf(fpout, "%s.o : %s.c\n", nam, nam);

Lines 159-164 Link Here

(-)ATLAS.orig/tune/blas/level1/setsrch.c (-1 / +5 lines)
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;

Return to bug 144314

Lines 310-312 Link Here

(-)ATLAS.orig/CONFIG/src/Makefile (+16 lines)
310	clean :	310	clean :
311	rm -f .o x	311	rm -f .o x
312	$(MAKE) -f Make.top clean	312	$(MAKE) -f Make.top clean
		313
		314	#Gentoo stuff:
		315	shared :
		316	$(MAKE) -f Make.top shared
		317
		318	shared-strip :
		319	$(MAKE) -f Make.top shared-strip
		320
		321	ptshared :
		322	$(MAKE) -f Make.top ptshared
		323
		324	ptshared-strip :
		325	$(MAKE) -f Make.top ptshared-strip
		326
		327	liblapack.so :
		328	$(MAKE) -f Make.top liblapack.so

Lines 103-114 Link Here

(-)ATLAS.orig/makes/Make.sysinfo (-2 / +2 lines)
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

Lines 1-4 Link Here

(-)ATLAS.orig/makes/Make.l1src (-50 / +53 lines)
1	include Make.inc	1	include Make.inc
		2	ICC:=$(LIBTOOL) --tag=CC $(ICC)
		3	SKC:=$(LIBTOOL) --tag=CC $(SKC)
		4	DKC:=$(LIBTOOL) --tag=CC $(DKC)
2	mySRCdir = $(SRCdir)/src/blas/level1	5	mySRCdir = $(SRCdir)/src/blas/level1
3		6
4	sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o	7	sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o
Lines 17-45 Link Here
17		20
18	sgen :	21	sgen :
19	$(MAKE) Make_srot	22	$(MAKE) Make_srot
20	$(MAKE) -f Make_srot lib	23	$(MAKE) -f Make_srot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
21	$(MAKE) Make_saxpby	24	$(MAKE) Make_saxpby
22	$(MAKE) -f Make_saxpby lib	25	$(MAKE) -f Make_saxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
23	$(MAKE) Make_scpsc	26	$(MAKE) Make_scpsc
24	$(MAKE) -f Make_scpsc lib	27	$(MAKE) -f Make_scpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
25	$(MAKE) Make_sset	28	$(MAKE) Make_sset
26	$(MAKE) -f Make_sset lib	29	$(MAKE) -f Make_sset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
27	$(MAKE) Make_snrm2	30	$(MAKE) Make_snrm2
28	$(MAKE) -f Make_snrm2 lib	31	$(MAKE) -f Make_snrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
29	$(MAKE) Make_sasum	32	$(MAKE) Make_sasum
30	$(MAKE) -f Make_sasum lib	33	$(MAKE) -f Make_sasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
31	$(MAKE) Make_sdot	34	$(MAKE) Make_sdot
32	$(MAKE) -f Make_sdot lib	35	$(MAKE) -f Make_sdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
33	$(MAKE) Make_sswap	36	$(MAKE) Make_sswap
34	$(MAKE) -f Make_sswap lib	37	$(MAKE) -f Make_sswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
35	$(MAKE) Make_sscal	38	$(MAKE) Make_sscal
36	$(MAKE) -f Make_sscal lib	39	$(MAKE) -f Make_sscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
37	$(MAKE) Make_scopy	40	$(MAKE) Make_scopy
38	$(MAKE) -f Make_scopy lib	41	$(MAKE) -f Make_scopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
39	$(MAKE) Make_saxpy	42	$(MAKE) Make_saxpy
40	$(MAKE) -f Make_saxpy lib	43	$(MAKE) -f Make_saxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
41	$(MAKE) Make_siamax	44	$(MAKE) Make_siamax
42	$(MAKE) -f Make_siamax lib	45	$(MAKE) -f Make_siamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
43	slvl1 : slib	46	slvl1 : slib
44	slib : slib.grd	47	slib : slib.grd
45	$(MAKE) sgen	48	$(MAKE) sgen
Lines 52-80 Link Here
52	rm -f $(sobj) s*.grd	55	rm -f $(sobj) s*.grd
53	dgen :	56	dgen :
54	$(MAKE) Make_drot	57	$(MAKE) Make_drot
55	$(MAKE) -f Make_drot lib	58	$(MAKE) -f Make_drot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
56	$(MAKE) Make_daxpby	59	$(MAKE) Make_daxpby
57	$(MAKE) -f Make_daxpby lib	60	$(MAKE) -f Make_daxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
58	$(MAKE) Make_dcpsc	61	$(MAKE) Make_dcpsc
59	$(MAKE) -f Make_dcpsc lib	62	$(MAKE) -f Make_dcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
60	$(MAKE) Make_dset	63	$(MAKE) Make_dset
61	$(MAKE) -f Make_dset lib	64	$(MAKE) -f Make_dset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
62	$(MAKE) Make_dnrm2	65	$(MAKE) Make_dnrm2
63	$(MAKE) -f Make_dnrm2 lib	66	$(MAKE) -f Make_dnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
64	$(MAKE) Make_dasum	67	$(MAKE) Make_dasum
65	$(MAKE) -f Make_dasum lib	68	$(MAKE) -f Make_dasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
66	$(MAKE) Make_ddot	69	$(MAKE) Make_ddot
67	$(MAKE) -f Make_ddot lib	70	$(MAKE) -f Make_ddot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
68	$(MAKE) Make_dswap	71	$(MAKE) Make_dswap
69	$(MAKE) -f Make_dswap lib	72	$(MAKE) -f Make_dswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
70	$(MAKE) Make_dscal	73	$(MAKE) Make_dscal
71	$(MAKE) -f Make_dscal lib	74	$(MAKE) -f Make_dscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
72	$(MAKE) Make_dcopy	75	$(MAKE) Make_dcopy
73	$(MAKE) -f Make_dcopy lib	76	$(MAKE) -f Make_dcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
74	$(MAKE) Make_daxpy	77	$(MAKE) Make_daxpy
75	$(MAKE) -f Make_daxpy lib	78	$(MAKE) -f Make_daxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
76	$(MAKE) Make_diamax	79	$(MAKE) Make_diamax
77	$(MAKE) -f Make_diamax lib	80	$(MAKE) -f Make_diamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
78	dlvl1 : dlib	81	dlvl1 : dlib
79	dlib : dlib.grd	82	dlib : dlib.grd
80	$(MAKE) dgen	83	$(MAKE) dgen
Lines 87-117 Link Here
87	rm -f $(dobj) d*.grd	90	rm -f $(dobj) d*.grd
88	cgen :	91	cgen :
89	$(MAKE) Make_crot	92	$(MAKE) Make_crot
90	$(MAKE) -f Make_crot lib	93	$(MAKE) -f Make_crot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
91	$(MAKE) Make_caxpby	94	$(MAKE) Make_caxpby
92	$(MAKE) -f Make_caxpby lib	95	$(MAKE) -f Make_caxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
93	$(MAKE) Make_ccpsc	96	$(MAKE) Make_ccpsc
94	$(MAKE) -f Make_ccpsc lib	97	$(MAKE) -f Make_ccpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
95	$(MAKE) Make_cset	98	$(MAKE) Make_cset
96	$(MAKE) -f Make_cset lib	99	$(MAKE) -f Make_cset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
97	$(MAKE) Make_cnrm2	100	$(MAKE) Make_cnrm2
98	$(MAKE) -f Make_cnrm2 lib	101	$(MAKE) -f Make_cnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
99	$(MAKE) Make_casum	102	$(MAKE) Make_casum
100	$(MAKE) -f Make_casum lib	103	$(MAKE) -f Make_casum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
101	$(MAKE) Make_cdot	104	$(MAKE) Make_cdot
102	$(MAKE) -f Make_cdot lib	105	$(MAKE) -f Make_cdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
103	$(MAKE) Make_cswap	106	$(MAKE) Make_cswap
104	$(MAKE) -f Make_cswap lib	107	$(MAKE) -f Make_cswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
105	$(MAKE) Make_cscal	108	$(MAKE) Make_cscal
106	$(MAKE) -f Make_cscal lib	109	$(MAKE) -f Make_cscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
107	$(MAKE) Make_ccopy	110	$(MAKE) Make_ccopy
108	$(MAKE) -f Make_ccopy lib	111	$(MAKE) -f Make_ccopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
109	$(MAKE) Make_caxpy	112	$(MAKE) Make_caxpy
110	$(MAKE) -f Make_caxpy lib	113	$(MAKE) -f Make_caxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
111	$(MAKE) Make_ciamax	114	$(MAKE) Make_ciamax
112	$(MAKE) -f Make_ciamax lib	115	$(MAKE) -f Make_ciamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
113	$(MAKE) Make_cdotc	116	$(MAKE) Make_cdotc
114	$(MAKE) -f Make_cdotc lib	117	$(MAKE) -f Make_cdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
115	clvl1 : clib	118	clvl1 : clib
116	clib : slib clib.grd	119	clib : slib clib.grd
117	$(MAKE) cgen	120	$(MAKE) cgen
Lines 124-154 Link Here
124	rm -f $(cobj) c*.grd	127	rm -f $(cobj) c*.grd
125	zgen :	128	zgen :
126	$(MAKE) Make_zrot	129	$(MAKE) Make_zrot
127	$(MAKE) -f Make_zrot lib	130	$(MAKE) -f Make_zrot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
128	$(MAKE) Make_zaxpby	131	$(MAKE) Make_zaxpby
129	$(MAKE) -f Make_zaxpby lib	132	$(MAKE) -f Make_zaxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
130	$(MAKE) Make_zcpsc	133	$(MAKE) Make_zcpsc
131	$(MAKE) -f Make_zcpsc lib	134	$(MAKE) -f Make_zcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
132	$(MAKE) Make_zset	135	$(MAKE) Make_zset
133	$(MAKE) -f Make_zset lib	136	$(MAKE) -f Make_zset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
134	$(MAKE) Make_znrm2	137	$(MAKE) Make_znrm2
135	$(MAKE) -f Make_znrm2 lib	138	$(MAKE) -f Make_znrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
136	$(MAKE) Make_zasum	139	$(MAKE) Make_zasum
137	$(MAKE) -f Make_zasum lib	140	$(MAKE) -f Make_zasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
138	$(MAKE) Make_zdot	141	$(MAKE) Make_zdot
139	$(MAKE) -f Make_zdot lib	142	$(MAKE) -f Make_zdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
140	$(MAKE) Make_zswap	143	$(MAKE) Make_zswap
141	$(MAKE) -f Make_zswap lib	144	$(MAKE) -f Make_zswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
142	$(MAKE) Make_zscal	145	$(MAKE) Make_zscal
143	$(MAKE) -f Make_zscal lib	146	$(MAKE) -f Make_zscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
144	$(MAKE) Make_zcopy	147	$(MAKE) Make_zcopy
145	$(MAKE) -f Make_zcopy lib	148	$(MAKE) -f Make_zcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
146	$(MAKE) Make_zaxpy	149	$(MAKE) Make_zaxpy
147	$(MAKE) -f Make_zaxpy lib	150	$(MAKE) -f Make_zaxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
148	$(MAKE) Make_ziamax	151	$(MAKE) Make_ziamax
149	$(MAKE) -f Make_ziamax lib	152	$(MAKE) -f Make_ziamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
150	$(MAKE) Make_zdotc	153	$(MAKE) Make_zdotc
151	$(MAKE) -f Make_zdotc lib	154	$(MAKE) -f Make_zdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
152	zlvl1 : zlib	155	zlvl1 : zlib
153	zlib : dlib zlib.grd	156	zlib : dlib zlib.grd
154	$(MAKE) zgen	157	$(MAKE) zgen

Lines 297-299 Link Here

(-)ATLAS.orig/Make.top (+82 lines)
297	- cp $(LIBdir)/libptf77blas.a $(INSTdir)/.	297	- cp $(LIBdir)/libptf77blas.a $(INSTdir)/.
298	- chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a	298	- chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a
299		299
		300	shared: INSTALLER = cp
		301	shared: RPATH = /usr/lib/blas/atlas
		302	shared: libatlas.so libblas.so libcblas.so
		303
		304	shared-strip: INSTALLER = install -s
		305	shared-strip: RPATH = /usr/lib/blas/atlas
		306	shared-strip: libatlas.so libblas.so libcblas.so
		307
		308	ptshared: INSTALLER = cp
		309	ptshared: RPATH = /usr/lib/blas/threaded-atlas
		310	ptshared: libptblas.so libptcblas.so
		311
		312	ptshared-strip: INSTALLER = install -s
		313	ptshared-strip: RPATH = /usr/lib/blas/threaded-atlas
		314	ptshared-strip: libptblas.so libptcblas.so
		315
		316	liblapack.so: RPATH = /usr/lib/lapack/atlas
		317
		318	libatlas.so:
		319	mkdir -p gentoo/libs
		320	@echo
		321	@echo Linking a really big library, please be patient...
		322	@echo
		323	cd gentoo/libatlas.a ; \
		324	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libatlas.la *.lo \
		325	-rpath /usr/lib ; \
		326	libtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs
		327
		328	# libg2c is part of GNU gcc. It is listed here as a dependency for the F77
		329	# BLAS libraries in case the user wants to link with the libraries using
		330	# the Intel Fortran Compiler. The issue is with xerbla.f, which calls the
		331	# STOP instrinsic. Linking with ifc will result in undefined symbols like
		332	# e_wsfe and others. These symbols are contained in libg2c. If you will not
		333	# use ifc, you most likely want to remove the '-lg2c' from libblas.so
		334	# and possibly libptblas.so. Of course, you can just remove -lg2c, and
		335	# specify it explicitly when using ifc.
		336	libblas.so:
		337	cd gentoo/libf77blas.a ; \
		338	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libblas.la \
		339	../libs/libatlas.la *.lo -rpath $(RPATH); \
		340	rm -f .libs/libblas.so.0.0.0; \
		341	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \
		342	-Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
		343	libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs
		344
		345	libcblas.so:
		346	cd gentoo/libcblas.a ; \
		347	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libcblas.la \
		348	../libs/libatlas.la *.lo -rpath $(RPATH) ; \
		349	rm -f .libs/libcblas.so.0.0.0; \
		350	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \
		351	-Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
		352	libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs
		353
		354	libptblas.so:
		355	mkdir -p gentoo/threaded-libs
		356	cd gentoo/libptf77blas.a ; \
		357	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libblas.la \
		358	../libs/libatlas.la *.lo -rpath $(RPATH); \
		359	rm -f .libs/libblas.so.0.0.0; \
		360	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \
		361	-Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
		362	libtool --mode=install $(INSTALLER) libblas.la \
		363	$(BLDdir)/gentoo/threaded-libs
364
365	libptcblas.so:
366	cd gentoo/libptcblas.a ; \
367	libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libcblas.la \
368	../libs/libatlas.la *.lo -rpath $(RPATH); \
369	rm -f .libs/libcblas.so.0.0.0; \
370	$(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \
371	-Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
372	libtool --mode=install $(INSTALLER) libcblas.la \
373	$(BLDdir)/gentoo/threaded-libs
374
375	liblapack.so:
376	mkdir -p gentoo/libs
377	cd gentoo/liblapack.a ; \
378	libtool --mode=link --tag=CC $(ICC) -o liblapack.la *.lo \
379	-rpath $(RPATH) -lblas -lcblas -latlas SHRD_LNK; \
380	libtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs
381

Lines 512-518 Link Here

(-)ATLAS.orig/tune/blas/gemv/mvsearch.c (-3 / +3 lines)
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);