* write.c (subsegs_finish): Don't specially align last subseg.

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

diff --git a/gas/app.c b/gas/app.c
index 59aa40bfdfe8692e86551eca0879946550b4b10d..a3589da4a509c98fa0d6d13fe0138517d3843811 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -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.
@@ -387,7 +387,7 @@ do_scrub_chars (get, tostart, tolen)
   /* I added states 9 and 10 because the MIPS ECOFF assembler uses
      constructs like ``.loc 1 20''.  This was turning into ``.loc
      120''.  States 9 and 10 ensure that a space is never dropped in
-     between characters which could appear in a identifier.  Ian
+     between characters which could appear in an identifier.  Ian
      Taylor, ian@cygnus.com.
 
      I added state 11 so that something like "Lfoo add %r25,%r26,%r27" works
@@ -566,7 +566,7 @@ do_scrub_chars (get, tostart, tolen)
          ch = GET ();
          if (ch == EOF)
            {
-             as_warn (_("end of file in string: inserted '\"'"));
+             as_warn (_("end of file in string; inserted '\"'"));
              state = old_state;
              UNGET ('\n');
              PUT ('"');
@@ -632,7 +632,7 @@ do_scrub_chars (get, tostart, tolen)
              break;
 #if defined(IGNORE_NONSTANDARD_ESCAPES) | defined(ONLY_STANDARD_ESCAPES)
            default:
-             as_warn (_("Unknown escape '\\%c' in string: Ignored"), ch);
+             as_warn (_("unknown escape '\\%c' in string; ignored"), ch);
              break;
 #else  /* ONLY_STANDARD_ESCAPES */
            default:
@@ -641,7 +641,7 @@ do_scrub_chars (get, tostart, tolen)
 #endif /* ONLY_STANDARD_ESCAPES */
 
            case EOF:
-             as_warn (_("End of file in string: '\"' inserted"));
+             as_warn (_("end of file in string; '\"' inserted"));
              PUT ('"');
              continue;
            }
@@ -1004,7 +1004,7 @@ do_scrub_chars (get, tostart, tolen)
          if ((ch = GET ()) != '\'')
            {
 #ifdef REQUIRE_CHAR_CLOSE_QUOTE
-             as_warn (_("Missing close quote: (assumed)"));
+             as_warn (_("missing close quote; (assumed)"));
 #else
              if (ch != EOF)
                UNGET (ch);
@@ -1136,7 +1136,7 @@ do_scrub_chars (get, tostart, tolen)
                  while (ch != EOF && !IS_NEWLINE (ch))
                    ch = GET ();
                  if (ch == EOF)
-                   as_warn (_("EOF in Comment: Newline inserted"));
+                   as_warn (_("end of file in comment; newline inserted"));
                  state = 0;
                  PUT ('\n');
                  break;