Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame^] | 1 | From 289ad2969a5966c603bf6928ce442db74c4cbb25 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 24 Mar 2016 11:23:14 -0400 |
| 4 | Subject: [PATCH] gcc/final.c: -fdebug-prefix-map support to remap sources with |
| 5 | relative path |
| 6 | |
| 7 | PR other/70428 |
| 8 | * final.c (remap_debug_filename): Use lrealpath to translate |
| 9 | relative path before remapping |
| 10 | |
| 11 | https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70428 |
| 12 | Upstream-Status: Submitted [gcc-patches@gcc.gnu.org] |
| 13 | |
| 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 15 | --- |
| 16 | diff --git a/gcc/final.c b/gcc/final.c |
| 17 | index 55cf509..c3594c2 100644 |
| 18 | --- a/gcc/final.c |
| 19 | +++ b/gcc/final.c |
| 20 | @@ -1554,16 +1554,25 @@ remap_debug_filename (const char *filename) |
| 21 | const char *name; |
| 22 | size_t name_len; |
| 23 | |
| 24 | + /* Support to remap filename with relative path */ |
| 25 | + char *realpath = lrealpath (filename); |
| 26 | + if (realpath == NULL) |
| 27 | + return filename; |
| 28 | + |
| 29 | for (map = debug_prefix_maps; map; map = map->next) |
| 30 | - if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) |
| 31 | + if (filename_ncmp (realpath, map->old_prefix, map->old_len) == 0) |
| 32 | break; |
| 33 | if (!map) |
| 34 | - return filename; |
| 35 | - name = filename + map->old_len; |
| 36 | + { |
| 37 | + free (realpath); |
| 38 | + return filename; |
| 39 | + } |
| 40 | + name = realpath + map->old_len; |
| 41 | name_len = strlen (name) + 1; |
| 42 | s = (char *) alloca (name_len + map->new_len); |
| 43 | memcpy (s, map->new_prefix, map->new_len); |
| 44 | memcpy (s + map->new_len, name, name_len); |
| 45 | + free (realpath); |
| 46 | return ggc_strdup (s); |
| 47 | } |
| 48 | |
| 49 | -- |
| 50 | 2.7.4 |
| 51 | |