* app.c (do_scrub_chars): Revert 2003-04-23 and 2003-04-22.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0a2cb9d..2ae3c1d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-22  Alan Modra  <amodra@bigpond.net.au>
+
+       * app.c (do_scrub_chars): Revert 2003-04-23 and 2003-04-22.
+
 2003-11-21  Kazu Hirata  <kazu@cs.umass.edu>
 
        * ecoff.c: Convert to ISO-C.
@@ -83,14 +87,14 @@
 
        * tc-arm.c (mapping_state): New function.  Emit a mapping
        symbol if necessary.
-        (arm_elf_change_section): New function.  Intercept section
+       (arm_elf_change_section): New function.  Intercept section
        changes and generate mapping symbols.
-        (s_bss): Likewise.
-        (s_arm_elf_cons): Likewise.
-        (opcode_select): Choose the correct mapping state.
-        (md_assemble): Likewise.
-        * tc-arm.h (md_elf_section_change_hook): Define.
-        * doc/c-arm.texi (ARM Mapping Symbols): New node.
+       (s_bss): Likewise.
+       (s_arm_elf_cons): Likewise.
+       (opcode_select): Choose the correct mapping state.
+       (md_assemble): Likewise.
+       * tc-arm.h (md_elf_section_change_hook): Define.
+       * doc/c-arm.texi (ARM Mapping Symbols): New node.
        * NEWS: Mention new feature.
 
 2003-11-12  Daniel Jacobowitz  <drow@mvista.com>

diff --git a/gas/app.c b/gas/app.c
index d947664..1524947 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -1308,13 +1308,11 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
          /* Some relatively `normal' character.  */
          if (state == 0)
            {
-             if (IS_SYMBOL_COMPONENT (ch))
-               state = 11;     /* Now seeing label definition.  */
+             state = 11;       /* Now seeing label definition.  */
            }
          else if (state == 1)
            {
-             if (IS_SYMBOL_COMPONENT (ch))
-               state = 2;      /* Ditto.  */
+             state = 2;        /* Ditto.  */
            }
          else if (state == 9)
            {