From ea7242b7fbb150f2807df8885d388d6f22f84d5c Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 9 Jun 2011 15:43:51 +0000
Subject: [PATCH] 	PR gas/12861 	* config/tc-cr16.c (tc_gen_reloc):
 Remove unused local variable 	code. 	(check_cinv_options): Remove unused
 local variables.  Make 	function void. 	(md_assemble): Remove unused
 local variable.

---
 gas/ChangeLog        |  9 +++++++++
 gas/config/tc-cr16.c | 32 ++++++++++++--------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index fafc50e96..69f045a78 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-09  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12861
+	* config/tc-cr16.c (tc_gen_reloc): Remove unused local variable
+	code.
+	(check_cinv_options): Remove unused local variables.  Make
+	function void.
+	(md_assemble): Remove unused local variable.
+
 2011-06-09  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* config/tc-arm.c (do_ldrd): Warn in unpredictable cases.
diff --git a/gas/config/tc-cr16.c b/gas/config/tc-cr16.c
index 2df4e3460..8d6e780b3 100644
--- a/gas/config/tc-cr16.c
+++ b/gas/config/tc-cr16.c
@@ -522,7 +522,6 @@ arelent *
 tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS * fixP)
 {
   arelent * reloc;
-  bfd_reloc_code_real_type code;
 
   /* If symbols are local and resolved, then no relocation needed.  */
   if ( ((fixP->fx_addsy) 
@@ -582,14 +581,12 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS * fixP)
            && GOT_symbol
 	   && fixP->fx_addsy == GOT_symbol)
 	{
-	    code = BFD_RELOC_CR16_GOT_REGREL20;
 	    reloc->addend = fixP->fx_offset = reloc->address;
 	}
       else if ((fixP->fx_r_type == BFD_RELOC_CR16_GOTC_REGREL20)
            && GOT_symbol
 	   && fixP->fx_addsy == GOT_symbol)
 	{
-	    code = BFD_RELOC_CR16_GOTC_REGREL20;
 	    reloc->addend = fixP->fx_offset = reloc->address;
 	}
 #endif
@@ -1549,28 +1546,25 @@ is_bcc_insn (char * op)
 
 /* Cinv instruction requires special handling.  */
 
-static int
+static void
 check_cinv_options (char * operand)
 {
   char *p = operand;
-  int i_used = 0, u_used = 0, d_used = 0;
 
   while (*++p != ']')
     {
-      if (*p == ',' || *p == ' ')
-        continue;
-
-      else if (*p == 'i')
-        i_used = 1;
-      else if (*p == 'u')
-        u_used = 1;
-      else if (*p == 'd')
-        d_used = 1;
-      else
-        as_bad (_("Illegal `cinv' parameter: `%c'"), *p);
+      switch (*p)
+	{
+	case ',':
+	case ' ':
+	case 'i':
+	case 'u':
+	case 'd':
+	  break;
+	default:
+	  as_bad (_("Illegal `cinv' parameter: `%c'"), *p);
+	}
     }
-
-  return 0;
 }
 
 /* Retrieve the opcode image of a given register pair.
@@ -2504,7 +2498,6 @@ md_assemble (char *op)
 {
   ins cr16_ins;
   char *param, param1[32];
-  char c;
 
   /* Reset global variables for a new instruction.  */
   reset_vars (op);
@@ -2512,7 +2505,6 @@ md_assemble (char *op)
   /* Strip the mnemonic.  */
   for (param = op; *param != 0 && !ISSPACE (*param); param++)
     ;
-  c = *param;
   *param++ = '\0';
 
   /* bCC instuctions and adjust the mnemonic by adding extra white spaces.  */
-- 
2.11.4.GIT