From d10ee722fd82c07ada865db142fffec1a992295b Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 23 Jul 2014 12:08:31 +0000 Subject: gcov-tool.c (gcov_list): Declare here. gcc/ * gcov-tool.c (gcov_list): Declare here. (set_gcov_list): Remove. (gcov_output_files): Set gcov_list directly. libgcc/ * libgcov-driver.c (set_gcov_list): Remove. (gcov_list): Make non-static in GCOV_TOOL. * libgcov.h (GCOV_TOOL_LINKAGE): Remove unused #define. From-SVN: r212931 --- libgcc/ChangeLog | 6 ++++++ libgcc/libgcov-driver.c | 14 +++++--------- libgcc/libgcov.h | 5 +---- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'libgcc') diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index b659f80..c00e6f9 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2014-07-23 Nathan Sidwell + + * libgcov-driver.c (set_gcov_list): Remove. + (gcov_list): Make non-static in GCOV_TOOL. + * libgcov.h (GCOV_TOOL_LINKAGE): Remove unused #define. + 2014-07-17 John David Anglin * config/pa/linux-atomic.c (__sync_lock_release_4): New. diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index 529f4de..cf38f52 100644 --- a/libgcc/libgcov-driver.c +++ b/libgcc/libgcov-driver.c @@ -54,7 +54,6 @@ extern void gcov_exit (void) ATTRIBUTE_HIDDEN; extern void set_gcov_dump_complete (void) ATTRIBUTE_HIDDEN; extern void reset_gcov_dump_complete (void) ATTRIBUTE_HIDDEN; extern int get_gcov_dump_complete (void) ATTRIBUTE_HIDDEN; -extern void set_gcov_list (struct gcov_info *) ATTRIBUTE_HIDDEN; struct gcov_fn_buffer { @@ -71,14 +70,11 @@ struct gcov_summary_buffer }; /* Chain of per-object gcov structures. */ -static struct gcov_info *gcov_list; - -/* Set the head of gcov_list. */ -void -set_gcov_list (struct gcov_info *head) -{ - gcov_list = head; -} +#ifndef IN_GCOV_TOOL +/* We need to expose this static variable when compiling for gcov-tool. */ +static +#endif +struct gcov_info *gcov_list; /* Size of the longest file name. */ /* We need to expose this static variable when compiling for gcov-tool. */ diff --git a/libgcc/libgcov.h b/libgcc/libgcov.h index 781d1f4..23ee71c 100644 --- a/libgcc/libgcov.h +++ b/libgcc/libgcov.h @@ -111,12 +111,9 @@ typedef unsigned gcov_position_t; #define L_gcov_merge_ior 1 #define L_gcov_merge_time_profile 1 -/* Make certian internal functions/variables in libgcov available for - gcov-tool access. */ -#define GCOV_TOOL_LINKAGE - extern gcov_type gcov_read_counter_mem (); extern unsigned gcov_get_merge_weight (); +extern struct gcov_info *gcov_list; #endif /* !IN_GCOV_TOOL */ -- cgit v1.1