From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 87061385780A; Fri, 25 Sep 2020 08:54:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87061385780A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/PR97193-mangled-gcno-files)] GCOV: do not mangle .gcno files. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/PR97193-mangled-gcno-files X-Git-Oldrev: b2784a9698ffdd6cd8434694c11336e9f7905be5 X-Git-Newrev: a457b0faeaaa2e08ecab4ef9768b54c0de008094 Message-Id: <20200925085423.87061385780A@sourceware.org> Date: Fri, 25 Sep 2020 08:54:23 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 08:54:23 -0000 https://gcc.gnu.org/g:a457b0faeaaa2e08ecab4ef9768b54c0de008094 commit a457b0faeaaa2e08ecab4ef9768b54c0de008094 Author: Martin Liska Date: Fri Sep 25 10:53:26 2020 +0200 GCOV: do not mangle .gcno files. gcc/ChangeLog: PR gcov-profile/97193 * coverage.c (coverage_init): GCDA note files should not be mangled and should end in output directory. Diff: --- gcc/coverage.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/coverage.c b/gcc/coverage.c index f353c9c5022..7711412c3be 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -1206,6 +1206,8 @@ coverage_obj_finish (vec *ctor) void coverage_init (const char *filename) { + const char *original_filename = filename; + int original_len = strlen (original_filename); #if HAVE_DOS_BASED_FILE_SYSTEM const char *separator = "\\"; #else @@ -1277,9 +1279,9 @@ coverage_init (const char *filename) bbg_file_name = xstrdup (profile_note_location); else { - bbg_file_name = XNEWVEC (char, len + strlen (GCOV_NOTE_SUFFIX) + 1); - memcpy (bbg_file_name, filename, len); - strcpy (bbg_file_name + len, GCOV_NOTE_SUFFIX); + bbg_file_name = XNEWVEC (char, original_len + strlen (GCOV_NOTE_SUFFIX) + 1); + memcpy (bbg_file_name, original_filename, original_len); + strcpy (bbg_file_name + original_len, GCOV_NOTE_SUFFIX); } if (!gcov_open (bbg_file_name, -1))