* app.c (do_scrub_chars): Don't test IGNORE_NONSTANDARD_ESCAPES. Tidy.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 44a2af4fce9ae17a6c6f7fc5294d79c03803c143..557779b23139d17b125a3d333e048b1b26f2bef0 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+       * app.c (do_scrub_chars): Don't test IGNORE_NONSTANDARD_ESCAPES.  Tidy.
+
 2002-08-27  Alan Modra  <amodra@bigpond.net.au>
 
        * dwarf2dbg.c: Always include dwarf2dbg.h.

diff --git a/gas/app.c b/gas/app.c
index f9c5c7d868b095fe4c7f0c009f2b5fcaef63333c..7ea90b4f523332786489192815b8723806a0d6d7 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -1,6 +1,6 @@
 /* This is the Assembler Pre-Processor
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000
+   1999, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -611,6 +611,11 @@ do_scrub_chars (get, tostart, tolen)
              PUT ('\\');
              continue;
 
+           case EOF:
+             as_warn (_("end of file in string; '\"' inserted"));
+             PUT ('"');
+             continue;
+
            case '"':
            case '\\':
            case 'b':
@@ -630,20 +635,12 @@ do_scrub_chars (get, tostart, tolen)
            case '6':
            case '7':
              break;
-#if defined(IGNORE_NONSTANDARD_ESCAPES) | defined(ONLY_STANDARD_ESCAPES)
+
            default:
+#ifdef ONLY_STANDARD_ESCAPES
              as_warn (_("unknown escape '\\%c' in string; ignored"), ch);
+#endif
              break;
-#else  /* ONLY_STANDARD_ESCAPES */
-           default:
-             /* Accept \x as x for any x */
-             break;
-#endif /* ONLY_STANDARD_ESCAPES */
-
-           case EOF:
-             as_warn (_("end of file in string; '\"' inserted"));
-             PUT ('"');
-             continue;
            }
          PUT (ch);
          continue;