From 1d9fec7937f45dde5e04cac966a2d9a12f2fc15a Mon Sep 17 00:00:00 2001 From: Yiran Wang Date: Tue, 23 Jun 2015 15:33:17 -0700 Subject: Synchronize with google/gcc-4_9 to r224707 (from r214835) Change-Id: I3d6f06fc613c8f8b6a82143dc44b7338483aac5d --- gcc-4.9/libgcc/libgcov-merge.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gcc-4.9/libgcc/libgcov-merge.c') diff --git a/gcc-4.9/libgcc/libgcov-merge.c b/gcc-4.9/libgcc/libgcov-merge.c index ddbf06a..997dab3 100644 --- a/gcc-4.9/libgcc/libgcov-merge.c +++ b/gcc-4.9/libgcc/libgcov-merge.c @@ -108,10 +108,12 @@ __gcov_merge_dc (gcov_type *counters, unsigned n_counters) else if (__gcov_is_gid_insane (global_id)) global_id = counters[i]; +#if !defined(__KERNEL__) /* In the case of inconsistency, use the src's target. */ if (counters[i] != global_id) fprintf (stderr, "Warning: Inconsistent call targets in" " direct-call profile.\n"); +#endif } else if (global_id) counters[i] = global_id; -- cgit v1.1