libgcov.h: Move renaming of entry points to lib gcov specific portion.

	libgcc/
	* libgcov.h: Move renaming of entry points to lib gcov specific
	portion.
	(gcov_do_dump): New rename.
	(gcov_rewrite): Remove inline, make HIDDEN.
	* libgcov-driver.c (gcov_clear, gcov_exit): Remove declarations.
	(gcov_exit_compute_summary): Rename to ...
	(compute_summary): ... here.  Add LIST argument.
	(gcov_exit_merge_gcda): Rename to ...
	(merge_one_data): ... here.
	(gcov_exit_write_gcda): Rename to ...
	(write_one_data): ... here.
	(gcov_exit_merge_summary): Rename to ...
	(merge_summary): Add RUN_COUNTED argument.
	(gcov_exit_dump_gcov): Rename to ...
	(dump_one_gcov): Add RUN_COUNTED argument.
	(gcov_do_dump): New function, broken out of ...
	(gcov_exit): ... here.  Call it.

	gcc/
	* gcov-io.c (gcov_var): Make hidden.
	* gcov-tool.c (gcov_list, gcov_exit): Remove declarations.
	(gcov_do_dump): Declare.
	(gcov_output_files): Call gcov_do_dump, not gcov_exit).

From-SVN: r213188

3 files changed, 13 insertions, 9 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2f6540..64191a7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-29  Nathan Sidwell  <nathan@acm.org>
+
+	* gcov-io.c (gcov_var): Make hidden.
+	* gcov-tool.c (gcov_list, gcov_exit): Remove declarations.
+	(gcov_do_dump): Declare.
+	(gcov_output_files): Call gcov_do_dump, not gcov_exit).
+
 2014-07-29  Martin Jambor  <mjambor@suse.cz>
 
 	* tree-sra.c (sra_modify_constructor_assign): Change type of stmt
@@ -25,8 +32,8 @@
 	(walk_ssa_copies): Break out from ...
 	(get_polymorphic_call_info): ... here; set speculative context
 	before giving up.
-	* ipa-prop.c (ipa_write_indirect_edge_info, ipa_read_indirect_edge_info):
-	Stream speculative context.
+	* ipa-prop.c (ipa_write_indirect_edge_info,
+	ipa_read_indirect_edge_info): Stream speculative context.
 	* ipa-utils.h (ipa_polymorphic_call_context): Add speculative info
 	(SPECULATIVE_OFFSET, SPECULATIVE_OUTER_TYPE,
 	SPECULATIVE_MAYBE_DERIVED_TYPE).
@@ -41,7 +48,7 @@
 
 2014-07-28  Trevor Saunders  <tsaunders@mozilla.com>
 
-	* config/i386/i386.c (ix86_return_in_memory): replace one
+	* config/i386/i386.c (ix86_return_in_memory): Replace one
 	ATTRIBUTE_UNUSED where the attribute can actually sometimes be unused.
 
 2014-07-28  Marek Polacek  <polacek@redhat.com>
diff --git a/gcc/gcov-io.c b/gcc/gcov-io.c
index c2cd170..7516946 100644
--- a/gcc/gcov-io.c
+++ b/gcc/gcov-io.c
@@ -39,7 +39,7 @@ static void gcov_allocate (unsigned);
 /* Optimum number of gcov_unsigned_t's read from or written to disk.  */
 #define GCOV_BLOCK_SIZE (1 << 10)
 
-GCOV_LINKAGE struct gcov_var
+GCOV_LINKAGE ATTRIBUTE_HIDDEN struct gcov_var
 {
   FILE *file;
   gcov_position_t start;	/* Position of first byte of block */
diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c
index 07b7bfa..61e82a3 100644
--- a/gcc/gcov-tool.c
+++ b/gcc/gcov-tool.c
@@ -38,13 +38,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include <ftw.h>
 #include <getopt.h>
 
-extern struct gcov_info *gcov_list;
-
 extern int gcov_profile_merge (struct gcov_info*, struct gcov_info*, int, int);
 extern int gcov_profile_normalize (struct gcov_info*, gcov_type);
 extern int gcov_profile_scale (struct gcov_info*, float, int, int);
 extern struct gcov_info* gcov_read_profile_dir (const char*, int);
-extern void gcov_exit (void);
+extern void gcov_do_dump (struct gcov_info *, int);
 extern void gcov_set_verbose (void);
 
 /* Set to verbose output mode.  */
@@ -110,8 +108,7 @@ gcov_output_files (const char *out, struct gcov_info *profile)
   if (ret)
     fatal_error ("Cannot change directory to %s", out);
 
-  gcov_list = profile;
-  gcov_exit ();
+  gcov_do_dump (profile, 0);
 
   ret = chdir (pwd);
   if (ret)