9 files changed, 33 insertions, 29 deletions

diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index a51244a8022f..faca2bf6a430 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -25,7 +25,7 @@ build-dir := $(srctree)/tools/build
 include $(build-dir)/Build.include
 
 # do not force detected configuration
--include .config-detected
+-include $(OUTPUT).config-detected
 
 # Init all relevant variables used in build files so
 # 1) they have correct type
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 1af0cfeb7a57..7a4b549214e3 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -110,7 +110,7 @@ $(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD
         $(Q)touch $(OUTPUT)PERF-VERSION-FILE
 
 CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
+LD ?= $(CROSS_COMPILE)ld
 AR = $(CROSS_COMPILE)ar
 PKG_CONFIG = $(CROSS_COMPILE)pkg-config
 
@@ -545,7 +545,7 @@ config-clean:
 clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean
         $(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
         $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
-        $(Q)$(RM) .config-detected
+        $(Q)$(RM) $(OUTPUT).config-detected
         $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
         $(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
         $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 52ec66b23607..01b06492bd6a 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
         if (inject.session == NULL)
                 return -1;
 
-        if (symbol__init(&inject.session->header.env) < 0)
-                return -1;
+        ret = symbol__init(&inject.session->header.env);
+        if (ret < 0)
+                goto out_delete;
 
         ret = __cmd_inject(&inject);
 
+out_delete:
         perf_session__delete(inject.session);
-
         return ret;
 }
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 950f296dfcf7..23b1faaaa4cc 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
                 if (!perf_evlist__find_tracepoint_by_name(session->evlist,
                                                           "kmem:kmalloc")) {
                         pr_err(errmsg, "slab", "slab");
-                        return -1;
+                        goto out_delete;
                 }
         }
 
@@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
                                                              "kmem:mm_page_alloc");
                 if (evsel == NULL) {
                         pr_err(errmsg, "page", "page");
-                        return -1;
+                        goto out_delete;
                 }
 
                 kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent);
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 74878cd75078..fc1cffb1b7a2 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm)
 
         symbol__init(&kvm->session->header.env);
 
-        if (!perf_session__has_traces(kvm->session, "kvm record"))
-                return -EINVAL;
+        if (!perf_session__has_traces(kvm->session, "kvm record")) {
+                ret = -EINVAL;
+                goto out_delete;
+        }
 
         /*
          * Do not use 'isa' recorded in kvm_exit tracepoint since it is not
@@ -1070,9 +1072,13 @@ static int read_events(struct perf_kvm_stat *kvm)
          */
         ret = cpu_isa_config(kvm);
         if (ret < 0)
-                return ret;
+                goto out_delete;
 
-        return perf_session__process_events(kvm->session);
+        ret = perf_session__process_events(kvm->session);
+
+out_delete:
+        perf_session__delete(kvm->session);
+        return ret;
 }
 
 static int parse_target_str(struct perf_kvm_stat *kvm)
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index da2ec06f0742..80170aace5d4 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem)
                 .mode = PERF_DATA_MODE_READ,
                 .force = mem->force,
         };
-        int err = -EINVAL;
         int ret;
         struct perf_session *session = perf_session__new(&file, false,
                                                          &mem->tool);
@@ -135,24 +134,21 @@ static int report_raw_events(struct perf_mem *mem)
         if (mem->cpu_list) {
                 ret = perf_session__cpu_bitmap(session, mem->cpu_list,
                                                mem->cpu_bitmap);
-                if (ret)
+                if (ret < 0)
                         goto out_delete;
         }
 
-        if (symbol__init(&session->header.env) < 0)
-                return -1;
+        ret = symbol__init(&session->header.env);
+        if (ret < 0)
+                goto out_delete;
 
         printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");
 
-        err = perf_session__process_events(session);
-        if (err)
-                return err;
-
-        return 0;
+        ret = perf_session__process_events(session);
 
 out_delete:
         perf_session__delete(session);
-        return err;
+        return ret;
 }
 
 static int report_events(int argc, const char **argv, struct perf_mem *mem)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 348bed4a2abf..95a47719aec3 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -839,8 +839,10 @@ repeat:
         if (report.header || report.header_only) {
                 perf_session__fprintf_info(session, stdout,
                                            report.show_full_info);
-                if (report.header_only)
-                        return 0;
+                if (report.header_only) {
+                        ret = 0;
+                        goto error;
+                }
         } else if (use_browser == 0) {
                 fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n",
                       stdout);
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 317001c94660..094ddaee104c 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -11,9 +11,9 @@ ifneq ($(obj-perf),)
 obj-perf := $(abspath $(obj-perf))/
 endif
 
-$(shell echo -n > .config-detected)
-detected     = $(shell echo "$(1)=y"       >> .config-detected)
-detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected)
+$(shell echo -n > $(OUTPUT).config-detected)
+detected     = $(shell echo "$(1)=y"       >> $(OUTPUT).config-detected)
+detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected)
 
 CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)
 
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 4744673aff1b..7ff682770fdb 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1448,10 +1448,9 @@ int machine__process_event(struct machine *machine, union perf_event *event,
         case PERF_RECORD_AUX:
                 ret = machine__process_aux_event(machine, event); break;
         case PERF_RECORD_ITRACE_START:
-                ret = machine__process_itrace_start_event(machine, event);
+                ret = machine__process_itrace_start_event(machine, event); break;
         case PERF_RECORD_LOST_SAMPLES:
                 ret = machine__process_lost_samples_event(machine, event, sample); break;
-                break;
         default:
                 ret = -1;
                 break;