diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-23 12:08:31 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-23 12:08:31 +0000 |
| commit | 145d88ea1883c5fd7164794f71f1e9b0bd2c08f7 (patch) | |
| tree | 8d19e93cc094b67e3c1999bd026accb03fd32680 /libgcc | |
| parent | 3f4aa4e18025b6d92add7c51d7f30f48f6ba8639 (diff) | |
| download | gcc-145d88ea1883c5fd7164794f71f1e9b0bd2c08f7.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212931 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgcc/libgcov-driver.c | 14 | ||||
| -rw-r--r-- | libgcc/libgcov.h | 5 |
3 files changed, 12 insertions, 13 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index b659f803a8e..c00e6f92dc4 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2014-07-23 Nathan Sidwell <nathan@acm.org> + + * 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 <danglin@gcc.gnu.org> * config/pa/linux-atomic.c (__sync_lock_release_4): New. diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index 529f4de83bd..cf38f527344 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 781d1f4254f..23ee71c727a 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 */ |