diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-30 12:37:06 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-30 12:37:06 +0000 |
| commit | 73e4df1deaadb719c7649ac0957573ceca55f842 (patch) | |
| tree | 975a7ced6842710d01af3678a4a9051684a1bce8 /gcc/c-family | |
| parent | ba60c66472a4a63105c930d419641f75f4d70264 (diff) | |
| download | gcc-73e4df1deaadb719c7649ac0957573ceca55f842.tar.gz | |
2011-08-30 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 178289 using svnmerge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@178293 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family')
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-pch.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 76569f101bd..44eae081011 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2011-08-28 Dodji Seketeli <dodji@redhat.com> + + * c-pch.c (c_common_read_pch): Call linemap_add with LC_ENTER as + it's the first time it's being called on this main TU. + 2011-08-24 Richard Guenther <rguenther@suse.de> PR c/49396 diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c index 3c2fd18f063..7a289d622a8 100644 --- a/gcc/c-family/c-pch.c +++ b/gcc/c-family/c-pch.c @@ -446,7 +446,7 @@ c_common_read_pch (cpp_reader *pfile, const char *name, fclose (f); line_table->trace_includes = saved_trace_includes; - linemap_add (line_table, LC_RENAME, 0, saved_loc.file, saved_loc.line); + linemap_add (line_table, LC_ENTER, 0, saved_loc.file, saved_loc.line); /* Give the front end a chance to take action after a PCH file has been loaded. */ |