perf tools: Fix perf-read-vdsox32 not building and lib64 install dir
Commit:
c6e5e9fbc3
("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>
This commit is contained in:
Родитель
4b20d684b4
Коммит
76aea7731e
|
@ -666,7 +666,7 @@ ifeq (${IS_64_BIT}, 1)
|
||||||
NO_PERF_READ_VDSO32 := 1
|
NO_PERF_READ_VDSO32 := 1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifneq (${IS_X86_64}, 1)
|
ifneq ($(ARCH), x86)
|
||||||
NO_PERF_READ_VDSOX32 := 1
|
NO_PERF_READ_VDSOX32 := 1
|
||||||
endif
|
endif
|
||||||
ifndef NO_PERF_READ_VDSOX32
|
ifndef NO_PERF_READ_VDSOX32
|
||||||
|
@ -727,7 +727,7 @@ sysconfdir = $(prefix)/etc
|
||||||
ETC_PERFCONFIG = etc/perfconfig
|
ETC_PERFCONFIG = etc/perfconfig
|
||||||
endif
|
endif
|
||||||
ifndef lib
|
ifndef lib
|
||||||
ifeq ($(IS_X86_64),1)
|
ifeq ($(ARCH)$(IS_64_BIT), x861)
|
||||||
lib = lib64
|
lib = lib64
|
||||||
else
|
else
|
||||||
lib = lib
|
lib = lib
|
||||||
|
|
|
@ -5,7 +5,7 @@ include config/Makefile.arch
|
||||||
|
|
||||||
# FIXME looks like x86 is the only arch running tests ;-)
|
# FIXME looks like x86 is the only arch running tests ;-)
|
||||||
# we need some IS_(32/64) flag to make this generic
|
# we need some IS_(32/64) flag to make this generic
|
||||||
ifeq ($(IS_X86_64),1)
|
ifeq ($(ARCH)$(IS_64_BIT), x861)
|
||||||
lib = lib64
|
lib = lib64
|
||||||
else
|
else
|
||||||
lib = lib
|
lib = lib
|
||||||
|
|
Загрузка…
Ссылка в новой задаче