Skip to contentSkip to conversation

gcov: add support for GCC 5.1

PATCH In review Lorenzo Stoakes 2 participants 2 messages May 29, 2015 – Jun 1, 2015 Gcov based kernel profiling

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcov: add support for GCC 5.1

This patch fixes kernel gcov support for GCC 5.1. Similar to commit a992bf836f9c3039a16f4bd068d161c86c6c3e2c this patch takes into account the existence of a new gcov counter (see gcc's gcc/gcov-counter.def.)

Firstly, it increments GCOV_COUNTERS (to 10), which makes the data structure struct gcov_info compatible with GCC 5.1.

Secondly, a corresponding counter function __gcov_merge_icall_topn (Top
N value tracking for indirect calls) is included in base.c with the
other gcov counters unused for kernel profiling.

---
 kernel/gcov/base.c    | 6 ++++++
 kernel/gcov/gcc_4_7.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
kernel/gcov/base.c +6 -0
index a744098..7080ae1 100644
@@ -92,6 +92,12 @@ void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
 }
 EXPORT_SYMBOL(__gcov_merge_time_profile);
 
+void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters)
+{
+	/* Unused. */
+}
+EXPORT_SYMBOL(__gcov_merge_icall_topn);
+
 /**
  * gcov_enable_events - enable event reporting through gcov_event()
  *
kernel/gcov/gcc_4_7.c +3 -1
index 826ba9f..e25e92f 100644
@@ -18,7 +18,9 @@
 #include <linux/vmalloc.h>
 #include "gcov.h"
 
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
+#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
+#define GCOV_COUNTERS			10
+#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
 #define GCOV_COUNTERS			9
 #else
 #define GCOV_COUNTERS			8

--
2.4.2

Tested-by Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Lorenzo Stoakes

This patch fixes kernel gcov support for GCC 5.1. Similar to commit a992bf836f9c3039a16f4bd068d161c86c6c3e2c this patch takes into account the existence of a new gcov counter (see gcc's gcc/gcov-counter.def.)

Firstly, it increments GCOV_COUNTERS (to 10), which makes the data structure struct gcov_info compatible with GCC 5.1.

Secondly, a corresponding counter function __gcov_merge_icall_topn (Top
N value tracking for indirect calls) is included in base.c with the
other gcov counters unused for kernel profiling.

Looks sane and tests finished successfully on s390 with GCC 5.1.0 and GCC 4.9.2.

Quoted 41 lines
---
 kernel/gcov/base.c    | 6 ++++++
 kernel/gcov/gcc_4_7.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
kernel/gcov/base.c +6 -0
index a744098..7080ae1 100644
@@ -92,6 +92,12 @@ void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
 }
 EXPORT_SYMBOL(__gcov_merge_time_profile);
 
+void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters)
+{
+	/* Unused. */
+}
+EXPORT_SYMBOL(__gcov_merge_icall_topn);
+
 /**
  * gcov_enable_events - enable event reporting through gcov_event()
  *
kernel/gcov/gcc_4_7.c +3 -2
index 826ba9f..e25e92f 100644
@@ -18,7 +18,9 @@
 #include <linux/vmalloc.h>
 #include "gcov.h"
 
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
+#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
+#define GCOV_COUNTERS			10
+#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
 #define GCOV_COUNTERS			9
 #else
 #define GCOV_COUNTERS			8
--

2.4.2

Signature · 2 lines
Peter Oberparleiter
Linux on z Systems Development - IBM Germany