summaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-22 07:18:38 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-22 07:18:38 +0000
commit446bdf5f14d50a1313cd9e5a5e1a56b0c9579bcc (patch)
treed27174ed6e79ae0b0010eaf708bb6fbc53a18b8d /gcc/c-family
parenta0bce9d7352076afd2d91f5bb2afe27b890c032c (diff)
downloadgcc-446bdf5f14d50a1313cd9e5a5e1a56b0c9579bcc.tar.gz
PR debug/60603
c-family/ * c-opts.c (c_finish_options): Restore cb_file_change call to <built-in>. fortran/ * cpp.c (gfc_cpp_init): Restore cb_change_file call to <built-in>. testsuite/ * gcc.dg/debug/dwarf2/dwarf2-macro2.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208763 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog6
-rw-r--r--gcc/c-family/c-opts.c19
2 files changed, 16 insertions, 9 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 4e5aea46841..536b4fc4ca2 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-22 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/60603
+ * c-opts.c (c_finish_options): Restore cb_file_change call to
+ <built-in>.
+
2014-03-13 Jakub Jelinek <jakub@redhat.com>
PR middle-end/36282
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 92ba481390d..e162e49a18a 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -1274,17 +1274,18 @@ c_finish_options (void)
{
size_t i;
- {
- /* Make sure all of the builtins about to be declared have
- BUILTINS_LOCATION has their source_location. */
- source_location builtins_loc = BUILTINS_LOCATION;
- cpp_force_token_locations (parse_in, &builtins_loc);
+ cb_file_change (parse_in,
+ linemap_add (line_table, LC_RENAME, 0,
+ _("<built-in>"), 0));
+ /* Make sure all of the builtins about to be declared have
+ BUILTINS_LOCATION has their source_location. */
+ source_location builtins_loc = BUILTINS_LOCATION;
+ cpp_force_token_locations (parse_in, &builtins_loc);
- cpp_init_builtins (parse_in, flag_hosted);
- c_cpp_builtins (parse_in);
+ cpp_init_builtins (parse_in, flag_hosted);
+ c_cpp_builtins (parse_in);
- cpp_stop_forcing_token_locations (parse_in);
- }
+ cpp_stop_forcing_token_locations (parse_in);
/* We're about to send user input to cpplib, so make it warn for
things that we previously (when we sent it internal definitions)