diff -Naur ATLAS-old/Make.top ATLAS/Make.top
--- ATLAS-old/Make.top	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/Make.top	2006-01-05 22:03:27.000000000 +0000
@@ -16,6 +16,82 @@
 install:
 	cd bin/$(arch) ; $(MAKE) xatlas_install
 	cd bin/$(arch) ; ./xatlas_install -d $(ARCHDEF) $(MMDEF) $(INSTFLAGS)
+
+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 $(CC) -o libatlas.la *.lo -rpath /usr/lib ; \
+	libtool --mode=install $(INSTALLER) libatlas.la $(TOPdir)/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 $(CC) -o libblas.la ../libs/libatlas.la *.lo \
+	        -rpath $(RPATH) -lg2c ; \
+	rm -f .libs/libblas.so.0.0.0; \
+	$(CC) --shared .libs/*.o -lg2c $(TOPdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
+	libtool --mode=install $(INSTALLER) libblas.la $(TOPdir)/gentoo/libs
+
+libcblas.so:
+	cd gentoo/libcblas.a ; \
+	libtool --mode=link --tag=CC $(CC) -o libcblas.la ../libs/libatlas.la *.lo \
+	        -rpath $(RPATH) ; \
+	rm -f .libs/libcblas.so.0.0.0; \
+	$(CC) --shared .libs/*.o $(TOPdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
+	libtool --mode=install $(INSTALLER) libcblas.la $(TOPdir)/gentoo/libs
+
+libptblas.so:
+	mkdir -p gentoo/threaded-libs
+	cd gentoo/libptf77blas.a ; \
+	libtool --mode=link --tag=CC $(CC) -o libblas.la ../libs/libatlas.la *.lo \
+		-rpath $(RPATH) -lg2c -lpthread ; \
+	rm -f .libs/libblas.so.0.0.0; \
+	$(CC) --shared .libs/*.o -lg2c $(TOPdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
+	libtool --mode=install $(INSTALLER) libblas.la $(TOPdir)/gentoo/threaded-libs
+
+libptcblas.so:
+	cd gentoo/libptcblas.a ; \
+	libtool --mode=link --tag=CC $(CC) -o libcblas.la ../libs/libatlas.la *.lo \
+		-rpath $(RPATH) -lpthread ; \
+	rm -f .libs/libcblas.so.0.0.0; \
+	$(CC) --shared .libs/*.o $(TOPdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
+	libtool --mode=install $(INSTALLER) libcblas.la $(TOPdir)/gentoo/threaded-libs
+
+liblapack.so:
+	mkdir -p gentoo/libs
+	cd gentoo/liblapack.a ; \
+	libtool --mode=link --tag=CC $(CC) -o liblapack.la *.lo \
+	        -rpath $(RPATH) -lblas -lcblas -latlas -lg2c; \
+	libtool --mode=install $(INSTALLER) liblapack.la $(TOPdir)/gentoo/libs
+
 sanity_test :
 	@ echo "BUILDING TESTERS:"
 	cd bin/$(arch) ; $(MAKE) sanity_test
diff -Naur ATLAS-old/Makefile ATLAS/Makefile
--- ATLAS-old/Makefile	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/Makefile	2006-01-05 21:59:36.000000000 +0000
@@ -25,6 +25,21 @@
 install :
 	$(MAKE) -f Make.top install arch=$(arch)
 
+shared :
+	$(MAKE) -f Make.top shared arch=$(arch)
+
+shared-strip :
+	$(MAKE) -f Make.top shared-strip arch=$(arch)
+
+ptshared :
+	$(MAKE) -f Make.top ptshared arch=$(arch)
+
+ptshared-strip :
+	$(MAKE) -f Make.top ptshared-strip arch=$(arch)
+
+liblapack.so :
+	$(MAKE) -f Make.top liblapack.so arch=$(arch)
+
 dup0 :
 	$(MAKE) -f Make.top dup0 arch=$(arch) arch0=$(arch0)
 dup :
diff -Naur ATLAS-old/config.c ATLAS/config.c
--- ATLAS-old/config.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/config.c	2006-01-05 21:59:36.000000000 +0000
@@ -2140,11 +2140,13 @@
 /*
  * If requested, see if we can locate a comparison BLAS
  */
