From: Qing Zhao <qing.zhao@oracle.com>
Date: Wed, 23 Oct 2019 18:12:39 +0000 (+0000)
Subject: re PR gcov-profile/91971 (Profile directory concatenated with object file path)
X-Git-Tag: misc/cutover-git~1819
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fdaaf77726f041c05b1e5cba428526c7cc69ad7;p=thirdparty%2Fgcc.git

re PR gcov-profile/91971 (Profile directory concatenated with object file path)

2019-10-23  qing zhao  <qing.zhao@oracle.com>

	PR gcov-profile/91971
	* coverage.c (coverage_init): Mangle the full path of filename when
	filename is a absolute path.

From-SVN: r277344
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7dc6885399cc..e1a4213ddddf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  qing zhao  <qing.zhao@oracle.com>
+
+	PR gcov-profile/91971
+	* coverage.c (coverage_init): Mangle the full path of filename when
+	filename is a absolute path.
+
 2019-10-23  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* config/msp430/msp430-protos.h (msp430_has_hwmult): New.
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 0d5138feb2b4..bcba61c9a9af 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -1229,6 +1229,14 @@ coverage_init (const char *filename)
       else
 	profile_data_prefix = getpwd ();
     }
+  else
+    {
+      /* when filename is a absolute path, we also need to mangle the full
+      path of filename to prevent the profiling data being stored into a
+      different path than that specified by profile_data_prefix.  */
+      filename = mangle_path (filename);
+      len = strlen (filename);
+    }
 
   if (profile_data_prefix)
     prefix_len = strlen (profile_data_prefix);