mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 23:31:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

gcc/file-prefix-map: Allow remapping of relative paths

Browse Source 
Relative paths currently aren't remapped by -ffile-prefix-map and friends.
When cross compiling with separate 'source' and 'build' directories, the same
relative paths between directories may not be available on target as compared
to build time.

In order to be able to remap these relative build paths to paths that would
work on target, resolve paths within the file-prefix-map function using
realpath().

This does cause a change of behaviour if users were previously relying upon
symlinks or absolute paths not being resolved.

Use basename to ensure plain filenames don't have paths added.

gcc/ChangeLog:

	* file-prefix-map.cc (remap_filename): Allow remapping of relative paths.
This commit is contained in:
Richard Purdie 2022-11-01 13:45:08 -06:00 committed by Jeff Law
parent bdf0018519
commit e5c15eb183
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gcc/file-prefix-map.cc
View File

@ -70,19 +70,29 @@ remap_filename (file_prefix_map *maps, const char *filename)
file_prefix_map *map;
char *s;
const char *name;
char *realname;
size_t name_len;
if (lbasename (filename) == filename)
return filename;
realname = lrealpath (filename);
for (map = maps; map; map = map->next)
if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)
if (filename_ncmp (realname, map->old_prefix, map->old_len) == 0)
break;
if (!map)
return filename;
name = filename + map->old_len;
{
free (realname);
return filename;
}
name = realname + map->old_len;
name_len = strlen (name) + 1;
s = (char *) ggc_alloc_atomic (name_len + map->new_len);
memcpy (s, map->new_prefix, map->new_len);
memcpy (s + map->new_len, name, name_len);
free (realname);
return s;
}