gas: avoid bogus warnings in false branches of conditional

The construct being added to the cond.s test case otherwise triggered
both the "missing closing ..." and the "stray ..." (twice) warnings in
_find_end_of_line(). As that code fragments suggests, this is needed to
support (include) files that can be used for both assembler .include
and compiler #include directives.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 60a0a6adc1e876a136760f13b5c3dab174d37bfd..4f923ed803b5644e576fd191dc0062fb08747bb8 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-21  Jan Beulich  <jbeulich@suse.com>
+
+       * read.c (HANDLE_CONDITIONAL_ASSEMBLY): New parameter "num_read".
+       (read_a_source_file): Adjust HANDLE_CONDITIONAL_ASSEMBLY
+       invocations.
+       (_find_end_of_line): Don't issue "stray '\\'" warning when in
+       false branch of conditional.
+
 2014-10-21  Jan Beulich  <jbeulich@suse.com>
 
        * config/tc-aarch64.c (output_operand_error_record): Move down

diff --git a/gas/read.c b/gas/read.c
index 9fd0335d8e1f3e9844e2326d36418c79dcdc6b33..5472155eacf0c2fa731f9e250dbb0a4f9273fba9 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -557,10 +557,11 @@ pobegin (void)
   cfi_pop_insert ();
 }
 \f
-#define HANDLE_CONDITIONAL_ASSEMBLY()                                  \
+#define HANDLE_CONDITIONAL_ASSEMBLY(num_read)                          \
   if (ignore_input ())                                                 \
     {                                                                  \
-      char *eol = find_end_of_line (input_line_pointer, flag_m68k_mri); \
+      char *eol = find_end_of_line (input_line_pointer - (num_read),   \
+                                   flag_m68k_mri);                     \
       input_line_pointer = (input_line_pointer <= buffer_limit         \
                            && eol >= buffer_limit)                     \
                           ? buffer_limit                               \
@@ -834,7 +835,7 @@ read_a_source_file (char *name)
                      char *line_start = input_line_pointer;
                      int mri_line_macro;
 
-                     HANDLE_CONDITIONAL_ASSEMBLY ();
+                     HANDLE_CONDITIONAL_ASSEMBLY (0);
 
                      c = get_symbol_end ();
 
@@ -905,7 +906,7 @@ read_a_source_file (char *name)
          if (is_name_beginner (c))
            {
              /* Want user-defined label or pseudo/opcode.  */
-             HANDLE_CONDITIONAL_ASSEMBLY ();
+             HANDLE_CONDITIONAL_ASSEMBLY (1);
 
              s = --input_line_pointer;
              c = get_symbol_end ();    /* name's delimiter.  */
@@ -1119,7 +1120,7 @@ read_a_source_file (char *name)
              /* local label  ("4:")  */
              char *backup = input_line_pointer;
 
-             HANDLE_CONDITIONAL_ASSEMBLY ();
+             HANDLE_CONDITIONAL_ASSEMBLY (1);
 
              temp = c - '0';
 
@@ -1266,7 +1267,7 @@ read_a_source_file (char *name)
              continue;
            }
 
-         HANDLE_CONDITIONAL_ASSEMBLY ();
+         HANDLE_CONDITIONAL_ASSEMBLY (1);
 
 #ifdef tc_unrecognized_line
          if (tc_unrecognized_line (c))
@@ -6138,7 +6139,7 @@ _find_end_of_line (char *s, int mri_string, int insn ATTRIBUTE_UNUSED,
     }
   if (inquote)
     as_warn (_("missing closing `%c'"), inquote);
-  if (inescape)
+  if (inescape && !ignore_input ())
     as_warn (_("stray `\\'"));
   return s;
 }

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d504c4fcd93f5ad500b4a7137807ce84916d5d59..a79cd1c7d377cdf33515bd227e93ffe70d35d42c 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-21  Jan Beulich  <jbeulich@suse.com>
+
+       * gas/gas/all/cond.s: Also test processing of leading double
+       quote and trailing backslash in false branch of conditional.
+       * gas/gas/all/cond.l: Adjust accordingly.
+
 2014-10-21  Jan Beulich  <jbeulich@suse.com>
 
        * gas/ppc/power8.s: Test msgclr and msgsnd.

diff --git a/gas/testsuite/gas/all/cond.l b/gas/testsuite/gas/all/cond.l
index 36f0066444007c43a1235b47186a9300090e9c7c..af80a10b7e81df8620d5f03fd38ddbb605ae6b92 100644 (file)
--- a/gas/testsuite/gas/all/cond.l
+++ b/gas/testsuite/gas/all/cond.l
@@ -67,5 +67,8 @@
 [      ]*[1-9][0-9]*[  ]+[0-9a-f]+[048c] 0[0C] ?00 ?00 ?0[0C][         ]+m[    ]+12,[  ]*13[   ]*
 [      ]*[1-9][0-9]*[  ]+0[0D] ?00 ?00 ?0[0D][         ]*
 [      ]*[1-9][0-9]*[  ]+
+[      ]*[1-9][0-9]*[  ]+\.if[         ]+0[    ]*
+[      ]*[1-9][0-9]*[  ]+\.endif[      ]*
+[      ]*[1-9][0-9]*[  ]+
 [      ]*[1-9][0-9]*[  ]+.*\.p2align 5,0
 #pass

diff --git a/gas/testsuite/gas/all/cond.s b/gas/testsuite/gas/all/cond.s
index 164e055b12bf3cc435387f2a7a6cb383a779066a..f0bf67ac8cbab2b146560cc3cb0c2edc4322f843 100644 (file)
--- a/gas/testsuite/gas/all/cond.s
+++ b/gas/testsuite/gas/all/cond.s
@@ -89,4 +89,15 @@
        m       11,
        m       12, 13
 
+       .if 0
+#define x "m" \
+       (x)
+#define y \
+       "m" \
+       (y)
+#define z \
+       ((z) \
+        + 1)
+       .endif
+
        .p2align 5,0