[PATCH] perf: fix building error in x86_64

[PATCH] perf: fix building error in x86_64

[He Kuang]

When build with ARCH=x86_64, perf failed to compile with following error:

tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
collect2: error: ld returned 1 exit status
Makefile.perf:632: recipe for target 'perf' failed
...

Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
conflicts with tests/builtin-test.c's __x86_64__.
To x86/x86_64 platform, ARCH should always override to x86 while
IS_64_BIT stands for the actual architecture.

Signed-off-by: He Kuang <hekuang@huawei.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 ff95a68..8c6214d 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -14,7 +14,7 @@ ifeq ($(RAW_ARCH),i386)
 endif
 
 ifeq ($(RAW_ARCH),x86_64)
-  ARCH ?= x86
+  override ARCH := x86
 
   ifneq (, $(findstring m32,$(CFLAGS)))
     RAW_ARCH := x86_32
-- 
2.2.0.33.gc18b867

Re: [PATCH] perf: fix building error in x86_64

[Namhyung Kim]

Hi,

On Wed, Feb 11, 2015 at 10:01:08AM +0800, He Kuang wrote:
> When build with ARCH=x86_64, perf failed to compile with following error:
> 
> tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
> collect2: error: ld returned 1 exit status
> Makefile.perf:632: recipe for target 'perf' failed
> ...
> 
> Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
> in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
> conflicts with tests/builtin-test.c's __x86_64__.
> To x86/x86_64 platform, ARCH should always override to x86 while
> IS_64_BIT stands for the actual architecture.
> 
> Signed-off-by: He Kuang <hekuang@huawei.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 ff95a68..8c6214d 100644
> --- a/tools/perf/config/Makefile.arch
> +++ b/tools/perf/config/Makefile.arch
> @@ -14,7 +14,7 @@ ifeq ($(RAW_ARCH),i386)
>  endif
>  
>  ifeq ($(RAW_ARCH),x86_64)
> -  ARCH ?= x86
> +  override ARCH := x86

Hmm.. wouldn't it (again) break cross build then?

Thanks,
Namhyung


>  
>    ifneq (, $(findstring m32,$(CFLAGS)))
>      RAW_ARCH := x86_32
> -- 
> 2.2.0.33.gc18b867
> 
> --
> 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/

Re: [PATCH] perf: fix building error in x86_64

[Hekuang]

在 2015/2/12 16:07, Namhyung Kim 写道:
> Hi,
>
> On Wed, Feb 11, 2015 at 10:01:08AM +0800, He Kuang wrote:
>> When build with ARCH=x86_64, perf failed to compile with following error:
>>
>> tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
>> collect2: error: ld returned 1 exit status
>> Makefile.perf:632: recipe for target 'perf' failed
>> ...
>>
>> Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
>> in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
>> conflicts with tests/builtin-test.c's __x86_64__.
>> To x86/x86_64 platform, ARCH should always override to x86 while
>> IS_64_BIT stands for the actual architecture.
>>
>> Signed-off-by: He Kuang <hekuang@huawei.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 ff95a68..8c6214d 100644
>> --- a/tools/perf/config/Makefile.arch
>> +++ b/tools/perf/config/Makefile.arch
>> @@ -14,7 +14,7 @@ ifeq ($(RAW_ARCH),i386)
>>   endif
>>   
>>   ifeq ($(RAW_ARCH),x86_64)
>> -  ARCH ?= x86
>> +  override ARCH := x86
> Hmm.. wouldn't it (again) break cross build then?
>
> Thanks,
> Namhyung
>


I've tested both 'make ARCH=x86' and 'make ARCH=x86_64' cases after a
'make clean'.

