r213984 - /branches/google/gcc-4_9/libgcc/libgc...

[tejohnson@gcc.gnu.org]

Author: tejohnson
Date: Thu Aug 14 20:27:55 2014
New Revision: 213984

URL: https://gcc.gnu.org/viewcvs?rev=213984&root=gcc&view=rev
Log:
Fix a couple problems found during testing.

Backport from trunk (r212694) failed to fixup gcov_read_counter
invocations in google-specific code. Also, forward port
r211800 from google/4_8 to tolerate differences after COMDAT
fixup.

2014-08-14  Teresa Johnson  <tejohnson@google.com>

	* libgcov-merge.c (__gcov_merge_dc): Use gcov_get_counter,
        Relax the check after COMDAT fixup.
	(__gcov_merge_icall_topn): Use gcov_get_counter.

Modified:
    branches/google/gcc-4_9/libgcc/libgcov-merge.c