darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This fixes a bug whereby #line directives inside a macro would be ignored,

Browse source 
thus resulting in bad line debug information.

	PR gas/16908
	* macro.c (buffer_and_nest): Honour #line directives inside
	macros.
This commit is contained in:
Chris Metcalf 2014-06-17 17:21:08 +01:00 committed by Nick Clifton
parent 548a235728
commit 6d1ace6861
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gas/ChangeLog
View file

@ -1,3 +1,9 @@
2014-06-17 Chris Metcalf <cmetcalf@tilera.com>
PR gas/16908
* macro.c (buffer_and_nest): Honour #line directives inside
macros.
2014-06-17 Jiong Wang <jiong.wang@arm.com> 2014-06-17 Jiong Wang <jiong.wang@arm.com>
* config/tc-arm.c (depr_it_insns): New check for inc/dec sp. * config/tc-arm.c (depr_it_insns): New check for inc/dec sp.

22
gas/macro.c
View file

@ -211,6 +211,28 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
break; break;
} }
} }
/* PR gas/16908
Apply and discard .linefile directives that appear within
the macro. For long macros, one might want to report the
line number information associated with the lines within
the macro definition, but we would need more infrastructure
to make that happen correctly (e.g. resetting the line
number when expanding the macro), and since for short
macros we clearly prefer reporting the point of expansion
anyway, there's not an obviously better fix here. */
if (strncasecmp (ptr->ptr + i, "linefile", 8) == 0)
{
char *saved_input_line_pointer = input_line_pointer;
char saved_eol_char = ptr->ptr[ptr->len];
ptr->ptr[ptr->len] = '\0';
input_line_pointer = ptr->ptr + i + 8;
s_app_line (0);
ptr->ptr[ptr->len] = saved_eol_char;
input_line_pointer = saved_input_line_pointer;
ptr->len = line_start;
}
} }
/* Add the original end-of-line char to the end and keep running. */ /* Add the original end-of-line char to the end and keep running. */