* [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
@ 2015-03-17 22:33 H.J. Lu
2015-03-18 8:24 ` Adrian Hunter
2015-03-22 10:08 ` [tip:perf/core] perf tools: Fix perf-read-vdsox32 not building and lib64 install dir tip-bot for H.J. Lu
0 siblings, 2 replies; 6+ messages in thread
From: H.J. Lu @ 2015-03-17 22:33 UTC (permalink / raw)
To: Adrian Hunter, H. Peter Anvin, Namhyung Kim, LKML
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
IS_X86_64 is never defined nor necessary. We check check ARCH and
IS_64_BIT instead.
ifeq ($(IS_X86_64),1)
can be replaced by
ifeq ($(ARCH)$(IS_64_BIT), x861)
If IS_64_BIT is 1, we can replace
ifneq (${IS_X86_64}, 1)
with
ifneq ($(ARCH), x86)
--
H.J.
[-- Attachment #2: 0001-Check-ARCH-and-IS_64_BIT-instead-of-IS_X86_64-in-per.patch --]
[-- Type: text/x-patch, Size: 1613 bytes --]
From 3ced13f64d49b2e4a9b38dd9bda80481a39d6b1a Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 17 Mar 2015 15:27:48 -0700
Subject: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
IS_X86_64 is never defined nor necessary. We check check ARCH and
IS_64_BIT instead.
ifeq ($(IS_X86_64),1)
can be replaced by
ifeq ($(ARCH)$(IS_64_BIT), x861)
If IS_64_BIT is 1, we can replace
ifneq (${IS_X86_64}, 1)
with
ifneq ($(ARCH), x86)
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---
tools/perf/config/Makefile | 4 ++--
tools/perf/tests/make | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 648e31f..f97de8e 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -645,7 +645,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
@@ -693,7 +693,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
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 69a71ff..f8b24a2 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -5,7 +5,7 @@ include config/Makefile.arch
# FIXME looks like x86 is the only arch running tests ;-)
# we need some IS_(32/64) flag to make this generic
-ifeq ($(IS_X86_64),1)
+ifeq ($(ARCH)$(IS_64_BIT), x861)
lib = lib64
else
lib = lib
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
2015-03-17 22:33 [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf H.J. Lu
@ 2015-03-18 8:24 ` Adrian Hunter
2015-03-18 9:43 ` Jiri Olsa
2015-03-22 10:08 ` [tip:perf/core] perf tools: Fix perf-read-vdsox32 not building and lib64 install dir tip-bot for H.J. Lu
1 sibling, 1 reply; 6+ messages in thread
From: Adrian Hunter @ 2015-03-18 8:24 UTC (permalink / raw)
To: H.J. Lu, Arnaldo Carvalho de Melo
Cc: H. Peter Anvin, Namhyung Kim, LKML, Jiri Olsa
Hi
+Arnaldo
+Jiri
I would change the commit message and subject. Say:
Subject: 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.
Otherwise:
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # 3.19
On 18/03/15 00:33, H.J. Lu wrote:
> IS_X86_64 is never defined nor necessary. We check check ARCH and
> IS_64_BIT instead.
>
> ifeq ($(IS_X86_64),1)
>
> can be replaced by
>
> ifeq ($(ARCH)$(IS_64_BIT), x861)
>
> If IS_64_BIT is 1, we can replace
>
> ifneq (${IS_X86_64}, 1)
>
> with
>
> ifneq ($(ARCH), x86)
>
>
> -- H.J.
>
>
> 0001-Check-ARCH-and-IS_64_BIT-instead-of-IS_X86_64-in-per.patch
>
>
> From 3ced13f64d49b2e4a9b38dd9bda80481a39d6b1a Mon Sep 17 00:00:00 2001
> From: "H.J. Lu" <hjl.tools@gmail.com>
> Date: Tue, 17 Mar 2015 15:27:48 -0700
> Subject: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
>
> IS_X86_64 is never defined nor necessary. We check check ARCH and
> IS_64_BIT instead.
>
> ifeq ($(IS_X86_64),1)
>
> can be replaced by
>
> ifeq ($(ARCH)$(IS_64_BIT), x861)
>
> If IS_64_BIT is 1, we can replace
>
> ifneq (${IS_X86_64}, 1)
>
> with
>
> ifneq ($(ARCH), x86)
>
> Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
> ---
> tools/perf/config/Makefile | 4 ++--
> tools/perf/tests/make | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> index 648e31f..f97de8e 100644
> --- a/tools/perf/config/Makefile
> +++ b/tools/perf/config/Makefile
> @@ -645,7 +645,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
> @@ -693,7 +693,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
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index 69a71ff..f8b24a2 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -5,7 +5,7 @@ include config/Makefile.arch
>
> # FIXME looks like x86 is the only arch running tests ;-)
> # we need some IS_(32/64) flag to make this generic
> -ifeq ($(IS_X86_64),1)
> +ifeq ($(ARCH)$(IS_64_BIT), x861)
> lib = lib64
> else
> lib = lib
> -- 1.9.3
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
2015-03-18 8:24 ` Adrian Hunter
@ 2015-03-18 9:43 ` Jiri Olsa
2015-03-18 13:10 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Olsa @ 2015-03-18 9:43 UTC (permalink / raw)
To: Adrian Hunter
Cc: H.J. Lu, Arnaldo Carvalho de Melo, H. Peter Anvin, Namhyung Kim,
LKML, Jiri Olsa
On Wed, Mar 18, 2015 at 10:24:10AM +0200, Adrian Hunter wrote:
> Hi
>
> +Arnaldo
> +Jiri
>
> I would change the commit message and subject. Say:
>
> Subject: 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.
>
> Otherwise:
>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> Cc: stable@vger.kernel.org # 3.19
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
2015-03-18 9:43 ` Jiri Olsa
@ 2015-03-18 13:10 ` Arnaldo Carvalho de Melo
2015-03-18 13:53 ` H.J. Lu
0 siblings, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-03-18 13:10 UTC (permalink / raw)
To: Jiri Olsa
Cc: Adrian Hunter, H.J. Lu, H. Peter Anvin, Namhyung Kim, LKML,
Jiri Olsa
Em Wed, Mar 18, 2015 at 10:43:44AM +0100, Jiri Olsa escreveu:
> On Wed, Mar 18, 2015 at 10:24:10AM +0200, Adrian Hunter wrote:
> > Hi
> >
> > +Arnaldo
> > +Jiri
> >
> > I would change the commit message and subject. Say:
> >
> > Subject: 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.
> >
> > Otherwise:
> >
> > Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> > Cc: stable@vger.kernel.org # 3.19
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>
Changed the commit log and applied, thanks,
- Arnaldo
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf
2015-03-18 13:10 ` Arnaldo Carvalho de Melo
@ 2015-03-18 13:53 ` H.J. Lu
0 siblings, 0 replies; 6+ messages in thread
From: H.J. Lu @ 2015-03-18 13:53 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, Adrian Hunter, H. Peter Anvin, Namhyung Kim, LKML,
Jiri Olsa
On Wed, Mar 18, 2015 at 6:10 AM, Arnaldo Carvalho de Melo
<arnaldo.melo@gmail.com> wrote:
> Em Wed, Mar 18, 2015 at 10:43:44AM +0100, Jiri Olsa escreveu:
>> On Wed, Mar 18, 2015 at 10:24:10AM +0200, Adrian Hunter wrote:
>> > Hi
>> >
>> > +Arnaldo
>> > +Jiri
>> >
>> > I would change the commit message and subject. Say:
>> >
>> > Subject: 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.
>> >
>> > Otherwise:
>> >
>> > Acked-by: Adrian Hunter <adrian.hunter@intel.com>
>> > Cc: stable@vger.kernel.org # 3.19
>>
>> Acked-by: Jiri Olsa <jolsa@kernel.org>
>
> Changed the commit log and applied, thanks,
Thanks.
--
H.J.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:perf/core] perf tools: Fix perf-read-vdsox32 not building and lib64 install dir
2015-03-17 22:33 [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf H.J. Lu
2015-03-18 8:24 ` Adrian Hunter
@ 2015-03-22 10:08 ` tip-bot for H.J. Lu
1 sibling, 0 replies; 6+ messages in thread
From: tip-bot for H.J. Lu @ 2015-03-22 10:08 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, linux-kernel, jolsa, adrian.hunter, hjl.tools, acme, tglx,
mingo
Commit-ID: 76aea7731e7050c066943a1d7456ec6510702601
Gitweb: http://git.kernel.org/tip/76aea7731e7050c066943a1d7456ec6510702601
Author: H.J. Lu <hjl.tools@gmail.com>
AuthorDate: Tue, 17 Mar 2015 15:27:48 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 19 Mar 2015 13:38:05 -0300
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>
---
tools/perf/config/Makefile | 4 ++--
tools/perf/tests/make | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 489d333..e7f83b1 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
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 75709d2..bff8532 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -5,7 +5,7 @@ include config/Makefile.arch
# FIXME looks like x86 is the only arch running tests ;-)
# we need some IS_(32/64) flag to make this generic
-ifeq ($(IS_X86_64),1)
+ifeq ($(ARCH)$(IS_64_BIT), x861)
lib = lib64
else
lib = lib
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-22 10:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-17 22:33 [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf H.J. Lu
2015-03-18 8:24 ` Adrian Hunter
2015-03-18 9:43 ` Jiri Olsa
2015-03-18 13:10 ` Arnaldo Carvalho de Melo
2015-03-18 13:53 ` H.J. Lu
2015-03-22 10:08 ` [tip:perf/core] perf tools: Fix perf-read-vdsox32 not building and lib64 install dir tip-bot for H.J. Lu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.