+/* Gentoo
    if (F77 && BLASlib)
    {
       GetBlasTry(OS, mach, BLASlib);
       FindBlas(fpout, fplog, redir, F77, F77FLAGS, BLASlib);
    }
+ */
 /*
  * If using a non-g77 Fortran under Windows, throw the -mno-cygwin for all gcc
  */
@@ -2931,6 +2933,7 @@
             else if (strstr(ln, "Athlon(tm) 64")) mach = AmdHammer64;
             else if (strstr(ln, "Athlon")) mach = AmdAthlon;
             else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
+	    else if (strstr(ln, "XEON")) mach = IntP4; /* Gentoo */
          }
          break;
       default:;
@@ -3063,6 +3066,9 @@
    if (i || ln[0] == '\0' || strstr(ln, "i586") || strstr(ln, "i486") ||
             strstr(ln, "i386"))
    {
+#ifndef INTERACTIVE
+      exit(-1); /*/ Make ebuild complain. */
+#endif
       fprintf(stdout, "Enter your machine type:\n");
       fprintf(stdout, "   1. Other/UNKNOWN\n\n");
       fprintf(stdout, "   2. AMD Athlon\n");
@@ -3080,6 +3086,9 @@
    }
    else if (strstr(ln, "ia64"))
    {
+#ifndef INTERACTIVE
+      exit(-1); /*/ Make ebuild complain. */
+#endif
       fprintf(stdout, "Enter your machine type:\n");
       fprintf(stdout, "   1. Other/UNKNOWN\n");
       fprintf(stdout, "   2. IA-64 Itanium 1\n");
@@ -3091,6 +3100,9 @@
    }
    else if (strstr(ln, "x86_64"))
    {
+#ifndef INTERACTIVE
+      exit(-1); /*/ Make ebuild complain. */
+#endif
       fprintf(stdout, "Enter your machine type:\n");
       fprintf(stdout, "   1. Other/UNKNOWN\n");
       fprintf(stdout, "   2. 32 bit AMD Hammer\n");
@@ -3102,6 +3114,9 @@
    }
    else if (strstr(ln, "i686"))
    {
+#ifndef INTERACTIVE
+      exit(-1); /* Make ebuild complain. */
+#endif
       fprintf(stdout, "Enter your machine type:\n");
       fprintf(stdout, "   1. Other/UNKNOWN\n");
       fprintf(stdout, "   2. AMD Athlon\n");
@@ -3655,7 +3670,8 @@
       if (ierr)
       {
          fprintf(stderr, "File Make.%s already exists!\n", ARCH);
-         ierr = !IsYes('n', "", "overwrite it?");
+/* Gentoo         ierr = !IsYes('n', "", "overwrite it?"); */
+         ierr = !IsYes('y', "", "overwrite it?");
       }
    }
    while (ierr);
@@ -3981,7 +3997,7 @@
    fprintf(fpout, "   MVTdir = $(TOPdir)/tune/blas/gemv/$(ARCH)\n");
    fprintf(fpout, "   R1Tdir = $(TOPdir)/tune/blas/ger/$(ARCH)\n");
    fprintf(fpout, "   L1Tdir = $(TOPdir)/tune/blas/level1/$(ARCH)\n");
-   fprintf(fpout, "   L3Tdir = $(TOPdir)/tune/blas/level3/$(ARCH)\n\n");
+   fprintf(fpout, "   L3Tdir = $(TOPdir)/tune/blas/level3/$(ARCH)\n");
 
    fprintf(fpout,
 "#  ---------------------------------------------------------------------\n");
@@ -4128,7 +4144,12 @@
       fprintf(fpout, "   BC = $(CC)\n");
       fprintf(fpout, "   BCFLAGS = $(CCFLAGS)\n");
    }
+#ifdef USE_LIBTOOL
+   fprintf(fpout, "   LIBTOOL = libtool --mode=compile\n");
+   fprintf(fpout, "   ARCHIVER = $(TOPdir)/war %s\n", ARCHIVER);
+#else
    fprintf(fpout, "   ARCHIVER = %s\n", ARCHIVER);
+#endif
    fprintf(fpout, "   ARFLAGS  = %s\n", ARFLAGS);
    fprintf(fpout, "   RANLIB   = %s\n\n", RANLIB);
 
diff -Naur ATLAS-old/makes/Make.aux ATLAS/makes/Make.aux
--- ATLAS-old/makes/Make.aux	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.aux	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 
 ptobj = ATL_ptflushcache.o
 obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \
