From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 63A26384403D for ; Fri, 2 Oct 2020 11:15:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 63A26384403D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mliska@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 4E0B4AD20 for ; Fri, 2 Oct 2020 11:15:07 +0000 (UTC) Subject: Re: GCC 9 backports From: =?UTF-8?Q?Martin_Li=c5=a1ka?= To: GCC Patches References: <97ec7d16-eebe-4124-7018-22242c76a797@suse.cz> <39bf5f1b-373f-6a27-c4ba-0ce3791bd395@suse.cz> <0af2dd71-bb0d-3acc-b450-4e8ab9115d2b@suse.cz> <0f7be846-cfff-c656-a3d7-a8fca07d34fc@suse.cz> <2ff17f2a-a919-4e35-bca7-e7f13e683696@suse.cz> <4bacd5a7-6cc6-cc4a-eb33-cd2fd298a85d@suse.cz> <44e220f1-893a-8416-644c-f042320af933@suse.cz> Message-ID: <3411f3b2-0395-f09c-8804-ef2ff47e8254@suse.cz> Date: Fri, 2 Oct 2020 13:15:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------9D4ED2F66AD85DE4D2079E28" Content-Language: en-US X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, NICE_REPLY_A, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2020 11:15:09 -0000 This is a multi-part message in MIME format. --------------9D4ED2F66AD85DE4D2079E28 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 10/2/20 12:05 PM, Martin Liška wrote: > There are 2 more I've just tested. > > Martin and one more. Martin --------------9D4ED2F66AD85DE4D2079E28 Content-Type: text/x-patch; charset=UTF-8; name="0001-GCOV-do-not-mangle-.gcno-files.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-GCOV-do-not-mangle-.gcno-files.patch" >From e204fd5113a4ae92713442555ab4258abd84942a Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 25 Sep 2020 10:53:26 +0200 Subject: [PATCH] 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. (cherry picked from commit f8dcbea5d2fb17dca3a7de97f15fc49997222365) --- gcc/coverage.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/coverage.c b/gcc/coverage.c index 9be446a862d..c442e2fb008 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -1201,6 +1201,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 @@ -1255,9 +1257,9 @@ coverage_init (const char *filename) /* Name of bbg file. */ if (flag_test_coverage && !flag_compare_debug) { - 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)) { -- 2.28.0 --------------9D4ED2F66AD85DE4D2079E28--