Fix gcov for GCC 4.6.
Tuomas Tynkkynen [Wed, 20 Jun 2012 11:47:25 +0000 (14:47 +0300)]
Gcov's internal data structures, on which the kernel depends on, have
changed in GCC 4.6. This patch adds support for GCC 4.6 and should still
work on GCC 4.4 too.

For reference, look at 'struct gcov_fn_info' in GCC's 'gcc/gcov-io.h',
near line 698:
https://android.googlesource.com/toolchain/gcc/+/master/gcc-4.4.3/
https://android.googlesource.com/toolchain/gcc/+/master/gcc-4.6/

Bug 1003822

Change-Id: I527736f944c80b8b345d1685669c0b99eb38fb66
Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Reviewed-on: http://git-master/r/110073
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Tested-by: Juha Tukkinen <jtukkinen@nvidia.com>

kernel/gcov/gcc_3_4.c
kernel/gcov/gcov.h

index d753d11..bc78336 100644 (file)
@@ -466,8 +466,12 @@ int gcov_iter_write(struct gcov_iterator *iter, struct seq_file *seq)
                rc = seq_write_gcov_u32(seq, GCOV_TAG_FUNCTION);
                break;
        case RECORD_FUNCTON_TAG_LEN:
+#ifdef GCOV_FN_INFO_HAS_NAME_FIELD
                rc = seq_write_gcov_u32(seq, GCOV_TAG_FUNCTION_LENGTH +
                        (sizeof_str(get_func(iter)->name)));
+#else
+               rc = seq_write_gcov_u32(seq, GCOV_TAG_FUNCTION_LENGTH);
+#endif
                break;
        case RECORD_FUNCTION_IDENT:
                rc = seq_write_gcov_u32(seq, get_func(iter)->ident);
@@ -479,11 +483,19 @@ int gcov_iter_write(struct gcov_iterator *iter, struct seq_file *seq)
                rc = seq_write_gcov_u32(seq, get_func(iter)->cfg_checksum);
                break;
        case RECORD_FUNCTION_NAME_LEN:
+#ifdef GCOV_FN_INFO_HAS_NAME_FIELD
                rc = seq_write_gcov_u32(seq,
                        (sizeof_str(get_func(iter)->name) - 1));
+#else
+               rc = 0;
+#endif
                break;
        case RECORD_FUNCTION_NAME:
+#ifdef GCOV_FN_INFO_HAS_NAME_FIELD
                rc = seq_write_gcov_str(seq, get_func(iter)->name);
+#else
+               rc = 0;
+#endif
                break;
        case RECORD_COUNT_TAG:
                rc = seq_write_gcov_u32(seq,
index 040c698..8c5130a 100644 (file)
 #include <linux/types.h>
 
 /*
- * Profiling data types used for gcc 3.4 and above - these are defined by
+ * GCC 4.6 drops the 'name' field from 'struct gcov_fn_info'.
+ */
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
+#define GCOV_FN_INFO_HAS_NAME_FIELD
+#endif
+
+/*
+ * Profiling data types used for at least gcc 4.4 and 4.6 - these are defined by
  * gcc and need to be kept as close to the original definition as possible to
  * remain compatible.
  */
@@ -77,7 +84,9 @@ struct gcov_fn_info {
        unsigned int lineno_checksum;
        unsigned int cfg_checksum;
        unsigned int dc_offset;
+#ifdef GCOV_FN_INFO_HAS_NAME_FIELD
        const char   *name;
+#endif
        unsigned int n_ctrs[0];
 };