2008-05-22 Paul Brook <paul@codesourcery.com>

	gas/
	* config/tc-arm.c (parse_cond): Covert to lowercase before matching.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 592b8de2a3ef5d35ceaf98ff834f29453d5490a6..7a572df7de8285c18e6cba9d1c13b0534521030d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-22  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (parse_cond): Covert to lowercase before matching.
+
 2008-05-21  I-Jui Sung  <ijsung@gmail.com>
 
        * config/tc-arm.c (arm_cpus): Add Faraday ARMv4 and ARMv5TE

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 31d4a5b38a96eeeb7959ff1dbb8a37a8c93ccb1d..df96d289b502d43f265021a26578edc5d5b59c3c 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -5043,14 +5043,23 @@ parse_ror (char **str)
 static int
 parse_cond (char **str)
 {
-  char *p, *q;
+  char *q;
   const struct asm_cond *c;
+  int n;
+  /* Condition codes are always 2 characters, so matching up to
+     3 characters is sufficient.  */
+  char cond[3];
 
-  p = q = *str;
-  while (ISALPHA (*q))
-    q++;
+  q = *str;
+  n = 0;
+  while (ISALPHA (*q) && n < 3)
+    {
+      cond[n] = TOLOWER(*q);
+      q++;
+      n++;
+    }
 
-  c = hash_find_n (arm_cond_hsh, p, q - p);
+  c = hash_find_n (arm_cond_hsh, cond, n);
   if (!c)
     {
       inst.error = _("condition required");