trace-cmd: version bump 2.8 -> 2.8.3

With the added upstream patch, this fixes building with gcc 10.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 135 insertions, 2 deletions

diff --git a/patches/trace-cmd-v2.8.3/0001-trace-cmd-Fix-multiple-definition-compiler-errors.patch b/patches/trace-cmd-v2.8.3/0001-trace-cmd-Fix-multiple-definition-compiler-errors.patch
new file mode 100644
index 000000000..9ff3f4424
--- /dev/null
+++ b/patches/trace-cmd-v2.8.3/0001-trace-cmd-Fix-multiple-definition-compiler-errors.patch
@@ -0,0 +1,129 @@
+From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
+Date: Mon, 10 Feb 2020 10:50:10 +0200
+Subject: [PATCH] trace-cmd: Fix "multiple definition" compiler errors
+
+When compiling with gcc and option "-fno-common", there are
+errors because of multiple global variables with the same names.
+The "-fno-common" gcc option is turned on by default on gcc 10, so
+trace-cmd build fails on this compiler.
+
+Proposed solution: set the variables to be static, as their scope is
+only the current C file.
+
+Link: http://lore.kernel.org/linux-trace-devel/20200210085010.7974-1-tz.stoyanov@gmail.com
+
+Reported-by: Ziqian SUN (Zamir) <sztsian@gmail.com>
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=206467
+Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+---
+ tracecmd/trace-hist.c | 40 ++++++++++++++++++++--------------------
+ tracecmd/trace-mem.c  | 38 +++++++++++++++++++-------------------
+ 2 files changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c
+index 384a7ff09306..2e30d021c3f3 100644
+--- a/tracecmd/trace-hist.c
++++ b/tracecmd/trace-hist.c
+@@ -27,26 +27,26 @@ static int kernel_stack_type;
+ 
+ static int long_size;
+ 
+-struct tep_format_field *common_type_field;
+-struct tep_format_field *common_pid_field;
+-struct tep_format_field *sched_wakeup_comm_field;
+-struct tep_format_field *sched_wakeup_new_comm_field;
+-struct tep_format_field *sched_wakeup_pid_field;
+-struct tep_format_field *sched_wakeup_new_pid_field;
+-struct tep_format_field *sched_switch_prev_field;
+-struct tep_format_field *sched_switch_next_field;
+-struct tep_format_field *sched_switch_prev_pid_field;
+-struct tep_format_field *sched_switch_next_pid_field;
+-struct tep_format_field *function_ip_field;
+-struct tep_format_field *function_parent_ip_field;
+-struct tep_format_field *function_graph_entry_func_field;
+-struct tep_format_field *function_graph_entry_depth_field;
+-struct tep_format_field *function_graph_exit_func_field;
+-struct tep_format_field *function_graph_exit_depth_field;
+-struct tep_format_field *function_graph_exit_calltime_field;
+-struct tep_format_field *function_graph_exit_rettime_field;
+-struct tep_format_field *function_graph_exit_overrun_field;
+-struct tep_format_field *kernel_stack_caller_field;
++static struct tep_format_field *common_type_field;
++static struct tep_format_field *common_pid_field;
++static struct tep_format_field *sched_wakeup_comm_field;
++static struct tep_format_field *sched_wakeup_new_comm_field;
++static struct tep_format_field *sched_wakeup_pid_field;
++static struct tep_format_field *sched_wakeup_new_pid_field;
++static struct tep_format_field *sched_switch_prev_field;
++static struct tep_format_field *sched_switch_next_field;
++static struct tep_format_field *sched_switch_prev_pid_field;
++static struct tep_format_field *sched_switch_next_pid_field;
++static struct tep_format_field *function_ip_field;
++static struct tep_format_field *function_parent_ip_field;
++static struct tep_format_field *function_graph_entry_func_field;
++static struct tep_format_field *function_graph_entry_depth_field;
++static struct tep_format_field *function_graph_exit_func_field;
++static struct tep_format_field *function_graph_exit_depth_field;
++static struct tep_format_field *function_graph_exit_calltime_field;
++static struct tep_format_field *function_graph_exit_rettime_field;
++static struct tep_format_field *function_graph_exit_overrun_field;
++static struct tep_format_field *kernel_stack_caller_field;
+ 
+ static int compact;
+ 
+diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c
+index 078a61bc702a..25bdbaee8160 100644
+--- a/tracecmd/trace-mem.c
++++ b/tracecmd/trace-mem.c
+@@ -30,31 +30,31 @@ static int kmem_cache_alloc_type;
+ static int kmem_cache_alloc_node_type;
+ static int kmem_cache_free_type;
+ 
+-struct tep_format_field *common_type_field;
++static struct tep_format_field *common_type_field;
+ 
+-struct tep_format_field *kmalloc_callsite_field;
+-struct tep_format_field *kmalloc_bytes_req_field;
+-struct tep_format_field *kmalloc_bytes_alloc_field;
+-struct tep_format_field *kmalloc_ptr_field;
++static struct tep_format_field *kmalloc_callsite_field;
++static struct tep_format_field *kmalloc_bytes_req_field;
++static struct tep_format_field *kmalloc_bytes_alloc_field;
++static struct tep_format_field *kmalloc_ptr_field;
+ 
+-struct tep_format_field *kmalloc_node_callsite_field;
+-struct tep_format_field *kmalloc_node_bytes_req_field;
+-struct tep_format_field *kmalloc_node_bytes_alloc_field;
+-struct tep_format_field *kmalloc_node_ptr_field;
++static struct tep_format_field *kmalloc_node_callsite_field;
++static struct tep_format_field *kmalloc_node_bytes_req_field;
++static struct tep_format_field *kmalloc_node_bytes_alloc_field;
++static struct tep_format_field *kmalloc_node_ptr_field;
+ 
+-struct tep_format_field *kfree_ptr_field;
++static struct tep_format_field *kfree_ptr_field;
+ 
+-struct tep_format_field *kmem_cache_callsite_field;
+-struct tep_format_field *kmem_cache_bytes_req_field;
+-struct tep_format_field *kmem_cache_bytes_alloc_field;
+-struct tep_format_field *kmem_cache_ptr_field;
++static struct tep_format_field *kmem_cache_callsite_field;
++static struct tep_format_field *kmem_cache_bytes_req_field;
++static struct tep_format_field *kmem_cache_bytes_alloc_field;
++static struct tep_format_field *kmem_cache_ptr_field;
+ 
+-struct tep_format_field *kmem_cache_node_callsite_field;
+-struct tep_format_field *kmem_cache_node_bytes_req_field;
+-struct tep_format_field *kmem_cache_node_bytes_alloc_field;
+-struct tep_format_field *kmem_cache_node_ptr_field;
++static struct tep_format_field *kmem_cache_node_callsite_field;
++static struct tep_format_field *kmem_cache_node_bytes_req_field;
++static struct tep_format_field *kmem_cache_node_bytes_alloc_field;
++static struct tep_format_field *kmem_cache_node_ptr_field;
+ 
+-struct tep_format_field *kmem_cache_free_ptr_field;
++static struct tep_format_field *kmem_cache_free_ptr_field;
+ 
+ static void *zalloc(size_t size)
+ {
diff --git a/patches/trace-cmd-v2.8.3/series b/patches/trace-cmd-v2.8.3/series
new file mode 100644
index 000000000..a68d7d9eb
--- /dev/null
+++ b/patches/trace-cmd-v2.8.3/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-trace-cmd-Fix-multiple-definition-compiler-errors.patch
+# ed8a3a93914f8a8c6f5aa66e55b156be  - git-ptx-patches magic
diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make
index 58a4e2a68..242708212 100644
--- a/rules/trace-cmd.make
+++ b/rules/trace-cmd.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TRACE_CMD) += trace-cmd
 #
 # Paths and names
 #
-TRACE_CMD_VERSION	:= 2.8
-TRACE_CMD_MD5		:= d4cbac48c417d4ee1fbc8821c62d600b
+TRACE_CMD_VERSION	:= 2.8.3
+TRACE_CMD_MD5		:= f0e0b7df8e38c1b4842e8037c2292066
 TRACE_CMD		:= trace-cmd-v$(TRACE_CMD_VERSION)
 TRACE_CMD_SUFFIX	:= tar.gz
 TRACE_CMD_URL		:= https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/$(TRACE_CMD).$(TRACE_CMD_SUFFIX)