The issue was first caused by IS_X86_64 flag wrongly cleared when
ARCH=x86, which is already fixed by separating IS_64_BIT and ARCH in
commit c6e5e9fbc3ea1 ("perf tools: Fix building error in x86_64 when
dwarf unwind is on").

The only problem here is we should let ARCH override to x86, to keep
compatible with 'ifeq ($(ARCH),x86)'.
>>   
>>     ifneq (, $(findstring m32,$(CFLAGS)))
>>       RAW_ARCH := x86_32
>> -- 
>> 2.2.0.33.gc18b867
>>
>> --
>> 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/
> .
>

Re: [PATCH] perf: fix building error in x86_64

[Namhyung Kim]

On Thu, Feb 12, 2015 at 04:56:44PM +0800, Hekuang wrote:
> 
> 在 2015/2/12 16:07, Namhyung Kim 写道:
> >Hi,
> >
> >On Wed, Feb 11, 2015 at 10:01:08AM +0800, He Kuang wrote:
> >>When build with ARCH=x86_64, perf failed to compile with following error:
> >>
> >>tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
> >>collect2: error: ld returned 1 exit status
> >>Makefile.perf:632: recipe for target 'perf' failed
> >>...
> >>
> >>Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
> >>in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
> >>conflicts with tests/builtin-test.c's __x86_64__.
> >>To x86/x86_64 platform, ARCH should always override to x86 while
> >>IS_64_BIT stands for the actual architecture.
> >>
> >>Signed-off-by: He Kuang <hekuang@huawei.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 ff95a68..8c6214d 100644
> >>--- a/tools/perf/config/Makefile.arch
> >>+++ b/tools/perf/config/Makefile.arch
> >>@@ -14,7 +14,7 @@ ifeq ($(RAW_ARCH),i386)
> >>  endif
> >>  ifeq ($(RAW_ARCH),x86_64)
> >>-  ARCH ?= x86
> >>+  override ARCH := x86
> >Hmm.. wouldn't it (again) break cross build then?
> >
> >Thanks,
> >Namhyung
> >
> 
> 
> I've tested both 'make ARCH=x86' and 'make ARCH=x86_64' cases after a
> 'make clean'.
> 
> The issue was first caused by IS_X86_64 flag wrongly cleared when
> ARCH=x86, which is already fixed by separating IS_64_BIT and ARCH in
> commit c6e5e9fbc3ea1 ("perf tools: Fix building error in x86_64 when
> dwarf unwind is on").
> 
> The only problem here is we should let ARCH override to x86, to keep
> compatible with 'ifeq ($(ARCH),x86)'.
> >>    ifneq (, $(findstring m32,$(CFLAGS)))
> >>      RAW_ARCH := x86_32

Have you tried a cross build like 'make ARCH=arm' also?

Thanks,
Namhyung

[PATCH v2] perf: fix building error in x86_64

[He Kuang]

When build with ARCH=x86_64, perf failed to compile with following error:

tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
collect2: error: ld returned 1 exit status
Makefile.perf:632: recipe for target 'perf' failed
...

Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
conflicts with tests/builtin-test.c's __x86_64__.
To x86/x86_64 platform, ARCH should always override to x86 while
IS_64_BIT stands for the actual architecture.

Signed-off-by: He Kuang <hekuang@huawei.com>
---
 tools/perf/config/Makefile.arch | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index ff95a68..836ba44 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -29,3 +29,7 @@ ifeq ($(LP64), 1)
 else
   IS_64_BIT := 0
 endif
+
+ifeq ($(ARCH), x86_64)
+  override ARCH := x86
+endif
-- 
2.2.0.33.gc18b867

Re: [PATCH v2] perf: fix building error in x86_64

[Aaro Koskinen]

Hi,

On Fri, Feb 13, 2015 at 03:11:14PM +0800, He Kuang wrote:
> When build with ARCH=x86_64, perf failed to compile with following error:
> 
> tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'

[...]

> +ifeq ($(ARCH), x86_64)
> +  override ARCH := x86
> +endif

The same error happens also with ARCH=i386. So I think both cases
should be fixed.

A.

[PATCH] perf: fix building error

[He Kuang]

When build with ARCH=x86_64/i386, perf failed to compile with following
error:

tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
collect2: error: ld returned 1 exit status
Makefile.perf:632: recipe for target 'perf' failed
...

Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
conflicts with tests/builtin-test.c's __x86_64__.
To x86/x86_64 platform, ARCH should always override to x86 while
IS_64_BIT stands for the actual architecture.

Signed-off-by: He Kuang <hekuang@huawei.com>
---
 tools/perf/config/Makefile.arch | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index ff95a68..05af152 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -29,3 +29,11 @@ ifeq ($(LP64), 1)
 else
   IS_64_BIT := 0
 endif
+
+ifeq ($(ARCH), x86_64)
+  override ARCH := x86
+endif
+
+ifeq ($(ARCH), i386)
+  override ARCH := x86
+endif
-- 
2.2.0.33.gc18b867

Re: [PATCH] perf: fix building error

[Namhyung Kim]

Hi He,

On Fri, Feb 27, 2015 at 06:05:37PM +0800, He Kuang wrote:
> When build with ARCH=x86_64/i386, perf failed to compile with following
> error:
> 
> tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
> collect2: error: ld returned 1 exit status
> Makefile.perf:632: recipe for target 'perf' failed
> ...
> 
> Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
> in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
> conflicts with tests/builtin-test.c's __x86_64__.
> To x86/x86_64 platform, ARCH should always override to x86 while
> IS_64_BIT stands for the actual architecture.
> 
> Signed-off-by: He Kuang <hekuang@huawei.com>
> ---
>  tools/perf/config/Makefile.arch | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> index ff95a68..05af152 100644
> --- a/tools/perf/config/Makefile.arch
> +++ b/tools/perf/config/Makefile.arch
> @@ -29,3 +29,11 @@ ifeq ($(LP64), 1)
>  else
>    IS_64_BIT := 0
>  endif
> +
> +ifeq ($(ARCH), x86_64)
> +  override ARCH := x86
> +endif
> +
> +ifeq ($(ARCH), i386)
> +  override ARCH := x86
> +endif

It seems like we need a same sed script to be applied to ARCH then.
How about this?


diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index ff95a68741d1..e29de6e3597d 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/sparc64/ \
                                   -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.3.1

Re: [PATCH] perf: fix building error

[He Kuang]

Well, I've tested and it worked.

On 2015/2/28 10:49, Namhyung Kim wrote:
> Hi He,
>
> On Fri, Feb 27, 2015 at 06:05:37PM +0800, He Kuang wrote:
>> When build with ARCH=x86_64/i386, perf failed to compile with following
>> error:
>>
>> tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc'
>> collect2: error: ld returned 1 exit status
>> Makefile.perf:632: recipe for target 'perf' failed
>> ...
>>
>> Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error
>> in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf
>> conflicts with tests/builtin-test.c's __x86_64__.
>> To x86/x86_64 platform, ARCH should always override to x86 while
>> IS_64_BIT stands for the actual architecture.
>>
>> Signed-off-by: He Kuang <hekuang@huawei.com>
>> ---
>>   tools/perf/config/Makefile.arch | 8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
>> index ff95a68..05af152 100644
>> --- a/tools/perf/config/Makefile.arch
>> +++ b/tools/perf/config/Makefile.arch
>> @@ -29,3 +29,11 @@ ifeq ($(LP64), 1)
>>   else
>>     IS_64_BIT := 0
>>   endif
>> +
>> +ifeq ($(ARCH), x86_64)
>> +  override ARCH := x86
>> +endif
>> +
>> +ifeq ($(ARCH), i386)
>> +  override ARCH := x86
>> +endif
> It seems like we need a same sed script to be applied to ARCH then.
> How about this?
>
>
> diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
> index ff95a68741d1..e29de6e3597d 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/sparc64/ \
>                                     -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