From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Tue, 5 Feb 2008 16:23:10 +0000 (+0000)
Subject: re PR other/35070 (-fverbose-asm has bogus asm output (mpfr library warning))
X-Git-Tag: releases/gcc-4.3.0~266
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a2041755b4ec15331bff0d7b60d545eeb6171a9;p=thirdparty%2Fgcc.git

re PR other/35070 (-fverbose-asm has bogus asm output (mpfr library warning))

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

From-SVN: r132123
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b612337426c..84c085694c1a 100644
--- 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
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 63b387f0934e..512e0fb87089 100644
--- 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[] =
-    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__
@@ -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,
+	     indent, *indent != 0 ? " " : "",
 	     "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,