diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2020-01-13 11:43:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-05 16:43:50 +0100 |
| commit | d847804f8f8a8cd23f38e0b4fbd078d31850137b (patch) | |
| tree | 94e24324bfc9ae35ae8e52ccb478fbade97ad724 | |
| parent | 27f7e492d8fe6a53a0a7afe0c989f2fe61417e90 (diff) | |
| download | linux-stable-d847804f8f8a8cd23f38e0b4fbd078d31850137b.tar.gz linux-stable-d847804f8f8a8cd23f38e0b4fbd078d31850137b.tar.bz2 linux-stable-d847804f8f8a8cd23f38e0b4fbd078d31850137b.zip | |
perf ui gtk: Add missing zalloc object
commit 604e2139a1026793b8c2172bd92c7e9d039a5cf0 upstream.
When we moved zalloc.o to the library we missed gtk library which needs
it compiled in, otherwise the missing __zfree symbol will cause the
library to fail to load.
Adding the zalloc object to the gtk library build.
Fixes: 7f7c536f23e6 ("tools lib: Adopt zalloc()/zfree() from tools/perf")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jelle van der Waa <jelle@vdwaa.nl>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200113104358.123511-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | tools/perf/ui/gtk/Build | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build index ec22e899a224..9b5d5cbb7af7 100644 --- a/tools/perf/ui/gtk/Build +++ b/tools/perf/ui/gtk/Build @@ -7,3 +7,8 @@ gtk-y += util.o gtk-y += helpline.o gtk-y += progress.o gtk-y += annotate.o +gtk-y += zalloc.o + +$(OUTPUT)ui/gtk/zalloc.o: ../lib/zalloc.c FORCE + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) |