Update year range in copyright notice of binutils files

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

diff --git a/gas/app.c b/gas/app.c
index 6b883a1f8a164e232658b1e8c306e45a2e0cfa5e..89b39130bf10a497890b1d318a631f8b3ff64dcf 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-2021 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -56,6 +56,8 @@ static const char   symver_pseudo[] = ".symver";
 static const char * symver_state;
 #endif
 
+static char last_char;
+
 static char lex[256];
 static const char symbol_chars[] =
 "$._ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
@@ -117,8 +119,7 @@ do_scrub_begin (int m68k_mri ATTRIBUTE_UNUSED)
     {
       lex['"'] = LEX_IS_STRINGQUOTE;
 
-#if ! defined (TC_HPPA) && ! defined (TC_I370)
-      /* I370 uses single-quotes to delimit integer, float constants.  */
+#if ! defined (TC_HPPA)
       lex['\''] = LEX_IS_ONECHAR_QUOTE;
 #endif
 
@@ -242,6 +243,7 @@ struct app_save
 #if defined TC_ARM && defined OBJ_ELF
   const char * symver_state;
 #endif
+  char         last_char;
 };
 
 char *
@@ -271,6 +273,7 @@ app_push (void)
 #if defined TC_ARM && defined OBJ_ELF
   saved->symver_state = symver_state;
 #endif
+  saved->last_char = last_char;
 
   /* do_scrub_begin() is not useful, just wastes time.  */
 
@@ -310,6 +313,7 @@ app_pop (char *arg)
 #if defined TC_ARM && defined OBJ_ELF
   symver_state = saved->symver_state;
 #endif
+  last_char = saved->last_char;
 
   free (arg);
 }
@@ -591,13 +595,11 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
              state = old_state;
              PUT (ch);
            }
-#ifndef NO_STRING_ESCAPES
-         else if (ch == '\\')
+         else if (TC_STRING_ESCAPES && ch == '\\')
            {
              state = 6;
              PUT (ch);
            }
-#endif
          else if (scrub_m68k_mri && ch == '\n')
            {
              /* Just quietly terminate the string.  This permits lines like
@@ -1041,7 +1043,6 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
          PUT (ch);
          break;
 
-#ifndef IEEE_STYLE
        case LEX_IS_ONECHAR_QUOTE:
 #ifdef H_TICK_HEX
          if (state == 9 && enable_h_tick_hex)
@@ -1103,7 +1104,6 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
          out_string = out_buf;
          PUT (*out_string++);
          break;
-#endif
 
        case LEX_IS_COLON:
 #ifdef KEEP_WHITE_AROUND_COLON
@@ -1188,7 +1188,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);
                }
@@ -1282,13 +1282,11 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
            goto de_fault;
 #endif
 
-#ifdef TC_ARM
-         /* For the ARM, care is needed not to damage occurrences of \@
-            by stripping the @ onwards.  Yuck.  */
-         if (to > tostart && *(to - 1) == '\\')
-           /* Do not treat the @ as a start-of-comment.  */
+         /* Care is needed not to damage occurrences of \<comment-char>
+            by stripping the <comment-char> onwards.  Yuck.  */
+         if ((to > tostart ? to[-1] : last_char) == '\\')
+           /* Do not treat the <comment-char> as a start-of-comment.  */
            goto de_fault;
-#endif
 
 #ifdef WARN_COMMENTS
          if (!found_comment)
@@ -1465,6 +1463,8 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
 
  fromeof:
   /* We have reached the end of the input.  */
+  if (to > tostart)
+    last_char = to[-1];
   return to - tostart;
 
  tofull:
@@ -1478,5 +1478,7 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
   else
     saved_input = NULL;
 
+  if (to > tostart)
+    last_char = to[-1];
   return to - tostart;
 }