Cosmetic change: the constant MPFR_TUNE_CASE is now defined in mparam_h.in.

Hence the files src/some-architecture/mparam.h are now simply obtained by 
performing 'make tune' on some architecture and copying the resulting
src/mparam.h to src/some-architecture/mparam.h.



git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@7231 280ebfd0-de03-0410-8827-d642c229c3f4

12 files changed, 18 insertions, 10 deletions

diff --git a/src/amd/athlon/mparam.h b/src/amd/athlon/mparam.h
index 9d775fe30..81b032c56 100644
--- a/src/amd/athlon/mparam.h
+++ b/src/amd/athlon/mparam.h
@@ -1,4 +1,3 @@
-#define MPFR_TUNE_CASE "src/amd/athlon/mparam.h"
 #define MPFR_MULHIGH_TAB  \
  -1,0,-1,0,-1,0,-1,-1,0,-1,-1,0,0,0,0,10, \
  0,12,13,14,15,16,0,0,0,0,0,19,0,0,0,0, \
diff --git a/src/amd/k8/mparam.h b/src/amd/k8/mparam.h
index 64300b02d..aa4827bbc 100644
--- a/src/amd/k8/mparam.h
+++ b/src/amd/k8/mparam.h
@@ -2,7 +2,6 @@
 /* gcc11.fsffrance.org (Dual-Core AMD Opteron(tm) Processor 2212) with gmp 5.0.1 */
 
 
-#define MPFR_TUNE_CASE "src/amd/k8/mparam.h"
 #define MPFR_MULHIGH_TAB  \
  -1,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9,9,11, \
  12,13,11,15,14,14,15,16,18,18,19,20,18,19,19,20, \
diff --git a/src/arm/mparam.h b/src/arm/mparam.h
index ef054038a..12f15aa9c 100644
--- a/src/arm/mparam.h
+++ b/src/arm/mparam.h
@@ -1,7 +1,7 @@
 /* Generated by MPFR's tuneup.c, 2010-10-15, gcc 4.4.4 */
 /* gcc57.fsffrance.org (Feroceon 88FR131 rev 1 (v5l)) with gmp 5.0.1 */
 
-#define MPFR_TUNE_CASE "src/arm/mparam.h"
+
 #define MPFR_MULHIGH_TAB  \
  -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
diff --git a/src/ia64/mparam.h b/src/ia64/mparam.h
index 694929a62..b57d12b10 100644
--- a/src/ia64/mparam.h
+++ b/src/ia64/mparam.h
@@ -2,7 +2,6 @@
 /* Babe.fsffrance.org (Madison) with gmp 5.0.1 */
 
 
-#define MPFR_TUNE_CASE "src/ia64/mparam.h"
 #define MPFR_MULHIGH_TAB  \
  -1,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, \
  -1,-1,14,16,16,17,18,19,20,20,22,22,20,21,20,21, \
diff --git a/src/mparam_h.in b/src/mparam_h.in
index e064bc84e..1504b1bb1 100644
--- a/src/mparam_h.in
+++ b/src/mparam_h.in
@@ -28,35 +28,45 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
    As of gcc 4.2, you can also use: -march=native or -mtune=native */
 
 #if defined (__tune_pentium4__) /* Threshold for Pentium 4 */
+#define MPFR_TUNE_CASE "src/x86_64/pentium4/mparam.h"
 #include "x86_64/pentium4/mparam.h"
 
 #elif defined (__tune_core2__) && !defined (__i386) /* 64-bit Core 2 */
+#define MPFR_TUNE_CASE "src/x86_64/core2/mparam.h"
 #include "x86_64/core2/mparam.h"
 
 #elif defined (__tune_core2__) && defined (__i386) /* 32-bit Core 2,
       for example a 64-bit machine with gmp/mpfr compiled with ABI=32 */
+#define MPFR_TUNE_CASE "src/x86/core2/mparam.h"
 #include "x86/core2/mparam.h"
 
 #elif defined (__tune_k8__) /* Threshold for AMD 64 */
+#define MPFR_TUNE_CASE "src/amd/k8/mparam.h"
 #include "amd/k8/mparam.h"
 
 #elif defined (__tune_athlon__) /* Threshold for Athlon */
+#define MPFR_TUNE_CASE "src/amd/athlon/mparam.h"
 #include "amd/athlon/mparam.h"
 
 #elif defined (__tune_pentiumpro__) || defined (__tune_i686__) || defined (__i386) /* we consider all other 386's here */
+#define MPFR_TUNE_CASE "src/x86/mparam.h"
 #include "x86/mparam.h"
 
 #elif defined (__ia64) || defined (__itanium__) || defined (__tune_ia64__)
 /* Threshold for IA64 */
+#define MPFR_TUNE_CASE "src/ia64/mparam.h"
 #include "ia64/mparam.h"
 
 #elif defined (__arm__) /* Threshold for ARM */
+#define MPFR_TUNE_CASE "src/arm/mparam.h"
 #include "arm/mparam.h"
 
 #elif defined (__PPC64__) /* Threshold for 64-bit PowerPC */
