Update Russian translation for the gas/ sub-directory.

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

diff --git a/gas/app.c b/gas/app.c
index 4b53ce706127b55f56b0980d6ec42671202b015b..9cafff055d9c5e731d912b4e6372c0d53862e995 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -1,5 +1,5 @@
 /* This is the Assembler Pre-Processor
-   Copyright (C) 1987-2016 Free Software Foundation, Inc.
+   Copyright (C) 1987-2018 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -55,6 +55,9 @@ static const char mri_pseudo[] = ".mri 0";
 static const char   symver_pseudo[] = ".symver";
 static const char * symver_state;
 #endif
+#ifdef TC_ARM
+static char last_char;
+#endif
 
 static char lex[256];
 static const char symbol_chars[] =
@@ -242,6 +245,9 @@ struct app_save
 #if defined TC_ARM && defined OBJ_ELF
   const char * symver_state;
 #endif
+#ifdef TC_ARM
+  char last_char;
+#endif
 };
 
 char *
@@ -271,6 +277,9 @@ app_push (void)
 #if defined TC_ARM && defined OBJ_ELF
   saved->symver_state = symver_state;
 #endif
+#ifdef TC_ARM
+  saved->last_char = last_char;
+#endif
 
   /* do_scrub_begin() is not useful, just wastes time.  */
 
@@ -310,6 +319,9 @@ app_pop (char *arg)
 #if defined TC_ARM && defined OBJ_ELF
   symver_state = saved->symver_state;
 #endif
+#ifdef TC_ARM
+  last_char = saved->last_char;
+#endif
 
   free (arg);
 }
@@ -1188,7 +1200,7 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
                  state = -2;
                  break;
                }
-             else
+             else if (ch2 != EOF)
                {
                  UNGET (ch2);
                }
@@ -1285,7 +1297,7 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
 #ifdef TC_ARM
          /* For the ARM, care is needed not to damage occurrences of \@
             by stripping the @ onwards.  Yuck.  */
-         if (to > tostart && *(to - 1) == '\\')
+         if ((to > tostart ? to[-1] : last_char) == '\\')
            /* Do not treat the @ as a start-of-comment.  */
            goto de_fault;
 #endif
@@ -1322,8 +1334,8 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
              else
                UNGET (quot);
            }
-         /* FALL THROUGH */
 #endif
+         /* Fall through.  */
 
        case LEX_IS_SYMBOL_COMPONENT:
          if (state == 10)
@@ -1465,6 +1477,10 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
 
  fromeof:
   /* We have reached the end of the input.  */
+#ifdef TC_ARM
+  if (to > tostart)
+    last_char = to[-1];
+#endif
   return to - tostart;
 
  tofull:
@@ -1478,5 +1494,9 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
   else
     saved_input = NULL;
 
+#ifdef TC_ARM
+  if (to > tostart)
+    last_char = to[-1];
+#endif
   return to - tostart;
 }