toplev.c (print_version): Update GMP version string calculation.

	* toplev.c (print_version): Update GMP version string calculation.

From-SVN: r146924

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8fee4af8049911efb552ed8f004d974fa39264ff..8d3ef5bf992b79545495dee8facb8a2427c8da35 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * toplev.c (print_version): Update GMP version string calculation.
+
 2009-04-24  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/39791

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 19ee8aa0cd163c33459443bd10fa4f02ad7defdc..14d87822656c1cce6d38491bf8665a6bbfb6a08d 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1198,10 +1198,14 @@ print_version (FILE *file, const char *indent)
           indent, __VERSION__);
 
   /* We need to stringify the GMP macro values.  Ugh, gmp_version has
-     two string formats, "i.j.k" and "i.j" when k is zero.  */
+     two string formats, "i.j.k" and "i.j" when k is zero.  As of
+     gmp-4.3.0, GMP always uses the 3 number format.  */
 #define GCC_GMP_STRINGIFY_VERSION3(X) #X
 #define GCC_GMP_STRINGIFY_VERSION2(X) GCC_GMP_STRINGIFY_VERSION3(X)
-#if __GNU_MP_VERSION_PATCHLEVEL == 0
+#define GCC_GMP_VERSION_NUM(X,Y,Z) (((X) << 16L) | ((Y) << 8) | (Z))
+#define GCC_GMP_VERSION \
+  GCC_GMP_VERSION_NUM(__GNU_MP_VERSION, __GNU_MP_VERSION_MINOR, __GNU_MP_VERSION_PATCHLEVEL)
+#if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,0) && __GNU_MP_VERSION_PATCHLEVEL == 0
 #define GCC_GMP_STRINGIFY_VERSION GCC_GMP_STRINGIFY_VERSION2(__GNU_MP_VERSION) "." \
   GCC_GMP_STRINGIFY_VERSION2(__GNU_MP_VERSION_MINOR)
 #else