From cb26feec3e9fbf8991dc5b4fdef47dc38db92049 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Wed, 12 Nov 2008 02:42:46 +0000 Subject: [PATCH] PR gas/7025 * input-scrub.c (input_scrub_include_sb): Make the position after the input have defined contents, a 0 character. --- gas/ChangeLog | 4 ++++ gas/input-scrub.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/gas/ChangeLog b/gas/ChangeLog index 1d872216a1d..c8731837aa5 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,9 @@ 2008-11-12 Hans-Peter Nilsson + 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 21a46514545..d4cf21783f4 100644 --- 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 -- 2.30.2