@@ -112,12 +113,16 @@
 
 ATL_cputime.o : $(SYSdir)/ATL_cputime.o
 	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
+	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo
+	ln -sf $(SYSdir)/.libs/ATL_cputime.o .libs/ATL_cputime.o
 $(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c
 	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
 $(SYSdir)/ATL_cputime.c:
 	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
 ATL_walltime.o : $(SYSdir)/ATL_walltime.o
 	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o
+	ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo
+	ln -sf $(SYSdir)/.libs/ATL_walltime.o .libs/ATL_walltime.o
 $(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
 	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
 $(SYSdir)/ATL_walltime.c:
diff -Naur ATLAS-old/makes/Make.bin ATLAS/makes/Make.bin
--- ATLAS-old/makes/Make.bin	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.bin	2006-01-05 21:59:36.000000000 +0000
@@ -53,11 +53,11 @@
 	cd $(TOPdir)/src/blas/level3/$(ARCH) ; $(MAKE) lib
 	cd $(TOPdir)/src/blas/pklevel3/$(ARCH) ; $(MAKE) lib
 	cd $(TOPdir)/src/blas/reference/level3/$(ARCH) ; $(MAKE) lib
-	cd $(TOPdir)/src/lapack/$(ARCH) ; $(MAKE) lib
+#Gentoo	cd $(TOPdir)/src/lapack/$(ARCH) ; $(MAKE) lib
 	cd $(TOPdir)/interfaces/blas/C/src/$(ARCH) ; $(MAKE) all
 	- cd $(TOPdir)/interfaces/blas/F77/src/$(ARCH) ; $(MAKE) lib
-	cd $(TOPdir)/interfaces/lapack/C/src/$(ARCH) ; $(MAKE) lib
-	- cd $(TOPdir)/interfaces/lapack/F77/src/$(ARCH) ; $(MAKE) lib
+#Gentoo	cd $(TOPdir)/interfaces/lapack/C/src/$(ARCH) ; $(MAKE) lib
+#Gentoo	- cd $(TOPdir)/interfaces/lapack/F77/src/$(ARCH) ; $(MAKE) lib
 
 error_report :
 	cd ../.. ; $(MAKE) error_report arch=$(ARCH)
diff -Naur ATLAS-old/makes/Make.cblas ATLAS/makes/Make.cblas
--- ATLAS-old/makes/Make.cblas	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.cblas	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:= $(LIBTOOL) --tag=CC $(CC)
 
 aobj = cblas_xerbla.o cblas_errprn.o
 sptlvl3obj = cblas_sptgemm.o cblas_sptsymm.o cblas_sptsyr2k.o cblas_sptsyrk.o \
diff -Naur ATLAS-old/makes/Make.f77blas ATLAS/makes/Make.f77blas
--- ATLAS-old/makes/Make.f77blas	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.f77blas	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,8 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
+F77:=$(LIBTOOL) --tag=F77 $(F77)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.gpmm ATLAS/makes/Make.gpmm
--- ATLAS-old/makes/Make.gpmm	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.gpmm	2006-01-05 21:59:36.000000000 +0000
@@ -1,5 +1,7 @@
 include Make.inc
 
+CC:=$(LIBTOOL) --tag=CC $(CC)
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Naur ATLAS-old/makes/Make.l1ptblas ATLAS/makes/Make.l1ptblas
--- ATLAS-old/makes/Make.l1ptblas	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l1ptblas	2006-01-05 21:59:36.000000000 +0000
@@ -1,3 +1,4 @@
+CC:=$(LIBTOOL) --tag=CC $(CC)
 slib:
 dlib:
 clib:
diff -Naur ATLAS-old/makes/Make.l1ref ATLAS/makes/Make.l1ref
--- ATLAS-old/makes/Make.l1ref	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l1ref	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.l1src ATLAS/makes/Make.l1src
--- ATLAS-old/makes/Make.l1src	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l1src	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 
 sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o
 
@@ -16,29 +17,29 @@
 
 sgen :
 	$(MAKE) Make_srot
-	$(MAKE) -f Make_srot lib
+	$(MAKE) -f Make_srot lib CC="$(CC)"
 	$(MAKE) Make_saxpby
-	$(MAKE) -f Make_saxpby lib
+	$(MAKE) -f Make_saxpby lib CC="$(CC)"
 	$(MAKE) Make_scpsc
-	$(MAKE) -f Make_scpsc lib
+	$(MAKE) -f Make_scpsc lib CC="$(CC)"
 	$(MAKE) Make_sset
-	$(MAKE) -f Make_sset lib
+	$(MAKE) -f Make_sset lib CC="$(CC)"
 	$(MAKE) Make_snrm2
-	$(MAKE) -f Make_snrm2 lib
+	$(MAKE) -f Make_snrm2 lib CC="$(CC)"
 	$(MAKE) Make_sasum
-	$(MAKE) -f Make_sasum lib
+	$(MAKE) -f Make_sasum lib CC="$(CC)"
 	$(MAKE) Make_sdot
-	$(MAKE) -f Make_sdot lib
+	$(MAKE) -f Make_sdot lib CC="$(CC)"
 	$(MAKE) Make_sswap
-	$(MAKE) -f Make_sswap lib
+	$(MAKE) -f Make_sswap lib CC="$(CC)"
 	$(MAKE) Make_sscal
-	$(MAKE) -f Make_sscal lib
+	$(MAKE) -f Make_sscal lib CC="$(CC)"
 	$(MAKE) Make_scopy
-	$(MAKE) -f Make_scopy lib
+	$(MAKE) -f Make_scopy lib CC="$(CC)"
 	$(MAKE) Make_saxpy
-	$(MAKE) -f Make_saxpy lib
+	$(MAKE) -f Make_saxpy lib CC="$(CC)"
 	$(MAKE) Make_siamax
-	$(MAKE) -f Make_siamax lib
+	$(MAKE) -f Make_siamax lib CC="$(CC)"
 slvl1 : slib
 slib :   slib.grd
 	$(MAKE) sgen
@@ -51,29 +52,29 @@
 	rm -f $(sobj) s*.grd
 dgen :
 	$(MAKE) Make_drot
-	$(MAKE) -f Make_drot lib
+	$(MAKE) -f Make_drot lib CC="$(CC)"
 	$(MAKE) Make_daxpby
-	$(MAKE) -f Make_daxpby lib
+	$(MAKE) -f Make_daxpby lib CC="$(CC)"
 	$(MAKE) Make_dcpsc
-	$(MAKE) -f Make_dcpsc lib
+	$(MAKE) -f Make_dcpsc lib CC="$(CC)"
 	$(MAKE) Make_dset
-	$(MAKE) -f Make_dset lib
+	$(MAKE) -f Make_dset lib CC="$(CC)"
 	$(MAKE) Make_dnrm2
-	$(MAKE) -f Make_dnrm2 lib
+	$(MAKE) -f Make_dnrm2 lib CC="$(CC)"
 	$(MAKE) Make_dasum
-	$(MAKE) -f Make_dasum lib
+	$(MAKE) -f Make_dasum lib CC="$(CC)"
 	$(MAKE) Make_ddot
-	$(MAKE) -f Make_ddot lib
+	$(MAKE) -f Make_ddot lib CC="$(CC)"
 	$(MAKE) Make_dswap
-	$(MAKE) -f Make_dswap lib
+	$(MAKE) -f Make_dswap lib CC="$(CC)"
 	$(MAKE) Make_dscal
-	$(MAKE) -f Make_dscal lib
+	$(MAKE) -f Make_dscal lib CC="$(CC)"
 	$(MAKE) Make_dcopy
-	$(MAKE) -f Make_dcopy lib
+	$(MAKE) -f Make_dcopy lib CC="$(CC)"
 	$(MAKE) Make_daxpy
-	$(MAKE) -f Make_daxpy lib
+	$(MAKE) -f Make_daxpy lib CC="$(CC)"
 	$(MAKE) Make_diamax
-	$(MAKE) -f Make_diamax lib
+	$(MAKE) -f Make_diamax lib CC="$(CC)"
 dlvl1 : dlib
 dlib :   dlib.grd
 	$(MAKE) dgen
@@ -86,31 +87,31 @@
 	rm -f $(dobj) d*.grd
 cgen :
 	$(MAKE) Make_crot
-	$(MAKE) -f Make_crot lib
+	$(MAKE) -f Make_crot lib CC="$(CC)"
 	$(MAKE) Make_caxpby
-	$(MAKE) -f Make_caxpby lib
+	$(MAKE) -f Make_caxpby lib CC="$(CC)"
 	$(MAKE) Make_ccpsc
-	$(MAKE) -f Make_ccpsc lib
+	$(MAKE) -f Make_ccpsc lib CC="$(CC)"
 	$(MAKE) Make_cset
-	$(MAKE) -f Make_cset lib
+	$(MAKE) -f Make_cset lib CC="$(CC)"
 	$(MAKE) Make_cnrm2
-	$(MAKE) -f Make_cnrm2 lib
+	$(MAKE) -f Make_cnrm2 lib CC="$(CC)"
 	$(MAKE) Make_casum
-	$(MAKE) -f Make_casum lib
+	$(MAKE) -f Make_casum lib CC="$(CC)"
 	$(MAKE) Make_cdot
-	$(MAKE) -f Make_cdot lib
+	$(MAKE) -f Make_cdot lib CC="$(CC)"
 	$(MAKE) Make_cswap
-	$(MAKE) -f Make_cswap lib
+	$(MAKE) -f Make_cswap lib CC="$(CC)"
 	$(MAKE) Make_cscal
-	$(MAKE) -f Make_cscal lib
+	$(MAKE) -f Make_cscal lib CC="$(CC)"
 	$(MAKE) Make_ccopy
-	$(MAKE) -f Make_ccopy lib
+	$(MAKE) -f Make_ccopy lib CC="$(CC)"
 	$(MAKE) Make_caxpy
-	$(MAKE) -f Make_caxpy lib
+	$(MAKE) -f Make_caxpy lib CC="$(CC)"
 	$(MAKE) Make_ciamax
-	$(MAKE) -f Make_ciamax lib
+	$(MAKE) -f Make_ciamax lib CC="$(CC)"
 	$(MAKE) Make_cdotc
-	$(MAKE) -f Make_cdotc lib
+	$(MAKE) -f Make_cdotc lib CC="$(CC)"
 clvl1 : clib
 clib : slib clib.grd
 	$(MAKE) cgen
@@ -123,31 +124,31 @@
 	rm -f $(cobj) c*.grd
 zgen :
 	$(MAKE) Make_zrot
-	$(MAKE) -f Make_zrot lib
+	$(MAKE) -f Make_zrot lib CC="$(CC)"
 	$(MAKE) Make_zaxpby
-	$(MAKE) -f Make_zaxpby lib
+	$(MAKE) -f Make_zaxpby lib CC="$(CC)"
 	$(MAKE) Make_zcpsc
-	$(MAKE) -f Make_zcpsc lib
+	$(MAKE) -f Make_zcpsc lib CC="$(CC)"
 	$(MAKE) Make_zset
-	$(MAKE) -f Make_zset lib
+	$(MAKE) -f Make_zset lib CC="$(CC)"
 	$(MAKE) Make_znrm2
-	$(MAKE) -f Make_znrm2 lib
+	$(MAKE) -f Make_znrm2 lib CC="$(CC)"
 	$(MAKE) Make_zasum
-	$(MAKE) -f Make_zasum lib
+	$(MAKE) -f Make_zasum lib CC="$(CC)"
 	$(MAKE) Make_zdot
-	$(MAKE) -f Make_zdot lib
+	$(MAKE) -f Make_zdot lib CC="$(CC)"
 	$(MAKE) Make_zswap
-	$(MAKE) -f Make_zswap lib
+	$(MAKE) -f Make_zswap lib CC="$(CC)"
 	$(MAKE) Make_zscal
-	$(MAKE) -f Make_zscal lib
+	$(MAKE) -f Make_zscal lib CC="$(CC)"
 	$(MAKE) Make_zcopy
-	$(MAKE) -f Make_zcopy lib
+	$(MAKE) -f Make_zcopy lib CC="$(CC)"
 	$(MAKE) Make_zaxpy
-	$(MAKE) -f Make_zaxpy lib
+	$(MAKE) -f Make_zaxpy lib CC="$(CC)"
 	$(MAKE) Make_ziamax
-	$(MAKE) -f Make_ziamax lib
+	$(MAKE) -f Make_ziamax lib CC="$(CC)"
 	$(MAKE) Make_zdotc
-	$(MAKE) -f Make_zdotc lib
+	$(MAKE) -f Make_zdotc lib CC="$(CC)"
 zlvl1 : zlib
 zlib : dlib zlib.grd
 	$(MAKE) zgen
diff -Naur ATLAS-old/makes/Make.l2 ATLAS/makes/Make.l2
--- ATLAS-old/makes/Make.l2	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l2	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.l2aux ATLAS/makes/Make.l2aux
--- ATLAS-old/makes/Make.l2aux	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l2aux	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.l2ptblas ATLAS/makes/Make.l2ptblas
--- ATLAS-old/makes/Make.l2ptblas	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l2ptblas	2006-01-05 21:59:36.000000000 +0000
@@ -1,3 +1,4 @@
+CC:=$(LIBTOOL) --tag=CC $(CC)
 slib:
 dlib:
 clib:
diff -Naur ATLAS-old/makes/Make.l2ref ATLAS/makes/Make.l2ref
--- ATLAS-old/makes/Make.l2ref	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l2ref	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 # 
diff -Naur ATLAS-old/makes/Make.l2src ATLAS/makes/Make.l2src
--- ATLAS-old/makes/Make.l2src	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l2src	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 
 sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \
        ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \
diff -Naur ATLAS-old/makes/Make.l3 ATLAS/makes/Make.l3
--- ATLAS-old/makes/Make.l3	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l3	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.l3aux ATLAS/makes/Make.l3aux
--- ATLAS-old/makes/Make.l3aux	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l3aux	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.l3kern ATLAS/makes/Make.l3kern
--- ATLAS-old/makes/Make.l3kern	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l3kern	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 
 sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \
        ATL_ssycopyU_aX.o ATL_ssymmLL.o ATL_ssymmLU.o ATL_ssymmRL.o \
diff -Naur ATLAS-old/makes/Make.l3ptblas ATLAS/makes/Make.l3ptblas
--- ATLAS-old/makes/Make.l3ptblas	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l3ptblas	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.l3ref ATLAS/makes/Make.l3ref
--- ATLAS-old/makes/Make.l3ref	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.l3ref	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.miptblas ATLAS/makes/Make.miptblas
--- ATLAS-old/makes/Make.miptblas	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.miptblas	2006-01-05 21:59:36.000000000 +0000
@@ -43,6 +43,7 @@
 ########################################################################
 #
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 #
 ########################################################################
 #
diff -Naur ATLAS-old/makes/Make.mmsrc ATLAS/makes/Make.mmsrc
--- ATLAS-old/makes/Make.mmsrc	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.mmsrc	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,6 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
+MCC:=$(LIBTOOL) --tag=CC $(MCC)
 
 $(INCdir)/atlas_type.h :
 	cd $(SYSdir) ; $(MAKE) RunTyp
@@ -77,7 +79,7 @@
 sclean :
 	rm -f $(sobj) s*.grd
 scleanuplib :
-	cd KERNEL ; $(MAKE) -f sMakefile slib
+	cd KERNEL ; $(MAKE) -f sMakefile slib MCC="$(MCC)"
 
 slib : 
 	$(MAKE) auxillib scleanuplib susergemm
@@ -190,7 +192,7 @@
 dclean :
 	rm -f $(dobj) d*.grd
 dcleanuplib :
-	cd KERNEL ; $(MAKE) -f dMakefile dlib
+	cd KERNEL ; $(MAKE) -f dMakefile dlib MCC="$(MCC)"
 
 dlib : 
 	$(MAKE) auxillib dcleanuplib dusergemm
@@ -303,7 +305,7 @@
 cclean :
 	rm -f $(cobj) c*.grd
 ccleanuplib :
-	cd KERNEL ; $(MAKE) -f cMakefile clib
+	cd KERNEL ; $(MAKE) -f cMakefile clib MCC="$(MCC)"
 
 clib : 
 	$(MAKE) auxillib ccleanuplib cusergemm
@@ -480,7 +482,7 @@
 zclean :
 	rm -f $(zobj) z*.grd
 zcleanuplib :
-	cd KERNEL ; $(MAKE) -f zMakefile zlib
+	cd KERNEL ; $(MAKE) -f zMakefile zlib MCC="$(MCC)"
 
 zlib : 
 	$(MAKE) auxillib zcleanuplib zusergemm
diff -Naur ATLAS-old/makes/Make.mvsrc ATLAS/makes/Make.mvsrc
--- ATLAS-old/makes/Make.mvsrc	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.mvsrc	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 
 sobj = ATL_sgemv.o
 
@@ -18,7 +19,7 @@
 clean : sclean dclean cclean zclean
 
 dlib : 
-	$(PMAKE) -f Make_dmv dlib
+	$(PMAKE) -f Make_dmv dlib CC="$(CC)"
 	$(PMAKE) dlib.grd
 dlib.grd : $(dobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
@@ -27,7 +28,7 @@
 dclean : 
 	rm -f $(dobj) d*.grd
 slib : 
-	$(PMAKE) -f Make_smv slib
+	$(PMAKE) -f Make_smv slib CC="$(CC)"
 	$(PMAKE) slib.grd
 slib.grd : $(sobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
@@ -36,7 +37,7 @@
 sclean : 
 	rm -f $(sobj) s*.grd
 clib : 
-	$(PMAKE) -f Make_cmv clib
+	$(PMAKE) -f Make_cmv clib CC="$(CC)"
 	$(PMAKE) clib.grd
 clib.grd : $(cobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
@@ -45,7 +46,7 @@
 cclean : 
 	rm -f $(cobj) c*.grd
 zlib : 
-	$(PMAKE) -f Make_zmv zlib
+	$(PMAKE) -f Make_zmv zlib CC="$(CC)"
 	$(PMAKE) zlib.grd
 zlib.grd : $(zobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
diff -Naur ATLAS-old/makes/Make.pkl3 ATLAS/makes/Make.pkl3
--- ATLAS-old/makes/Make.pkl3	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.pkl3	2006-01-05 21:59:36.000000000 +0000
@@ -1,5 +1,7 @@
 include Make.inc
 
+CC:=$(LIBTOOL) --tag=CC $(CC)
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Naur ATLAS-old/makes/Make.r1src ATLAS/makes/Make.r1src
--- ATLAS-old/makes/Make.r1src	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.r1src	2006-01-05 21:59:36.000000000 +0000
@@ -1,4 +1,5 @@
 include Make.inc
+CC:=$(LIBTOOL) --tag=CC $(CC)
 
 sobj = ATL_sger.o
 dobj = ATL_dger.o
@@ -16,7 +17,7 @@
 
 dlib :
 	$(PMAKE) dlib.grd
-	$(PMAKE) -f Make_dr1 lib
+	$(PMAKE) -f Make_dr1 lib CC="$(CC)"
 dlib.grd : $(dobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
 	$(RANLIB) $(ATLASlib)
@@ -25,7 +26,7 @@
 	rm -f $(dobj) d*.grd
 slib :
 	$(PMAKE) slib.grd
-	$(PMAKE) -f Make_sr1 lib
+	$(PMAKE) -f Make_sr1 lib CC="$(CC)"
 slib.grd : $(sobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
 	$(RANLIB) $(ATLASlib)
@@ -34,7 +35,7 @@
 	rm -f $(sobj) s*.grd
 clib :
 	$(PMAKE) clib.grd
-	$(PMAKE) -f Make_cr1 lib
+	$(PMAKE) -f Make_cr1 lib CC="$(CC)"
 clib.grd : $(cobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
 	$(RANLIB) $(ATLASlib)
@@ -43,7 +44,7 @@
 	rm -f $(cobj) c*.grd
 zlib :
 	$(PMAKE) zlib.grd
-	$(PMAKE) -f Make_zr1 lib
+	$(PMAKE) -f Make_zr1 lib CC="$(CC)"
 zlib.grd : $(zobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
 	$(RANLIB) $(ATLASlib)
diff -Naur ATLAS-old/makes/Make.sprk ATLAS/makes/Make.sprk
--- ATLAS-old/makes/Make.sprk	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.sprk	2006-01-05 21:59:36.000000000 +0000
@@ -1,5 +1,7 @@
 include Make.inc
 
+CC:=$(LIBTOOL) --tag=CC $(CC)
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Naur ATLAS-old/makes/Make.sysinfo ATLAS/makes/Make.sysinfo
--- ATLAS-old/makes/Make.sysinfo	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/makes/Make.sysinfo	2006-01-05 21:59:36.000000000 +0000
@@ -102,12 +102,12 @@
 ATL_cputime.c : 
 	cp ../ATL_cputime.c .
 ATL_cputime.o : ATL_cputime.c
-	$(CC) -c $(CCFLAGS) ATL_cputime.c
+	$(LIBTOOL) --tag=CC $(CC) -c $(CCFLAGS) ATL_cputime.c
 
 ATL_walltime.c : 
 	cp ../ATL_walltime.c .
 ATL_walltime.o : ATL_walltime.c
-	$(CC) -c $(CCFLAGS) ATL_walltime.c
+	$(LIBTOOL) --tag=CC $(CC) -c $(CCFLAGS) ATL_walltime.c
 
 ATL_Xwalltime.o : ATL_walltime.o
 	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c
diff -Naur ATLAS-old/tune/blas/gemm/emit_mm.c ATLAS/tune/blas/gemm/emit_mm.c
--- ATLAS-old/tune/blas/gemm/emit_mm.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/tune/blas/gemm/emit_mm.c	2006-01-05 21:59:36.000000000 +0000
@@ -2218,6 +2218,7 @@
    assert(fp);
 
    fprintf(fp, "include ../Make.inc\n\n");
+   fprintf(fp, "CC:=$(LIBTOOL) --tag=CC $(CC)\n\n");
    fprintf(fp, "CDEFS2 = $(CDEFS)");
    for (i=0; i < 3; i++)
       if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);
@@ -2297,7 +2298,7 @@
                              wp->NBs[k], wp->imult, wp->fixed, betas[j]);
                   else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);
                      fprintf(fp, "%s.o : %s.c \n", fnam, fnam);
-                  fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
+                  fprintf(fp, "\t$(LIBTOOL) --tag=CC %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
                           wp->CC, betas[j], wp->CCFLAGS, fnam);
                }
             }
diff -Naur ATLAS-old/tune/blas/gemv/mvsearch.c ATLAS/tune/blas/gemv/mvsearch.c
--- ATLAS-old/tune/blas/gemv/mvsearch.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/tune/blas/gemv/mvsearch.c	2006-01-05 21:59:36.000000000 +0000
@@ -506,7 +506,7 @@
    fprintf(fp, "include Make.inc\n\n");
 
    if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(CC)\n");
-   else fprintf(fp, "MVNCC = %s\n", ccN);
+   else fprintf(fp, "MVNCC = $(LIBTOOL) --tag=CC %s\n", ccN);
    if (ccN[0] == '\0' && ccflagsN[0] != '\0')
       fprintf(fp, "MVNFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsN, typ);
    else if (ccflagsN[0] != '\0')
@@ -519,7 +519,7 @@
    }
 
    if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(CC)\n");
-   else fprintf(fp, "MVTCC = %s\n", ccT);
+   else fprintf(fp, "MVTCC = $(LIBTOOL) --tag=CC  %s\n", ccT);
    if (ccT[0] == '\0' && ccflagsT[0] != '\0')
       fprintf(fp, "MVTFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsT, typ);
    else if (ccflagsT[0] != '\0')
@@ -532,7 +532,7 @@
    }
 
    if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(CC)\n");
-   else fprintf(fp, "MVSCC = %s\n", ccS);
+   else fprintf(fp, "MVSCC = $(LIBTOOL) --tag=CC %s\n", ccS);
    if (ccS[0] == '\0' && ccflagsS[0] != '\0')
       fprintf(fp, "MVSFLAGS = $(CCFLAGS) %s -D%s", ccflagsS, typ);
    else if (ccflagsS[0] != '\0')
diff -Naur ATLAS-old/tune/blas/level1/asumsrch.c ATLAS/tune/blas/level1/asumsrch.c
--- ATLAS-old/tune/blas/level1/asumsrch.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/tune/blas/level1/asumsrch.c	2006-01-05 21:59:36.000000000 +0000
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -180,7 +181,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+/* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Naur ATLAS-old/tune/blas/level1/copysrch.c ATLAS/tune/blas/level1/copysrch.c
--- ATLAS-old/tune/blas/level1/copysrch.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/tune/blas/level1/copysrch.c	2006-01-05 21:59:36.000000000 +0000
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -180,7 +181,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+/* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Naur ATLAS-old/tune/blas/level1/iamaxsrch.c ATLAS/tune/blas/level1/iamaxsrch.c
--- ATLAS-old/tune/blas/level1/iamaxsrch.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/tune/blas/level1/iamaxsrch.c	2006-01-05 21:59:36.000000000 +0000
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -179,7 +180,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+/* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Naur ATLAS-old/tune/blas/level1/setsrch.c ATLAS/tune/blas/level1/setsrch.c
--- ATLAS-old/tune/blas/level1/setsrch.c	2006-01-05 21:58:50.000000000 +0000
+++ ATLAS/tune/blas/level1/setsrch.c	2006-01-05 21:59:36.000000000 +0000
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -181,7 +182,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+/* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;