From 34ab888845310822b46b6a37ed5fe7e954bdc848 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 14 Dec 2009 10:59:37 +0000
Subject: [PATCH]         PR gas/11089         * config/tc-rx.c (rx_equ):
 Rename 'expr' to 'expression' in order         to avoid shadowing a global
 symbol of the same name.

---
 gas/ChangeLog      | 8 +++++++-
 gas/config/tc-rx.c | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0c588af01f8..b8447d4da3e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,7 +1,13 @@
+2009-12-14  Yoshinori Sato  <ysato@users.sourceforge.jp>
+
+	PR gas/11089
+	* config/tc-rx.c (rx_equ): Rename 'expr' to 'expression' in order
+	to avoid shadowing a global symbol of the same name.
+
 2009-12-14  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-microblaze.c (md_assemble): Rename 'imm' to 'immed' in
-	order to avoid shadowing global variable of the same name.
+	order to avoid shadowing a global symbol of the same name.
 
 2009-12-11  Andrew Jenner  <andrew@codesourcery.com>
 
diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c
index f6353210f18..3bb9a5afe7b 100644
--- a/gas/config/tc-rx.c
+++ b/gas/config/tc-rx.c
@@ -895,7 +895,7 @@ rx_frag_init (fragS * fragP)
    <symbol_name> .equ <expression>   */
 
 static void
-rx_equ (char * name, char * expr)
+rx_equ (char * name, char * expression)
 {
   char   saved_name_end_char;
   char * name_end;
@@ -912,7 +912,7 @@ rx_equ (char * name, char * expr)
   * name_end = 0;
 
   saved_ilp = input_line_pointer;
-  input_line_pointer = expr;
+  input_line_pointer = expression;
 
   equals (name, 1);