+#define MPFR_TUNE_CASE "src/powerpc64/mparam.h"
 #include "powerpc64/mparam.h"
 
 #elif defined (__sparc_v9__) /* Threshold for 64-bits Sparc */
+#define MPFR_TUNE_CASE "src/sparc64/mparam.h"
 #include "sparc64/mparam.h"
 
 /* __mips64? __mips? */
diff --git a/src/powerpc64/mparam.h b/src/powerpc64/mparam.h
index b7ae8149d..dc742bed5 100644
--- a/src/powerpc64/mparam.h
+++ b/src/powerpc64/mparam.h
@@ -2,7 +2,6 @@
 /* ps3gccfarm.fsffrance.org (Cell Broadband Engine, altivec supported) with gmp 5.0.1 */
 
 
-#define MPFR_TUNE_CASE "src/powerpc64/mparam.h"
 #define MPFR_MULHIGH_TAB  \
  -1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0, \
  0,0,0,0,0,14,14,14,14,14,16,16,18,18,18,18, \
diff --git a/src/sparc64/mparam.h b/src/sparc64/mparam.h
index 8f0bb2a7d..b61362408 100644
--- a/src/sparc64/mparam.h
+++ b/src/sparc64/mparam.h
@@ -1,7 +1,7 @@
 /* Generated by MPFR's tuneup.c, 2010-10-18, gcc 3.3.5 */
 /* gcc64.fsffrance.org (sparc64) with gmp 5.0.1 */
 
-#define MPFR_TUNE_CASE "src/sparc64/mparam.h"
+
 #define MPFR_MULHIGH_TAB  \
  -1,0,0,-1,0,-1,0,-1,7,-1,9,-1,11,11,11,11, \
  11,13,13,15,15,17,15,17,17,19,19,21,19,19,21,21, \
diff --git a/src/x86/core2/mparam.h b/src/x86/core2/mparam.h
index c66c35301..9c48fdeaf 100644
--- a/src/x86/core2/mparam.h
+++ b/src/x86/core2/mparam.h
@@ -1,6 +1,6 @@
 /* Generated by MPFR's tuneup.c, 2007-12-21, gcc 4.1 */
 
-#define MPFR_TUNE_CASE "src/x86/core2/mparam.h"
+
 #define MPFR_MULHIGH_TAB  \
  -1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0, \
  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
diff --git a/src/x86/mparam.h b/src/x86/mparam.h
index c595585d4..d45276ff1 100644
--- a/src/x86/mparam.h
+++ b/src/x86/mparam.h
@@ -1,7 +1,7 @@
 /* Generated by MPFR's tuneup.c, 2009-02-09, gcc 4.3 */
 /* toto.loria.fr (Pentium M) with gmp-4.2.4 */
 
-#define MPFR_TUNE_CASE "src/x86/mparam.h"
+
 #define MPFR_MULHIGH_TAB  \
  -1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0, \
  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
diff --git a/src/x86_64/core2/mparam.h b/src/x86_64/core2/mparam.h
index 86c0a2211..eecf34047 100644
--- a/src/x86_64/core2/mparam.h
+++ b/src/x86_64/core2/mparam.h
@@ -1,7 +1,7 @@
 /* Generated by MPFR's tuneup.c, 2010-10-13, gcc 4.3.2 */
 /* gcc14.fsffrance.org (Intel(R) Xeon(R) CPU X5450 @ 3.00GHz) with gmp 5.0.1 */
 
-#define MPFR_TUNE_CASE "src/x86_64/core2/mparam.h"
+
 #define MPFR_MULHIGH_TAB  \
  -1,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0, \
  10,10,10,12,12,12,13,13,14,15,16,17,17,18,18,20, \
diff --git a/src/x86_64/pentium4/mparam.h b/src/x86_64/pentium4/mparam.h
index ad32f1000..5172e6cd0 100644
--- a/src/x86_64/pentium4/mparam.h
+++ b/src/x86_64/pentium4/mparam.h
@@ -1,7 +1,7 @@
 /* Generated by MPFR's tuneup.c, 2009-02-09, gcc 4.3 */
 /* crumble.loria.fr with gmp-4.2.4 */
 
-#define MPFR_TUNE_CASE "src/x86_64/pentium4/mparam.h"
+
 #define MPFR_MULHIGH_TAB  \
  -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
diff --git a/tune/tuneup.c b/tune/tuneup.c
index 1c9f2cc47..6f176fd95 100644
--- a/tune/tuneup.c
+++ b/tune/tuneup.c
@@ -1024,7 +1024,9 @@ all (const char *filename)
   fprintf (f, "system compiler */\n");
 #endif
   fprintf (f, "\n\n");
+  fprintf (f, "#ifndef MPFR_TUNE_CASE\n");
   fprintf (f, "#define MPFR_TUNE_CASE \"src/mparam.h\"\n");
+  fprintf (f, "#endif\n\n");
 
   /* Tune mulhigh */
   tune_mul_mulders (f);