* [PATCH v2 -tip] perf tools: fix building error for arm64.
@ 2015-03-17 11:33 Wang Nan
2015-03-17 13:12 ` Jiri Olsa
0 siblings, 1 reply; 8+ messages in thread
From: Wang Nan @ 2015-03-17 11:33 UTC (permalink / raw)
To: namhyung, jolsa, acme; +Cc: lizefan, linux-kernel
Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
bug in sequence of sed expression, where 's/arm.*/arm/' will replace
'arm64' to 'arm', causes arm64 building failure.
This patch replaces 'arm64' to 'aarch64' before 's/arm.*/arm/' to
protect arm64 and replaces 'aarch64' back to 'arm64' after fixing
'arm.*'.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
v1 -> v2: Replace tabs with spaces to make new line similay to other lines.
---
tools/perf/config/Makefile.arch | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index e972057..a5b6020 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -2,8 +2,11 @@ ifndef ARCH
ARCH := $(shell uname -m 2>/dev/null || echo not)
endif
+# Set arm64 to aarch64 before replacing arm.* to arm to protect ARCH = arm64.
+# aarch64 will be replaced by arm64 again.
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/arm64/aarch64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
--
1.8.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 -tip] perf tools: fix building error for arm64.
2015-03-17 11:33 [PATCH v2 -tip] perf tools: fix building error for arm64 Wang Nan
@ 2015-03-17 13:12 ` Jiri Olsa
2015-03-17 13:29 ` [PATCH v3 " Wang Nan
2015-03-17 13:30 ` [PATCH v2 -tip] perf tools: fix " Wang Nan
0 siblings, 2 replies; 8+ messages in thread
From: Jiri Olsa @ 2015-03-17 13:12 UTC (permalink / raw)
To: Wang Nan; +Cc: namhyung, jolsa, acme, lizefan, linux-kernel
On Tue, Mar 17, 2015 at 11:33:10AM +0000, Wang Nan wrote:
> Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
> error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
> bug in sequence of sed expression, where 's/arm.*/arm/' will replace
> 'arm64' to 'arm', causes arm64 building failure.
>
> This patch replaces 'arm64' to 'aarch64' before 's/arm.*/arm/' to
> protect arm64 and replaces 'aarch64' back to 'arm64' after fixing
> 'arm.*'.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> ---
> v1 -> v2: Replace tabs with spaces to make new line similay to other lines.
> ---
> tools/perf/config/Makefile.arch | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> index e972057..a5b6020 100644
> --- a/tools/perf/config/Makefile.arch
> +++ b/tools/perf/config/Makefile.arch
> @@ -2,8 +2,11 @@ ifndef ARCH
> ARCH := $(shell uname -m 2>/dev/null || echo not)
> endif
>
> +# Set arm64 to aarch64 before replacing arm.* to arm to protect ARCH = arm64.
> +# aarch64 will be replaced by arm64 again.
> 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/arm64/aarch64/ \
> -e s/arm.*/arm/ -e s/sa110/arm/ \
> -e s/s390x/s390/ -e s/parisc64/parisc/ \
> -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
hum, could we rather make the 'arm.*' expression complete?
like this one seems to work:
[jolsa@krava perf]$ echo armkrava | sed -e '/arm64/!s/arm.*/arm/'
arm
[jolsa@krava perf]$ echo arm64 | sed -e '/arm64/!s/arm.*/arm/'
arm64
jirka
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 -tip] perf tools: fix building error for arm64.
2015-03-17 13:12 ` Jiri Olsa
@ 2015-03-17 13:29 ` Wang Nan
2015-03-18 7:19 ` Namhyung Kim
2015-03-22 10:05 ` [tip:perf/core] perf tools: Fix " tip-bot for Wang Nan
2015-03-17 13:30 ` [PATCH v2 -tip] perf tools: fix " Wang Nan
1 sibling, 2 replies; 8+ messages in thread
From: Wang Nan @ 2015-03-17 13:29 UTC (permalink / raw)
To: namhyung, jolsa, acme; +Cc: lizefan, linux-kernel
Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
bug in sequence of sed expression, where 's/arm.*/arm/' will replace
'arm64' to 'arm', causes arm64 building failure.
This patch prevent 'arm64' to be mached for 'arm.*' case.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
v2 -> v3:
Make the 'arm.*' expression complete according to Jiri Olsa's suggestion.
---
tools/perf/config/Makefile.arch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index e972057..e11fbd6 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -4,7 +4,7 @@ endif
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 /arm64/!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/ \
--
1.8.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 -tip] perf tools: fix building error for arm64.
2015-03-17 13:12 ` Jiri Olsa
2015-03-17 13:29 ` [PATCH v3 " Wang Nan
@ 2015-03-17 13:30 ` Wang Nan
1 sibling, 0 replies; 8+ messages in thread
From: Wang Nan @ 2015-03-17 13:30 UTC (permalink / raw)
To: Jiri Olsa; +Cc: namhyung, jolsa, acme, lizefan, linux-kernel
On 2015/3/17 21:12, Jiri Olsa wrote:
> On Tue, Mar 17, 2015 at 11:33:10AM +0000, Wang Nan wrote:
>> Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
>> error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
>> bug in sequence of sed expression, where 's/arm.*/arm/' will replace
>> 'arm64' to 'arm', causes arm64 building failure.
>>
>> This patch replaces 'arm64' to 'aarch64' before 's/arm.*/arm/' to
>> protect arm64 and replaces 'aarch64' back to 'arm64' after fixing
>> 'arm.*'.
>>
>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>> ---
>> v1 -> v2: Replace tabs with spaces to make new line similay to other lines.
>> ---
>> tools/perf/config/Makefile.arch | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
>> index e972057..a5b6020 100644
>> --- a/tools/perf/config/Makefile.arch
>> +++ b/tools/perf/config/Makefile.arch
>> @@ -2,8 +2,11 @@ ifndef ARCH
>> ARCH := $(shell uname -m 2>/dev/null || echo not)
>> endif
>>
>> +# Set arm64 to aarch64 before replacing arm.* to arm to protect ARCH = arm64.
>> +# aarch64 will be replaced by arm64 again.
>> 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/arm64/aarch64/ \
>> -e s/arm.*/arm/ -e s/sa110/arm/ \
>> -e s/s390x/s390/ -e s/parisc64/parisc/ \
>> -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
>
> hum, could we rather make the 'arm.*' expression complete?
> like this one seems to work:
>
Sure. It does work. Posted a v3 patch.
> [jolsa@krava perf]$ echo armkrava | sed -e '/arm64/!s/arm.*/arm/'
> arm
> [jolsa@krava perf]$ echo arm64 | sed -e '/arm64/!s/arm.*/arm/'
> arm64
>
>
> jirka
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 -tip] perf tools: fix building error for arm64.
2015-03-17 13:29 ` [PATCH v3 " Wang Nan
@ 2015-03-18 7:19 ` Namhyung Kim
2015-03-19 6:23 ` Wang Nan
2015-03-22 10:05 ` [tip:perf/core] perf tools: Fix " tip-bot for Wang Nan
1 sibling, 1 reply; 8+ messages in thread
From: Namhyung Kim @ 2015-03-18 7:19 UTC (permalink / raw)
To: Wang Nan; +Cc: jolsa, acme, lizefan, linux-kernel
On Tue, Mar 17, 2015 at 01:29:47PM +0000, Wang Nan wrote:
> Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
> error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
> bug in sequence of sed expression, where 's/arm.*/arm/' will replace
> 'arm64' to 'arm', causes arm64 building failure.
>
> This patch prevent 'arm64' to be mached for 'arm.*' case.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Thanks,
Namhyung
> ---
> v2 -> v3:
> Make the 'arm.*' expression complete according to Jiri Olsa's suggestion.
> ---
> tools/perf/config/Makefile.arch | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> index e972057..e11fbd6 100644
> --- a/tools/perf/config/Makefile.arch
> +++ b/tools/perf/config/Makefile.arch
> @@ -4,7 +4,7 @@ endif
>
> 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 /arm64/!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/ \
> --
> 1.8.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 -tip] perf tools: fix building error for arm64.
2015-03-18 7:19 ` Namhyung Kim
@ 2015-03-19 6:23 ` Wang Nan
2015-03-19 14:02 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 8+ messages in thread
From: Wang Nan @ 2015-03-19 6:23 UTC (permalink / raw)
To: Ingo Molnar, Ingo Molnar; +Cc: Namhyung Kim, jolsa, acme, lizefan, linux-kernel
Hi Ingo,
Could you please pick this patch for -tip tree? It fixes a bug which makes
arm64 -tip building failure.
Thank you.
On 2015/3/18 15:19, Namhyung Kim wrote:
> On Tue, Mar 17, 2015 at 01:29:47PM +0000, Wang Nan wrote:
>> Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
>> error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
>> bug in sequence of sed expression, where 's/arm.*/arm/' will replace
>> 'arm64' to 'arm', causes arm64 building failure.
>>
>> This patch prevent 'arm64' to be mached for 'arm.*' case.
>>
>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
>
> Thanks,
> Namhyung
>
>
>> ---
>> v2 -> v3:
>> Make the 'arm.*' expression complete according to Jiri Olsa's suggestion.
>> ---
>> tools/perf/config/Makefile.arch | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
>> index e972057..e11fbd6 100644
>> --- a/tools/perf/config/Makefile.arch
>> +++ b/tools/perf/config/Makefile.arch
>> @@ -4,7 +4,7 @@ endif
>>
>> 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 /arm64/!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/ \
>> --
>> 1.8.3.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 -tip] perf tools: fix building error for arm64.
2015-03-19 6:23 ` Wang Nan
@ 2015-03-19 14:02 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 8+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-03-19 14:02 UTC (permalink / raw)
To: Wang Nan
Cc: Ingo Molnar, Ingo Molnar, Namhyung Kim, jolsa, lizefan, linux-kernel
Em Thu, Mar 19, 2015 at 02:23:16PM +0800, Wang Nan escreveu:
> Hi Ingo,
>
> Could you please pick this patch for -tip tree? It fixes a bug which makes
> arm64 -tip building failure.
It is already in my tree, will go to tip soon.
- Arnaldo
> Thank you.
>
> On 2015/3/18 15:19, Namhyung Kim wrote:
> > On Tue, Mar 17, 2015 at 01:29:47PM +0000, Wang Nan wrote:
> >> Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
> >> error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
> >> bug in sequence of sed expression, where 's/arm.*/arm/' will replace
> >> 'arm64' to 'arm', causes arm64 building failure.
> >>
> >> This patch prevent 'arm64' to be mached for 'arm.*' case.
> >>
> >> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> >
> > Acked-by: Namhyung Kim <namhyung@kernel.org>
> >
> > Thanks,
> > Namhyung
> >
> >
> >> ---
> >> v2 -> v3:
> >> Make the 'arm.*' expression complete according to Jiri Olsa's suggestion.
> >> ---
> >> tools/perf/config/Makefile.arch | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> >> index e972057..e11fbd6 100644
> >> --- a/tools/perf/config/Makefile.arch
> >> +++ b/tools/perf/config/Makefile.arch
> >> @@ -4,7 +4,7 @@ endif
> >>
> >> 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 /arm64/!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/ \
> >> --
> >> 1.8.3.4
> >>
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [tip:perf/core] perf tools: Fix building error for arm64.
2015-03-17 13:29 ` [PATCH v3 " Wang Nan
2015-03-18 7:19 ` Namhyung Kim
@ 2015-03-22 10:05 ` tip-bot for Wang Nan
1 sibling, 0 replies; 8+ messages in thread
From: tip-bot for Wang Nan @ 2015-03-22 10:05 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, namhyung, tglx, lizefan, jolsa, hpa, linux-kernel, wangnan0, mingo
Commit-ID: 235504dec113089856b39c65afb77a2f444aa2a9
Gitweb: http://git.kernel.org/tip/235504dec113089856b39c65afb77a2f444aa2a9
Author: Wang Nan <wangnan0@huawei.com>
AuthorDate: Tue, 17 Mar 2015 13:29:47 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 18 Mar 2015 09:58:56 -0300
perf tools: Fix building error for arm64.
Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a
bug in sequence of sed expression, where 's/arm.*/arm/' will replace
'arm64' to 'arm', causes arm64 building failure.
This patch prevent 'arm64' to be mached for 'arm.*' case.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Link: http://lkml.kernel.org/r/1426598987-75245-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/config/Makefile.arch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index e972057..e11fbd6 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -4,7 +4,7 @@ endif
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 /arm64/!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/ \
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-03-22 10:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-17 11:33 [PATCH v2 -tip] perf tools: fix building error for arm64 Wang Nan
2015-03-17 13:12 ` Jiri Olsa
2015-03-17 13:29 ` [PATCH v3 " Wang Nan
2015-03-18 7:19 ` Namhyung Kim
2015-03-19 6:23 ` Wang Nan
2015-03-19 14:02 ` Arnaldo Carvalho de Melo
2015-03-22 10:05 ` [tip:perf/core] perf tools: Fix " tip-bot for Wang Nan
2015-03-17 13:30 ` [PATCH v2 -tip] perf tools: fix " Wang Nan
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.