From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 11 Nov 2010 18:28:46 +0000 (+0000)
Subject: reginfo.c (fix_register): Avoid inserting English word in diagnostic sentence.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=658bd5ca00275d0a7b1a987018bc663b8a2d4a57;p=gcc.git

reginfo.c (fix_register): Avoid inserting English word in diagnostic sentence.

	* reginfo.c (fix_register): Avoid inserting English word in
	diagnostic sentence.  Use %qs for quoting and %'.

From-SVN: r166610
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc312299460..542d95953d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* reginfo.c (fix_register): Avoid inserting English word in
+	diagnostic sentence.  Use %qs for quoting and %'.
+
 2010-11-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/i386/driver-i386.c (host_detect_local_cpu): Support
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index c8192dec0e9..65243cb2865 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -770,12 +770,40 @@ fix_register (const char *name, int fixed, int call_used)
 	   )
 	  && (fixed == 0 || call_used == 0))
 	{
-	  static const char * const what_option[2][2] = {
-	    { "call-saved", "call-used" },
-	    { "no-such-option", "fixed" }};
+	  switch (fixed)
+	    {
+	    case 0:
+	      switch (call_used)
+		{
+		case 0:
+		  error ("can%'t use %qs as a call-saved register", name);
+		  break;
+
+		case 1:
+		  error ("can%'t use %qs as a call-used register", name);
+		  break;
+
+		default:
+		  gcc_unreachable ();
+		}
+	      break;
 
-	  error ("can't use '%s' as a %s register", name,
-		 what_option[fixed][call_used]);
+	    case 1:
+	      switch (call_used)
+		{
+		case 1:
+		  error ("can%'t use %qs as a fixed register", name);
+		  break;
+
+		case 0:
+		default:
+		  gcc_unreachable ();
+		}
+	      break;
+
+	    default:
+	      gcc_unreachable ();
+	    }
 	}
       else
 	{