From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 1D8293858D32; Tue, 11 Oct 2022 18:46:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D8293858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665513993; bh=4tL+8ly0oOlKJ3xY5D+dVCcbCG+NFNvQY/w6Ql3wBPM=; h=From:To:Subject:Date:From; b=wP1WHtJHOt+YqaI5gPDX/BLPMtRtIYUwr0HQ9tzDe2NpCMyvNwlCJLnaYREmJm3Dn Xvn3XJIwVFSp3e7hMZB4OAhYPRye2pFpfs8OXC3vfZm4dRkOUDDq6u3NQlsw+CFuV3 yuEVmmM+So+iTVIRqRDk0tCJaB+zN2/n/1NlTlj8= 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/rename-gcov_write_summary)] gcov: rename gcov_write_summary X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/rename-gcov_write_summary X-Git-Oldrev: c4d15dddf6b9eacb36f535807ad2ee364af46e04 X-Git-Newrev: d7104e7a78a286907893775bea66af47b14a7dcf Message-Id: <20221011184633.1D8293858D32@sourceware.org> Date: Tue, 11 Oct 2022 18:46:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d7104e7a78a286907893775bea66af47b14a7dcf commit d7104e7a78a286907893775bea66af47b14a7dcf Author: Martin Liska Date: Tue Oct 11 20:45:21 2022 +0200 gcov: rename gcov_write_summary gcc/ChangeLog: * gcov-io.cc (gcov_write_summary): Rename to ... (gcov_write_object_summary): ... this. * gcov-io.h (GCOV_TAG_OBJECT_SUMMARY_LENGTH): Rename from ... (GCOV_TAG_SUMMARY_LENGTH): ... this. libgcc/ChangeLog: * libgcov-driver.c: Use new function. * libgcov.h (gcov_write_summary): Rename to ... (gcov_write_object_summary): ... this. Diff: --- gcc/gcov-io.cc | 8 ++++---- gcc/gcov-io.h | 2 +- libgcc/libgcov-driver.c | 2 +- libgcc/libgcov.h | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gcc/gcov-io.cc b/gcc/gcov-io.cc index 62032ccfa18..af5b13c2cf9 100644 --- a/gcc/gcov-io.cc +++ b/gcc/gcov-io.cc @@ -372,13 +372,13 @@ gcov_write_length (gcov_position_t position) #else /* IN_LIBGCOV */ -/* Write a summary structure to the gcov file. */ +/* Write an object summary structure to the gcov file. */ GCOV_LINKAGE void -gcov_write_summary (gcov_unsigned_t tag, const struct gcov_summary *summary) +gcov_write_object_summary (const struct gcov_summary *summary) { - gcov_write_unsigned (tag); - gcov_write_unsigned (GCOV_TAG_SUMMARY_LENGTH); + gcov_write_unsigned (GCOV_TAG_OBJECT_SUMMARY); + gcov_write_unsigned (GCOV_TAG_OBJECT_SUMMARY_LENGTH); gcov_write_unsigned (summary->runs); gcov_write_unsigned (summary->sum_max); } diff --git a/gcc/gcov-io.h b/gcc/gcov-io.h index 30947634d73..e91cd736556 100644 --- a/gcc/gcov-io.h +++ b/gcc/gcov-io.h @@ -266,8 +266,8 @@ typedef uint64_t gcov_type_unsigned; #define GCOV_TAG_COUNTER_LENGTH(NUM) ((NUM) * 2 * GCOV_WORD_SIZE) #define GCOV_TAG_COUNTER_NUM(LENGTH) ((LENGTH / GCOV_WORD_SIZE) / 2) #define GCOV_TAG_OBJECT_SUMMARY ((gcov_unsigned_t)0xa1000000) +#define GCOV_TAG_OBJECT_SUMMARY_LENGTH (2 * GCOV_WORD_SIZE) #define GCOV_TAG_PROGRAM_SUMMARY ((gcov_unsigned_t)0xa3000000) /* Obsolete */ -#define GCOV_TAG_SUMMARY_LENGTH (2 * GCOV_WORD_SIZE) #define GCOV_TAG_AFDO_FILE_NAMES ((gcov_unsigned_t)0xaa000000) #define GCOV_TAG_AFDO_FUNCTION ((gcov_unsigned_t)0xac000000) #define GCOV_TAG_AFDO_WORKING_SET ((gcov_unsigned_t)0xaf000000) diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index aba62d588b8..e1b74c81e07 100644 --- a/libgcc/libgcov-driver.c +++ b/libgcc/libgcov-driver.c @@ -520,7 +520,7 @@ write_one_data (const struct gcov_info *gi_ptr, #ifdef NEED_L_GCOV /* Generate whole program statistics. */ - gcov_write_summary (GCOV_TAG_OBJECT_SUMMARY, prg_p); + gcov_write_object_summary (prg_p); #endif /* Write execution counts for each function. */ diff --git a/libgcc/libgcov.h b/libgcc/libgcov.h index c7545cc746e..5e7bd0e3454 100644 --- a/libgcc/libgcov.h +++ b/libgcc/libgcov.h @@ -118,7 +118,7 @@ typedef unsigned gcov_type_unsigned __attribute__ ((mode (QI))); #define gcov_rewrite __gcov_rewrite #define gcov_is_error __gcov_is_error #define gcov_write_unsigned __gcov_write_unsigned -#define gcov_write_summary __gcov_write_summary +#define gcov_write_object_summary __gcov_write_object_summary #define gcov_read_unsigned __gcov_read_unsigned #define gcov_read_counter __gcov_read_counter #define gcov_read_summary __gcov_read_summary @@ -342,8 +342,7 @@ extern int __gcov_execve (const char *, char *const [], char *const []) ATTRIBUTE_HIDDEN; /* Functions that only available in libgcov. */ -GCOV_LINKAGE void gcov_write_summary (gcov_unsigned_t /*tag*/, - const struct gcov_summary *) +GCOV_LINKAGE void gcov_write_object_summary (const struct gcov_summary *) ATTRIBUTE_HIDDEN; GCOV_LINKAGE void gcov_rewrite (void) ATTRIBUTE_HIDDEN;