From: Greg Kroah-Hartman Date: Wed, 30 Aug 2017 15:57:53 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v3.18.69~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abd75694e39176d9c80a9d554797ca13aa144720;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: gcov-add-support-for-gcc-version-6.patch gcov-support-gcc-7.1.patch --- diff --git a/queue-4.4/gcov-add-support-for-gcc-version-6.patch b/queue-4.4/gcov-add-support-for-gcc-version-6.patch new file mode 100644 index 00000000000..ed711f1e528 --- /dev/null +++ b/queue-4.4/gcov-add-support-for-gcc-version-6.patch @@ -0,0 +1,32 @@ +From d02038f972538b93011d78c068f44514fbde0a8c Mon Sep 17 00:00:00 2001 +From: Florian Meier +Date: Thu, 14 Jul 2016 12:07:26 -0700 +Subject: gcov: add support for gcc version >= 6 + +From: Florian Meier + +commit d02038f972538b93011d78c068f44514fbde0a8c upstream. + +Link: http://lkml.kernel.org/r/20160701130914.GA23225@styxhp +Signed-off-by: Florian Meier +Reviewed-by: Peter Oberparleiter +Tested-by: Peter Oberparleiter +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/gcov/gcc_4_7.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/gcov/gcc_4_7.c ++++ b/kernel/gcov/gcc_4_7.c +@@ -18,7 +18,7 @@ + #include + #include "gcov.h" + +-#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1 ++#if (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) + #define GCOV_COUNTERS 10 + #elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9 + #define GCOV_COUNTERS 9 diff --git a/queue-4.4/gcov-support-gcc-7.1.patch b/queue-4.4/gcov-support-gcc-7.1.patch new file mode 100644 index 00000000000..bb71f6bd52b --- /dev/null +++ b/queue-4.4/gcov-support-gcc-7.1.patch @@ -0,0 +1,55 @@ +From 05384213436ab690c46d9dfec706b80ef8d671ab Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Fri, 12 May 2017 15:46:35 -0700 +Subject: gcov: support GCC 7.1 + +From: Martin Liska + +commit 05384213436ab690c46d9dfec706b80ef8d671ab upstream. + +Starting from GCC 7.1, __gcov_exit is a new symbol expected to be +implemented in a profiling runtime. + +[akpm@linux-foundation.org: coding-style fixes] +[mliska@suse.cz: v2] + Link: http://lkml.kernel.org/r/e63a3c59-0149-c97e-4084-20ca8f146b26@suse.cz +Link: http://lkml.kernel.org/r/8c4084fa-3885-29fe-5fc4-0d4ca199c785@suse.cz +Signed-off-by: Martin Liska +Acked-by: Peter Oberparleiter +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/gcov/base.c | 6 ++++++ + kernel/gcov/gcc_4_7.c | 4 +++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +--- a/kernel/gcov/base.c ++++ b/kernel/gcov/base.c +@@ -98,6 +98,12 @@ void __gcov_merge_icall_topn(gcov_type * + } + EXPORT_SYMBOL(__gcov_merge_icall_topn); + ++void __gcov_exit(void) ++{ ++ /* Unused. */ ++} ++EXPORT_SYMBOL(__gcov_exit); ++ + /** + * gcov_enable_events - enable event reporting through gcov_event() + * +--- a/kernel/gcov/gcc_4_7.c ++++ b/kernel/gcov/gcc_4_7.c +@@ -18,7 +18,9 @@ + #include + #include "gcov.h" + +-#if (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) ++#if (__GNUC__ >= 7) ++#define GCOV_COUNTERS 9 ++#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) + #define GCOV_COUNTERS 10 + #elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9 + #define GCOV_COUNTERS 9 diff --git a/queue-4.4/series b/queue-4.4/series index 8ff501eae9b..f52822a8b85 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -2,3 +2,5 @@ scsi-isci-avoid-array-subscript-warning.patch alsa-au88x0-fix-zero-clear-of-stream-resources.patch btrfs-remove-duplicate-const-specifier.patch i2c-jz4780-drop-superfluous-init.patch +gcov-add-support-for-gcc-version-6.patch +gcov-support-gcc-7.1.patch