Skip to contentSkip to conversation

perf: fix building error in x86_64

PATCH Superseded He Kuang 3 participants 9 messages Feb 11, 2015 – Feb 28, 2015 perf events

lore
Share & tools
lore

He Kuang

author
#0 lore raw

PATCH 1/1 perf: fix building error in x86_64

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.

---
 tools/perf/config/Makefile.arch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/config/Makefile.arch +1 -1
index ff95a68..8c6214d 100644
@@ -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
Signature · 1 line
2.2.0.33.gc18b867
maintainer
#1 lore raw

Hi,

Quoted 23 lines · 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.

---
 tools/perf/config/Makefile.arch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/config/Makefile.arch +0 -0
index ff95a68..8c6214d 100644

tools/perf/config/Makefile.arch ifeq ($(RAW_ARCH),i386) · line 17

Quoted 5 lines
tools/perf/config/Makefile.arch +1 -1
@@ -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

Quoted 11 lines
tools/perf/config/Makefile.arch +0 -0
   ifneq (, $(findstring m32,$(CFLAGS)))
     RAW_ARCH := x86_32
Signature · 7 lines
2.2.0.33.gc18b867

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
author
#2 lore raw
Quoted 28 lines · Namhyung Kim

Hi,

Quoted 25 lines · 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.

---
  tools/perf/config/Makefile.arch | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/config/Makefile.arch +0 -0
index ff95a68..8c6214d 100644
@@ -14,7 +14,7 @@ ifeq ($(RAW_ARCH),i386)
  endif
 
Quoted 8 lines

tools/perf/config/Makefile.arch ifeq ($(RAW_ARCH),i386) · line 17

Quoted 3 lines
tools/perf/config/Makefile.arch +1 -1
  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)'.

Quoted 13 lines
Quoted 11 lines
tools/perf/config/Makefile.arch +0 -0
    ifneq (, $(findstring m32,$(CFLAGS)))
      RAW_ARCH := x86_32
Signature · 7 lines
2.2.0.33.gc18b867

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

.

maintainer
#3 lore raw
Quoted 42 lines · Hekuang
Quoted 32 lines · Namhyung Kim

Hi,

Quoted 23 lines · 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.

---
 tools/perf/config/Makefile.arch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/config/Makefile.arch +0 -0
index ff95a68..8c6214d 100644

tools/perf/config/Makefile.arch ifeq ($(RAW_ARCH),i386) · line 16

Quoted 4 lines
tools/perf/config/Makefile.arch +1 -1
@@ -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?

Quoted 3 lines

Thanks,
Namhyung

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

Quoted 9 lines

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)'.

Quoted 2 lines
Quoted 2 lines
tools/perf/config/Makefile.arch +0 -0
   ifneq (, $(findstring m32,$(CFLAGS)))
     RAW_ARCH := x86_32

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

Thanks,
Namhyung

author
#4 lore raw

PATCH v2 1/1 perf: fix building error in x86_64

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.

---
 tools/perf/config/Makefile.arch | 4 ++++
 1 file changed, 4 insertions(+)
tools/perf/config/Makefile.arch +4 -0
index ff95a68..836ba44 100644
@@ -29,3 +29,7 @@ ifeq ($(LP64), 1)
 else
   IS_64_BIT := 0
 endif
+
+ifeq ($(ARCH), x86_64)
+  override ARCH := x86
+endif
Signature · 1 line
2.2.0.33.gc18b867
#5 lore raw

Hi,

Quoted 3 lines · 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'

[...]

tools/perf/config/Makefile.arch ifeq ($(LP64), 1) · line 35

Quoted 3 lines
tools/perf/config/Makefile.arch +3 -0
+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.

author
#6 lore raw

PATCH 1/1 perf: fix building error

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.

---
 tools/perf/config/Makefile.arch | 8 ++++++++
 1 file changed, 8 insertions(+)
tools/perf/config/Makefile.arch +8 -0
index ff95a68..05af152 100644
@@ -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
Signature · 1 line
2.2.0.33.gc18b867
maintainer
#7 lore raw

Re: [PATCH] perf: fix building error

Hi He,

Quoted 25 lines · 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.

---
 tools/perf/config/Makefile.arch | 8 ++++++++
 1 file changed, 8 insertions(+)
tools/perf/config/Makefile.arch +0 -0
index ff95a68..05af152 100644
@@ -29,3 +29,11 @@ ifeq ($(LP64), 1)
 else

tools/perf/config/Makefile.arch ifeq ($(LP64), 1) · line 39

Quoted 10 lines
tools/perf/config/Makefile.arch +8 -0
   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?

tools/perf/config/Makefile.arch +5 -18
index ff95a68741d1..e29de6e3597d 100644
@@ -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
Signature · 1 line
2.3.1
author
#8 lore raw

Re: [PATCH] perf: fix building error

Well, I've tested and it worked.

Quoted 80 lines · Namhyung Kim

Hi He,

Quoted 25 lines · 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.

---
  tools/perf/config/Makefile.arch | 8 ++++++++
  1 file changed, 8 insertions(+)
tools/perf/config/Makefile.arch +0 -0
index ff95a68..05af152 100644
@@ -29,3 +29,11 @@ ifeq ($(LP64), 1)
  else

tools/perf/config/Makefile.arch ifeq ($(LP64), 1) · line 39

Quoted 10 lines
tools/perf/config/Makefile.arch +8 -0
    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?

tools/perf/config/Makefile.arch +5 -18
index ff95a68741d1..e29de6e3597d 100644
@@ -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