gcov: add support for GCC 4.9
authorYuan Pengfei <coolypf@qq.com>
Tue, 10 Jun 2014 22:18:39 +0000 (15:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2014 22:34:46 +0000 (15:34 -0700)
This patch handles the gcov-related changes in GCC 4.9:

  A new counter (time profile) is added. The total number is 9 now.

  A new profile merge function __gcov_merge_time_profile is added.

See gcc/gcov-io.h and libgcc/libgcov-merge.c

For the first change, the layout of struct gcov_info is affected.

For the second one, a dummy function is added to kernel/gcov/base.c
similarly.

Signed-off-by: Yuan Pengfei <coolypf@qq.com>
Acked-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/gcov/base.c
kernel/gcov/gcc_4_7.c

index f45b75b713c0eeff3564cfacb4f0881037bbfc75..b358a802fd184391ae4926bc02b2983511bc8077 100644 (file)
@@ -85,6 +85,12 @@ void __gcov_merge_ior(gcov_type *counters, unsigned int n_counters)
 }
 EXPORT_SYMBOL(__gcov_merge_ior);
 
+void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
+{
+       /* Unused. */
+}
+EXPORT_SYMBOL(__gcov_merge_time_profile);
+
 /**
  * gcov_enable_events - enable event reporting through gcov_event()
  *
index 2c6e4631c814e19714f0e635ed1b4173dc49ec48..826ba9fb5e3277292d38ef4c95ba9713378b4543 100644 (file)
 #include <linux/vmalloc.h>
 #include "gcov.h"
 
+#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
+#define GCOV_COUNTERS                  9
+#else
 #define GCOV_COUNTERS                  8
+#endif
+
 #define GCOV_TAG_FUNCTION_LENGTH       3
 
 static struct gcov_info *gcov_info_head;