*** empty log message ***

[binutils-gdb.git] / gas / app.c

diff --git a/gas/app.c b/gas/app.c
index ba587d4651bb4601828652d5e5eebdb7485e569a..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.
@@ -40,13 +40,13 @@
    flag_m68k_mri, because the two flags will be affected by the .mri
    pseudo-op at different times.  */
 static int scrub_m68k_mri;
-#else
-#define scrub_m68k_mri 0
-#endif
 
 /* The pseudo-op which switches in and out of MRI mode.  See the
    comment in do_scrub_chars.  */
 static const char mri_pseudo[] = ".mri 0";
+#else
+#define scrub_m68k_mri 0
+#endif
 
 #if defined TC_ARM && defined OBJ_ELF
 /* The pseudo-op for which we need to special-case `@' characters.
@@ -424,13 +424,13 @@ do_scrub_chars (get, tostart, tolen)
      I don't want to make such a significant change to the assembler's
      memory usage.  */
 
-#define PUT(pch)                       \
-  do                                   \
-    {                                  \
-      *to++ = (pch);                   \
-      if (to >= toend)                 \
-        goto tofull;                   \
-    }                                  \
+#define PUT(pch)                               \
+  do                                           \
+    {                                          \
+      *to++ = (pch);                           \
+      if (to >= toend)                         \
+       goto tofull;                            \
+    }                                          \
   while (0)
 
   if (saved_input != NULL)
@@ -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;