| From 73d2d6b421dfdc66b4615452a94efcece27a3c21 Mon Sep 17 00:00:00 2001 |
| From: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Date: Mon, 2 Mar 2020 11:13:19 -0300 |
| Subject: [PATCH] perf tests bp_account: Make global variable static |
| |
| commit cff20b3151ccab690715cb6cf0f5da5cccb32adf upstream. |
| |
| To fix the build with newer gccs, that without this patch exit with: |
| |
| LD /tmp/build/perf/tests/perf-in.o |
| ld: /tmp/build/perf/tests/bp_account.o:/git/perf/tools/perf/tests/bp_account.c:22: multiple definition of `the_var'; /tmp/build/perf/tests/bp_signal.o:/git/perf/tools/perf/tests/bp_signal.c:38: first defined here |
| make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/tests/perf-in.o] Error 1 |
| |
| First noticed in fedora:rawhide/32 with: |
| |
| [perfbuilder@a5ff49d6e6e4 ~]$ gcc --version |
| gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8) |
| |
| Reported-by: Jiri Olsa <jolsa@kernel.org> |
| Cc: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Cc: Ben Hutchings <ben@decadent.org.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/perf/tests/bp_account.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c |
| index 016bba2..55a9de3 100644 |
| --- a/tools/perf/tests/bp_account.c |
| +++ b/tools/perf/tests/bp_account.c |
| @@ -23,7 +23,7 @@ |
| #include "../perf-sys.h" |
| #include "cloexec.h" |
| |
| -volatile long the_var; |
| +static volatile long the_var; |
| |
| static noinline int test_function(void) |
| { |
| -- |
| 2.7.4 |
| |