From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 19 Dec 2017 21:06:04 +0000 (+0100)
Subject: gimple-ssa-sprintf.c (format_directive): Use inform_n instead of inform with hardcode... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=281cbf31893671e3ab8bf0f1ba9eddd297176047;p=gcc.git

gimple-ssa-sprintf.c (format_directive): Use inform_n instead of inform with hardcoded english plural handling.

	* gimple-ssa-sprintf.c (format_directive): Use inform_n instead of
	inform with hardcoded english plural handling.

From-SVN: r255840
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a80f18045b..39b102fc24e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* gimple-ssa-sprintf.c (format_directive): Use inform_n instead of
+	inform with hardcoded english plural handling.
+
 2017-12-18  Jeff Law  <law@redhat.com>
 
 	PR tree-optimization/83477
diff --git a/gcc/gimple-ssa-sprintf.c b/gcc/gimple-ssa-sprintf.c
index eddc20e2ac4..4275755c7bf 100644
--- a/gcc/gimple-ssa-sprintf.c
+++ b/gcc/gimple-ssa-sprintf.c
@@ -2933,13 +2933,15 @@ format_directive (const sprintf_dom_walker::call_info &info,
 
   if (warned && fmtres.range.min < fmtres.range.likely
       && fmtres.range.likely < fmtres.range.max)
-    {
-      inform (info.fmtloc,
-	      (1 == fmtres.range.likely
-	       ? G_("assuming directive output of %wu byte")
-	       : G_("assuming directive output of %wu bytes")),
+    /* Some languages have special plural rules even for large values,
+       but it is periodic with period of 10, 100, 1000 etc.  */
+    inform_n (info.fmtloc,
+	      fmtres.range.likely > INT_MAX
+	      ? (fmtres.range.likely % 1000000) + 1000000
+	      : fmtres.range.likely,
+	      "assuming directive output of %wu byte",
+	      "assuming directive output of %wu bytes",
 	      fmtres.range.likely);
-    }
 
   if (warned && fmtres.argmin)
     {