[COMMITTED] gcov: rename gcov_write_summary
Commit Message
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
I'm going to install it.
Martin
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.
---
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(-)
@@ -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);
}
@@ -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)
@@ -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. */
@@ -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;