diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-03-17 15:27:48 -0700 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-19 13:38:05 -0300 |
| commit | 76aea7731e7050c066943a1d7456ec6510702601 (patch) | |
| tree | b62f3db64e3f6edb0e563350f45e63b61a749b64 /tools/perf/config/Makefile | |
| parent | 4b20d684b4e1d11795af8783b45f2149b0ba0faf (diff) | |
| download | lwn-76aea7731e7050c066943a1d7456ec6510702601.tar.gz lwn-76aea7731e7050c066943a1d7456ec6510702601.zip | |
perf tools: Fix perf-read-vdsox32 not building and lib64 install dir
Commit:
c6e5e9fbc3ea ("perf tools: Fix building error in x86_64 when dwarf unwind is on")
removed the definition of IS_X86_64 but not all places using it, with
the consequence that perf-read-vdsox32 would not be built anymore, and
the default lib install directory was 'lib' instead of 'lib64'.
Also needs to go to v3.19.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: stable@vger.kernel.org # 3.19
Link: http://lkml.kernel.org/r/CAMe9rOqpGVq3D88w+D15ef7sv6G6k57ZeTvxBm46=WFgzo9p1w@mail.gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/config/Makefile')
| -rw-r--r-- | tools/perf/config/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 489d33305b16..e7f83b15fcbf 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -666,7 +666,7 @@ ifeq (${IS_64_BIT}, 1) NO_PERF_READ_VDSO32 := 1 endif endif - ifneq (${IS_X86_64}, 1) + ifneq ($(ARCH), x86) NO_PERF_READ_VDSOX32 := 1 endif ifndef NO_PERF_READ_VDSOX32 @@ -727,7 +727,7 @@ sysconfdir = $(prefix)/etc ETC_PERFCONFIG = etc/perfconfig endif ifndef lib -ifeq ($(IS_X86_64),1) +ifeq ($(ARCH)$(IS_64_BIT), x861) lib = lib64 else lib = lib |