Skip to contentSkip to conversation

gcov: add support for GCC 4.9

PATCH Peter Oberparleiter 1 participant 1 message May 12, 2014 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 4 lines · Yuan Pengfei

From: Yuan Pengfei <[email protected]>

This patch handles the gcov-related changes in GCC 4.9:
A new counter (time profile) is added.

It appears that this patch contains two independent sets of changes:
1. Updates to gcov-kernel required to work with GCC 4.9 (#counters + new merge function stub)
2. A bug-fix required when using GCC option -fprofile-values which is currently not supported by gcov-kernel
(see https://lkml.org/lkml/2014/2/19/74)

Please split these changes into separate patches.

Change 1) is definitely useful as without it .gcda file creation will fail when compiling the kernel with GCC 4.9.

Regarding change 2) I still don't think this is necessary unless:
a) there is a way to trigger the problem without -fprofile-values, or
b) you intend to send an additional patch set that enables -fprofile-values profiling for gcov-kernel in which case the fix should be part of that patch set.

Quoted 65 lines

See http://gcc.gnu.org/gcc-4.9/changes.html

---
 kernel/gcov/base.c    | 6 ++++++
 kernel/gcov/gcc_3_4.c | 2 +-
 kernel/gcov/gcc_4_7.c | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)
kernel/gcov/base.c +6 -0
index f45b75b..b358a80 100644
@@ -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()
  *
kernel/gcov/gcc_3_4.c +1 -1
index 27bc88a..1c1f425 100644
@@ -269,7 +269,7 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info)
 		dup->counts[i].num = ctr->num;
 		dup->counts[i].merge = ctr->merge;
 		dup->counts[i].values = vmalloc(size);
-		if (!dup->counts[i].values)
+		if (size && !dup->counts[i].values)
 			goto err_free;
 		memcpy(dup->counts[i].values, ctr->values, size);
 	}
kernel/gcov/gcc_4_7.c +6 -1
index 2c6e463..7f74b59 100644
@@ -18,7 +18,12 @@
 #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;
@@ -290,7 +295,7 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info)
 
 			dci_ptr->values = vmalloc(cv_size);
 
-			if (!dci_ptr->values)
+			if (cv_size && !dci_ptr->values)
 				goto err_free;
 
 			dci_ptr->num = sci_ptr->num;
Signature · 2 lines
Peter Oberparleiter
Linux on System z Development - IBM Germany