* [PATCH] perf tools: Fix build error on ARCH=i386/x86_64/sparc64
@ 2015-03-02 4:31 Namhyung Kim
2015-03-02 9:56 ` Jiri Olsa
2015-03-03 6:22 ` [tip:perf/core] perf tools: Fix build error on ARCH=i386/x86_64/ sparc64 tip-bot for Namhyung Kim
0 siblings, 2 replies; 4+ messages in thread
From: Namhyung Kim @ 2015-03-02 4:31 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ingo Molnar, Peter Zijlstra, Jiri Olsa, LKML, He Kuang,
David Ahern
He Kuang reported that current perf tools failed to build when ARCH
variable was given like above. It was because the name is different
that internal directory name. I can see that David's sparc64 build
has same problem. So fix it by applying the sed conversion script to
the command line ARCH variable also, and fixing the converted name
there (i.e. i386/x86_64 -> x86, sparc64 -> sparc).
Reported-and-tested-by: He Kuang <hekuang@huawei.com>
Cc: David Ahern <david.ahern@oracle.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/config/Makefile.arch | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index ff95a68741d1..e9720571341d 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -1,28 +1,15 @@
+ifndef ARCH
+ARCH := $(shell uname -m 2>/dev/null || echo not)
+endif
-uname_M := $(shell uname -m 2>/dev/null || echo not)
-
-RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+ -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
-e s/tile.*/tile/ )
-# Additional ARCH settings for x86
-ifeq ($(RAW_ARCH),i386)
- ARCH ?= x86
-endif
-
-ifeq ($(RAW_ARCH),x86_64)
- ARCH ?= x86
-
- ifneq (, $(findstring m32,$(CFLAGS)))
- RAW_ARCH := x86_32
- endif
-endif
-
-ARCH ?= $(RAW_ARCH)
-
LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
ifeq ($(LP64), 1)
IS_64_BIT := 1
--
2.2.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf tools: Fix build error on ARCH=i386/x86_64/sparc64
2015-03-02 4:31 [PATCH] perf tools: Fix build error on ARCH=i386/x86_64/sparc64 Namhyung Kim
@ 2015-03-02 9:56 ` Jiri Olsa
2015-03-02 15:03 ` Arnaldo Carvalho de Melo
2015-03-03 6:22 ` [tip:perf/core] perf tools: Fix build error on ARCH=i386/x86_64/ sparc64 tip-bot for Namhyung Kim
1 sibling, 1 reply; 4+ messages in thread
From: Jiri Olsa @ 2015-03-02 9:56 UTC (permalink / raw)
To: Namhyung Kim
Cc: Arnaldo Carvalho de Melo, Ingo Molnar, Peter Zijlstra, LKML,
He Kuang, David Ahern
On Mon, Mar 02, 2015 at 01:31:03PM +0900, Namhyung Kim wrote:
> He Kuang reported that current perf tools failed to build when ARCH
> variable was given like above. It was because the name is different
> that internal directory name. I can see that David's sparc64 build
> has same problem. So fix it by applying the sed conversion script to
> the command line ARCH variable also, and fixing the converted name
> there (i.e. i386/x86_64 -> x86, sparc64 -> sparc).
>
> Reported-and-tested-by: He Kuang <hekuang@huawei.com>
> Cc: David Ahern <david.ahern@oracle.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
> ---
> tools/perf/config/Makefile.arch | 23 +++++------------------
> 1 file changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> index ff95a68741d1..e9720571341d 100644
> --- a/tools/perf/config/Makefile.arch
> +++ b/tools/perf/config/Makefile.arch
> @@ -1,28 +1,15 @@
> +ifndef ARCH
> +ARCH := $(shell uname -m 2>/dev/null || echo not)
> +endif
>
> -uname_M := $(shell uname -m 2>/dev/null || echo not)
> -
> -RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
> +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
> + -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
> -e s/arm.*/arm/ -e s/sa110/arm/ \
> -e s/s390x/s390/ -e s/parisc64/parisc/ \
> -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
> -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
> -e s/tile.*/tile/ )
>
> -# Additional ARCH settings for x86
> -ifeq ($(RAW_ARCH),i386)
> - ARCH ?= x86
> -endif
> -
> -ifeq ($(RAW_ARCH),x86_64)
> - ARCH ?= x86
> -
> - ifneq (, $(findstring m32,$(CFLAGS)))
> - RAW_ARCH := x86_32
> - endif
> -endif
> -
> -ARCH ?= $(RAW_ARCH)
> -
> LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
> ifeq ($(LP64), 1)
> IS_64_BIT := 1
> --
> 2.2.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf tools: Fix build error on ARCH=i386/x86_64/sparc64
2015-03-02 9:56 ` Jiri Olsa
@ 2015-03-02 15:03 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-03-02 15:03 UTC (permalink / raw)
To: Jiri Olsa
Cc: Namhyung Kim, Ingo Molnar, Peter Zijlstra, LKML, He Kuang,
David Ahern
Em Mon, Mar 02, 2015 at 10:56:00AM +0100, Jiri Olsa escreveu:
> On Mon, Mar 02, 2015 at 01:31:03PM +0900, Namhyung Kim wrote:
> > He Kuang reported that current perf tools failed to build when ARCH
> > variable was given like above. It was because the name is different
> > that internal directory name. I can see that David's sparc64 build
> > has same problem. So fix it by applying the sed conversion script to
> > the command line ARCH variable also, and fixing the converted name
> > there (i.e. i386/x86_64 -> x86, sparc64 -> sparc).
> >
> > Reported-and-tested-by: He Kuang <hekuang@huawei.com>
> > Cc: David Ahern <david.ahern@oracle.com>
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>
Applied after resolving conflict with David's sparc64->sparc patch, that
had already been applied and merged by Ingo.
- Arnaldo
> thanks,
> jirka
>
> > ---
> > tools/perf/config/Makefile.arch | 23 +++++------------------
> > 1 file changed, 5 insertions(+), 18 deletions(-)
> >
> > diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> > index ff95a68741d1..e9720571341d 100644
> > --- a/tools/perf/config/Makefile.arch
> > +++ b/tools/perf/config/Makefile.arch
> > @@ -1,28 +1,15 @@
> > +ifndef ARCH
> > +ARCH := $(shell uname -m 2>/dev/null || echo not)
> > +endif
> >
> > -uname_M := $(shell uname -m 2>/dev/null || echo not)
> > -
> > -RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
> > +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
> > + -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
> > -e s/arm.*/arm/ -e s/sa110/arm/ \
> > -e s/s390x/s390/ -e s/parisc64/parisc/ \
> > -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
> > -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
> > -e s/tile.*/tile/ )
> >
> > -# Additional ARCH settings for x86
> > -ifeq ($(RAW_ARCH),i386)
> > - ARCH ?= x86
> > -endif
> > -
> > -ifeq ($(RAW_ARCH),x86_64)
> > - ARCH ?= x86
> > -
> > - ifneq (, $(findstring m32,$(CFLAGS)))
> > - RAW_ARCH := x86_32
> > - endif
> > -endif
> > -
> > -ARCH ?= $(RAW_ARCH)
> > -
> > LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
> > ifeq ($(LP64), 1)
> > IS_64_BIT := 1
> > --
> > 2.2.2
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:perf/core] perf tools: Fix build error on ARCH=i386/x86_64/ sparc64
2015-03-02 4:31 [PATCH] perf tools: Fix build error on ARCH=i386/x86_64/sparc64 Namhyung Kim
2015-03-02 9:56 ` Jiri Olsa
@ 2015-03-03 6:22 ` tip-bot for Namhyung Kim
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Namhyung Kim @ 2015-03-03 6:22 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, hekuang, namhyung, linux-kernel, mingo, tglx, david.ahern,
a.p.zijlstra, acme
Commit-ID: b11db6581beaccef8ae9a388ae96074aa5cc144f
Gitweb: http://git.kernel.org/tip/b11db6581beaccef8ae9a388ae96074aa5cc144f
Author: Namhyung Kim <namhyung@kernel.org>
AuthorDate: Mon, 2 Mar 2015 13:31:03 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 2 Mar 2015 12:01:42 -0300
perf tools: Fix build error on ARCH=i386/x86_64/sparc64
He Kuang reported that current perf tools failed to build when ARCH
variable was given like above.
It was because the name is different that internal directory name. I
can see that David's sparc64 build has same problem.
So fix it by applying the sed conversion script to the command line ARCH
variable also, and fixing the converted name there (i.e. i386/x86_64 ->
x86, sparc64 -> sparc).
Reported-by: He Kuang <hekuang@huawei.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: He Kuang <hekuang@huawei.com>
Acked: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1425270663-10215-1-git-send-email-namhyung@kernel.org
[ Resolved conflict with 4861f87cd3d1 "Make sparc64 arch point to sparc" ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/config/Makefile.arch | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index ac8721f..e972057 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -1,32 +1,15 @@
+ifndef ARCH
+ARCH := $(shell uname -m 2>/dev/null || echo not)
+endif
-uname_M := $(shell uname -m 2>/dev/null || echo not)
-
-RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+ -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
-e s/tile.*/tile/ )
-# Additional ARCH settings for x86
-ifeq ($(RAW_ARCH),i386)
- ARCH ?= x86
-endif
-
-ifeq ($(RAW_ARCH),x86_64)
- ARCH ?= x86
-
- ifneq (, $(findstring m32,$(CFLAGS)))
- RAW_ARCH := x86_32
- endif
-endif
-
-ifeq ($(RAW_ARCH),sparc64)
- ARCH ?= sparc
-endif
-
-ARCH ?= $(RAW_ARCH)
-
LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
ifeq ($(LP64), 1)
IS_64_BIT := 1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-03 6:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-02 4:31 [PATCH] perf tools: Fix build error on ARCH=i386/x86_64/sparc64 Namhyung Kim
2015-03-02 9:56 ` Jiri Olsa
2015-03-02 15:03 ` Arnaldo Carvalho de Melo
2015-03-03 6:22 ` [tip:perf/core] perf tools: Fix build error on ARCH=i386/x86_64/ sparc64 tip-bot for Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox