a) update to 3.6.0

b) make PIC object files for amd64
c) some clean ups

3 files changed, 33 insertions, 46 deletions

diff --git a/math/atlas-devel/files/non-thread-patch b/math/atlas-devel/files/non-thread-patch
deleted file mode 100644
index 742eb36f4d29..000000000000
--- a/math/atlas-devel/files/non-thread-patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- config.c.orig	Sun Dec 28 13:12:32 2003
-+++ config.c	Sun Dec 28 13:15:07 2003
-@@ -3515,6 +3515,7 @@
-    }
-    i = ncpu;
-    if (!ncpu) ncpu = ProbeNCPU(OS, mach, targ, TOPdir);
-+   ncpu = 1; // force non-threading
-    if (ncpu != 1) /* user may want to thread */
-    {
-       DisplayFile("CONFIG/pthread.txt", stdout, NLINES);
-@@ -3952,6 +3953,7 @@
-       USEDEFL1 = !IsYes('y', "", "Tune the Level 1 BLAS?");
-    }
- 
-+   fpout = fopen("ARCHNAME-NON-THREADED", "w");
-    fprintf(fpout, "%s", ARCH);
-    fclose(fpout);
-    ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH);
-
diff --git a/math/atlas-devel/files/patch-config.c b/math/atlas-devel/files/patch-config.c
index 458bbbb4d032..4f6773eacf38 100644
--- a/math/atlas-devel/files/patch-config.c
+++ b/math/atlas-devel/files/patch-config.c
@@ -34,6 +34,15 @@
        }
     }
     return(*comp ? comp : NULL);
+@@ -2801,7 +2801,7 @@
+       else if (strstr(ln, "ia64")) la = LAIA64;
+       else if ( strstr(ln, "i686") || strstr(ln, "i586") ||
+                 strstr(ln, "i486") || strstr(ln, "i386") ||
+-                strstr(ln, "x86_64") ) la = LAX86;
++                strstr(ln, "x86_64") || strstr(ln, "amd64")  ) la = LAX86;
+    }
+    return(la);
+ }
 @@ -2840,7 +2842,10 @@
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
@@ -51,7 +60,7 @@
              if (strstr(ln, "Pentium Pro")) mach = IntPPRO;
 +            else if (strstr(ln, "Pentium(R) Pro")) mach = IntPPRO;
 +            else if (strstr(ln, "Pentium 4")) mach = IntP4;
-+	    else if (strstr(ln, "Pentium(R) 4")) mach = IntP4;
++            else if (strstr(ln, "Pentium(R) 4")) mach = IntP4;
              else if (strstr(ln, "Pentium III")) mach = IntPIII;
 +            else if (strstr(ln, "Pentium(R) III")) mach = IntPIII;
              else if (strstr(ln, "Pentium II ")) mach = IntPII;
@@ -70,15 +79,29 @@
           }
           break;
        default:;
-@@ -3939,6 +3952,8 @@
-       USEDEFL1 = !IsYes('y', "", "Tune the Level 1 BLAS?");
+@@ -3654,8 +3654,8 @@
+    }
+    if (THREADS) /* add ncpu to ARCH */
+    {
+-      for (i=0; ARCH[i]; i++);
+-      sprintf(ARCH+i, "_%d", ncpu);
++//      for (i=0; ARCH[i]; i++); // do not add number of cpu for ARCHNAME
++//      sprintf(ARCH+i, "_%d", ncpu); // #cpu can be different in general
     }
- 
-+   fprintf(fpout, "%s", ARCH);
-+   fclose(fpout);
-    ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH);
-    sprintf(ln, "Make.%s", ARCH);
-    fpout = fopen(ln, "w");
+    do
+    {
+@@ -4064,9 +4063,9 @@
+    if (mach == IA64Itan || mach == IA64Itan2 )
+       fprintf(fpout, " -DATL_MAXNREG=128");
+    if (ASMD != ASM_None) fprintf(fpout, " -DATL_%s", ASMNAM[ASMD]);
+-   if (mach == AmdHammer32 && (OS != OSWinNT && OS != OSWin9x))
++   if (mach == AmdHammer32 && (OS != OSWinNT && OS != OSWin9x && OS != OSFreeBSD))
+       fprintf(fpout, " -m32");
+-   else if (mach == AmdHammer64) fprintf(fpout, " -m64");
++   else if (mach == AmdHammer64 && (OS != OSFreeBSD)) fprintf(fpout, " -m64");
+    if (mach == IA64Itan2 && strstr(CC, "icc"))
+       fprintf(fpout, " -DATL_IntelIccBugs");
+    fprintf(fpout, "\n\n");
 @@ -4080,7 +4095,7 @@
     if (THREADS)
     {
diff --git a/math/atlas-devel/files/thread-patch b/math/atlas-devel/files/thread-patch
index e07813c4fc30..5d6521809593 100644
--- a/math/atlas-devel/files/thread-patch
+++ b/math/atlas-devel/files/thread-patch
@@ -5,24 +5,7 @@
  enum USERGEMM {UG_None=0, UG_GOTO};
  
 -int XCOMP=0, THREADS=0, USEWINF77=0, NLINES=0, ISWIN=0;
-+int XCOMP=0, THREADS=1, USEWINF77=0, NLINES=0, ISWIN=0; // force threading
++int XCOMP=0, THREADS=1, USEWINF77=0, NLINES=0, ISWIN=0; // force threading for single processor
  char TARGNAM[512];
  enum MACHTYPE mach=MACHOther;
  
-@@ -3515,7 +3515,6 @@
-    }
-    i = ncpu;
-    if (!ncpu) ncpu = ProbeNCPU(OS, mach, targ, TOPdir);
--   ncpu = 1; // force non-threading
-    if (ncpu != 1) /* user may want to thread */
-    {
-       DisplayFile("CONFIG/pthread.txt", stdout, NLINES);
-@@ -3155,7 +3154,7 @@
-    }
-    if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe");
- 
--   fpout = fopen("ARCHNAME-NON-THREADED", "w");
-+   fpout = fopen("ARCHNAME-THREADED", "w");
-    fprintf(fpout, "%s", ARCH);
-    fclose(fpout);
-    ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH);