From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- .../trace-cmd/files/trace-cmd-2.8.3-gcc10.patch | 104 +++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch (limited to 'dev-util/trace-cmd/files') diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch new file mode 100644 index 000000000000..709347448df2 --- /dev/null +++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch @@ -0,0 +1,104 @@ +diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c +index 384a7ff..e0e7c47 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_hist; ++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; + +@@ -568,7 +568,7 @@ process_record(struct tep_handle *pevent, struct tep_record *record) + unsigned long long val; + int type; + +- tep_read_number_field(common_type_field, record->data, &val); ++ tep_read_number_field(common_type_hist, record->data, &val); + type = val; + + if (type == function_type) +@@ -956,8 +956,8 @@ static void do_trace_hist(struct tracecmd_input *handle) + + long_size = tracecmd_long_size(handle); + +- common_type_field = tep_find_common_field(event, "common_type"); +- if (!common_type_field) ++ common_type_hist = tep_find_common_field(event, "common_type"); ++ if (!common_type_hist) + die("Can't find a 'type' field?"); + + common_pid_field = tep_find_common_field(event, "common_pid"); +diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c +index 078a61b..630aeff 100644 +--- a/tracecmd/trace-mem.c ++++ b/tracecmd/trace-mem.c +@@ -30,7 +30,7 @@ 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_mem; + + struct tep_format_field *kmalloc_callsite_field; + struct tep_format_field *kmalloc_bytes_req_field; +@@ -369,7 +369,7 @@ process_record(struct tep_handle *pevent, struct tep_record *record) + unsigned long long val; + int type; + +- tep_read_number_field(common_type_field, record->data, &val); ++ tep_read_number_field(common_type_mem, record->data, &val); + type = val; + + if (type == kmalloc_type) +@@ -490,8 +490,8 @@ static void do_trace_mem(struct tracecmd_input *handle) + ret = tep_data_type(pevent, record); + event = tep_find_event(pevent, ret); + +- common_type_field = tep_find_common_field(event, "common_type"); +- if (!common_type_field) ++ common_type_mem = tep_find_common_field(event, "common_type"); ++ if (!common_type_mem) + die("Can't find a 'type' field?"); + + update_kmalloc(pevent); -- cgit v1.2.3