PR other/35070

	* toplev.c (print_version): Honor `indent' for GMP/MPFR warnings.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132123 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b61233..84c0856 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-05  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       PR other/35070
+       * toplev.c (print_version): Honor `indent' for GMP/MPFR warnings.
+

 2008-02-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/35084
 2008-02-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/35084

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 63b387f..512e0fb 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1185,7 +1185,7 @@ print_version (FILE *file, const char *indent)
   static const char fmt2[] =
     N_("GMP version %s, MPFR version %s.\n");
   static const char fmt3[] =
   static const char fmt2[] =
     N_("GMP version %s, MPFR version %s.\n");
   static const char fmt3[] =

-    N_("warning: %s header version %s differs from library version %s.\n");
+    N_("%s%swarning: %s header version %s differs from library version %s.\n");

   static const char fmt4[] =
     N_("%s%sGGC heuristics: --param ggc-min-expand=%d --param ggc-min-heapsize=%d\n");
 #ifndef __VERSION__
   static const char fmt4[] =
     N_("%s%sGGC heuristics: --param ggc-min-expand=%d --param ggc-min-heapsize=%d\n");
 #ifndef __VERSION__


@@ -1215,10 +1215,12 @@ print_version (FILE *file, const char *indent)
   if (strcmp (GCC_GMP_STRINGIFY_VERSION, gmp_version))
     fprintf (file,
             file == stderr ? _(fmt3) : fmt3,
   if (strcmp (GCC_GMP_STRINGIFY_VERSION, gmp_version))
     fprintf (file,
             file == stderr ? _(fmt3) : fmt3,

+            indent, *indent != 0 ? " " : "",

             "GMP", GCC_GMP_STRINGIFY_VERSION, gmp_version);
   if (strcmp (MPFR_VERSION_STRING, mpfr_get_version ()))
     fprintf (file,
             file == stderr ? _(fmt3) : fmt3,
             "GMP", GCC_GMP_STRINGIFY_VERSION, gmp_version);
   if (strcmp (MPFR_VERSION_STRING, mpfr_get_version ()))
     fprintf (file,
             file == stderr ? _(fmt3) : fmt3,

+            indent, *indent != 0 ? " " : "",

             "MPFR", MPFR_VERSION_STRING, mpfr_get_version ());
   fprintf (file,
           file == stderr ? _(fmt4) : fmt4,
             "MPFR", MPFR_VERSION_STRING, mpfr_get_version ());
   fprintf (file,
           file == stderr ? _(fmt4) : fmt4,