diff options
author | tejohnson <tejohnson@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-22 14:06:08 +0000 |
---|---|---|
committer | tejohnson <tejohnson@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-22 14:06:08 +0000 |
commit | f19199018c8432d73b3a5c45d4dbc736ebdd9c79 (patch) | |
tree | c6ba216b23b093c7937d812160fcf3dfafedbe7a /libgcc | |
parent | 3c82ff7f84cb0f1223d825e5196643e39cdf1a5f (diff) | |
download | gcc-f19199018c8432d73b3a5c45d4dbc736ebdd9c79.tar.gz |
2014-05-22 Teresa Johnson <tejohnson@google.com>
* gcov-io.c (gcov_position): Use gcov_nonruntime_assert.
(gcov_is_error): Remove gcc_assert from IN_LIBGCOV code.
(gcov_rewrite): Use gcov_nonruntime_assert.
(gcov_open): Ditto.
(gcov_write_words): Ditto.
(gcov_write_length): Ditto.
(gcov_read_words): Use gcov_nonruntime_assert, and remove
gcc_assert from IN_LIBGCOV code.
(gcov_read_summary): Use gcov_error to flag profile corruption.
(gcov_sync): Use gcov_nonruntime_assert.
(gcov_seek): Remove gcc_assert from IN_LIBGCOV code.
(gcov_histo_index): Use gcov_nonruntime_assert.
(static void gcov_histogram_merge): Ditto.
(compute_working_sets): Ditto.
* gcov-io.h (gcov_nonruntime_assert): Define.
(gcov_error): Define for !IN_LIBGCOV
* libgcov-driver.c (gcov_error): Move declaration before gcov-io.c
include.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210805 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
-rw-r--r-- | libgcc/ChangeLog | 5 | ||||
-rw-r--r-- | libgcc/libgcov-driver.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index d7b93e8215b..345472c4a29 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2014-05-22 Teresa Johnson <tejohnson@google.com> + + * libgcov-driver.c (gcov_error): Move declaration before gcov-io.c + include. + 2014-05-20 John Marino <gnugcc@marino.st> * config.host (*-*-dragonfly*): New target. diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index f8abdb1e8ac..ef0505e617e 100644 --- a/libgcc/libgcov-driver.c +++ b/libgcc/libgcov-driver.c @@ -42,6 +42,10 @@ void __gcov_init (struct gcov_info *p __attribute__ ((unused))) {} #endif #ifdef L_gcov + +/* A utility function for outputing errors. */ +static int gcov_error (const char *, ...); + #include "gcov-io.c" /* The following functions can be called from outside of this file. */ @@ -108,9 +112,6 @@ reset_gcov_dump_complete (void) gcov_dump_complete = 0; } -/* A utility function for outputing errors. */ -static int gcov_error (const char *, ...); - static struct gcov_fn_buffer * free_fn_data (const struct gcov_info *gi_ptr, struct gcov_fn_buffer *buffer, unsigned limit) |