PR gas/7025

	* input-scrub.c (input_scrub_include_sb): Make the position
	after the input have defined contents, a 0 character.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1d872216a1da7ea92435cd424b27d37501380b78..c8731837aa5d672fbccf3ddc4938d9fcd4d0cb24 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2008-11-12  Hans-Peter Nilsson  <hp@axis.com>
 
+       PR gas/7025
+       * input-scrub.c (input_scrub_include_sb): Make the position
+       after the input have defined contents, a 0 character.
+
        * config/tc-cris.c (cris_relax_frag): Add missing case for
        ENCODE_RELAX (STATE_COND_BRANCH_PIC, STATE_DWORD).
 

diff --git a/gas/input-scrub.c b/gas/input-scrub.c
index 21a46514545cb2695dd10d4a27c641c0e24d3080..d4cf21783f4658b07494276b8a1e8e9cec97c0ae 100644 (file)
--- a/gas/input-scrub.c
+++ b/gas/input-scrub.c
@@ -283,6 +283,12 @@ input_scrub_include_sb (sb *from, char *position, int is_expansion)
       sb_add_char (&from_sb, '\n');
     }
   sb_scrub_and_add_sb (&from_sb, from);
+
+  /* Make sure the parser looks at defined contents when it scans for
+     e.g. end-of-line at the end of a macro.  */
+  sb_add_char (&from_sb, 0);
+  from_sb.len--;
+
   sb_index = 1;
 
   /* These variables are reset by input_scrub_push.  Restore them