Automatic date update in version.in

[binutils-gdb.git] / gas / input-scrub.c

diff --git a/gas/input-scrub.c b/gas/input-scrub.c
index 19f53e48c0569cd01588d7585308486b0278277f..f65cd7957b1a050414e54bf0133ac27a04c6b082 100644 (file)
--- a/gas/input-scrub.c
+++ b/gas/input-scrub.c
@@ -445,14 +445,12 @@ bump_line_counters (void)
 \f
 /* Tells us what the new logical line number and file are.
    If the line_number is -1, we don't change the current logical line
-   number.  If it is -2, we decrement the logical line number (this is
-   to support the .appfile pseudo-op inserted into the stream by
-   do_scrub_chars).
+   number.
    If fname is NULL, we don't change the current logical file name, unless
    bit 3 of flags is set.
    Returns nonzero if the filename actually changes.  */
 
-int
+void
 new_logical_line_flags (const char *fname, /* DON'T destroy it!  We point to it!  */
                        int line_number,
                        int flags)
@@ -475,7 +473,7 @@ new_logical_line_flags (const char *fname, /* DON'T destroy it!  We point to it!
       /* PR gas/16908 workaround: Ignore updates when nested inside a macro
         expansion.  */
       if (from_sb_expansion == expanding_nested)
-       return 0;
+       return;
       if (next_saved_file->logical_input_file)
        fname = next_saved_file->logical_input_file;
       else
@@ -494,30 +492,25 @@ new_logical_line_flags (const char *fname, /* DON'T destroy it!  We point to it!
       fname = NULL;
     }
 
+  if (fname
+      && (logical_input_file == NULL
+         || filename_cmp (logical_input_file, fname)))
+    logical_input_file = fname;
+
   /* When encountering file or line changes inside a macro, arrange for
      bump_line_counters() to henceforth increment the logical line number
      again, just like it does when expanding repeats.  See as_where() for
      why changing file or line alone doesn't alter expansion mode.  */
   if (from_sb_expansion == expanding_macro
-      && (logical_input_file != NULL || fname != NULL)
+      && logical_input_file != NULL
       && logical_input_line != -1u)
     from_sb_expansion = expanding_repeat;
-
-  if (fname
-      && (logical_input_file == NULL
-         || filename_cmp (logical_input_file, fname)))
-    {
-      logical_input_file = fname;
-      return 1;
-    }
-  else
-    return 0;
 }
 
-int
+void
 new_logical_line (const char *fname, int line_number)
 {
-  return new_logical_line_flags (fname, line_number, 0);
+  new_logical_line_flags (fname, line_number, 0);
 }
 
 \f