diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2008-11-12 02:42:46 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@axis.com> | 2008-11-12 02:42:46 +0000 |
| commit | cb26feec3e9fbf8991dc5b4fdef47dc38db92049 (patch) | |
| tree | 804a815f6018ec6130e6b8d63957992573335302 /gas | |
| parent | 00be4d3aff7d8b81f43b2bb0ad88e2997d2285e2 (diff) | |
| download | fsf-binutils-gdb-cb26feec3e9fbf8991dc5b4fdef47dc38db92049.zip fsf-binutils-gdb-cb26feec3e9fbf8991dc5b4fdef47dc38db92049.tar.gz fsf-binutils-gdb-cb26feec3e9fbf8991dc5b4fdef47dc38db92049.tar.bz2 | |
PR gas/7025
* input-scrub.c (input_scrub_include_sb): Make the position
after the input have defined contents, a 0 character.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/input-scrub.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 1d87221..c873183 100644 --- 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 21a4651..d4cf217 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 |