* config/tc-i386.c (lex_got): Don't scan past a comma.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a9d2491778e40672711bb0fb2eb14b55274dfcae..cb2460c53c311e5a33e881d23acde698b089867c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-24  Anders Waldenborg  <anders@0x63.nu>
+           Alan Modra  <amodra@bigpond.net.au>
+
+       * config/tc-i386.c (lex_got): Don't scan past a comma.
+
 2007-08-23  Ben Elliston  <bje@au.ibm.com>
 
        * config/tc-ppc.c (parse_cpu): Handle "750cl".

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 0ef4142344a0da7425300e34dae48056ffd822a6..16376dccdfa6dc1616d5c223815ce2064df6c061 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4485,7 +4485,7 @@ lex_got (enum bfd_reloc_code_real *reloc,
     return NULL;
 
   for (cp = input_line_pointer; *cp != '@'; cp++)
-    if (is_end_of_line[(unsigned char) *cp])
+    if (is_end_of_line[(unsigned char) *cp] || *cp == ',')
       return NULL;
 
   for (j = 0; j < sizeof (gotrel) / sizeof (gotrel[0]); j++)
@@ -4519,12 +4519,12 @@ lex_got (enum bfd_reloc_code_real *reloc,
              first = cp - input_line_pointer;
 
              /* The second part goes from after the reloc token until
-                (and including) an end_of_line char.  Don't use strlen
-                here as the end_of_line char may not be a NUL.  */
+                (and including) an end_of_line char or comma.  */
              past_reloc = cp + 1 + len;
-             for (cp = past_reloc; !is_end_of_line[(unsigned char) *cp++]; )
-               ;
-             second = cp - past_reloc;
+             cp = past_reloc;
+             while (!is_end_of_line[(unsigned char) *cp] && *cp != ',')
+               ++cp;
+             second = cp + 1 - past_reloc;
 
              /* Allocate and copy string.  The trailing NUL shouldn't
                 be necessary, but be safe.  */