git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR preprocessor/71681 (header.gcc file lookup is broken for -remap) 

2016-10-21  Andris Pavenis  <andris.pavenis@iki.fi>

	PR preprocessor/71681
	* files.c (remap_filename): Fix handling -remap in subdirectories.

From-SVN: r241413
This commit is contained in:
Andris Pavenis 2016-10-21 18:52:25 +03:00 committed by Andris Pavenis
parent 810cb1913f
commit 58f3096372
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcpp/ChangeLog
View File

@ -1,3 +1,8 @@
2016-10-21 Andris Pavenis <andris.pavenis@iki.fi>
PR preprocessor/71681
* files.c (remap_filename): Fix handling -remap in subdirectories.
2016-10-12 Jakub Jelinek <jakub@redhat.com>
* include/cpplib.h (struct cpp_options): Add

12
libcpp/files.c
View File

@ -1672,7 +1672,7 @@ static char *
remap_filename (cpp_reader *pfile, _cpp_file *file)
{
const char *fname, *p;
char *new_dir;
char *new_dir, *p3;
cpp_dir *dir;
size_t index, len;
@ -1701,9 +1701,15 @@ remap_filename (cpp_reader *pfile, _cpp_file *file)
return NULL;
len = dir->len + (p - fname + 1);
new_dir = XNEWVEC (char, len + 1);
new_dir = XNEWVEC (char, len + 2);
p3 = new_dir + dir->len;
memcpy (new_dir, dir->name, dir->len);
memcpy (new_dir + dir->len, fname, p - fname + 1);
if (dir->len && !IS_DIR_SEPARATOR (dir->name[dir->len - 1]))
{
*p3++ = '/';
len++;
}
memcpy (p3, fname, p - fname + 1);
new_dir[len] = '\0';
dir = make_cpp_dir (pfile, new_dir, dir->sysp);