Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbbBMHOf (ORCPT ); Fri, 13 Feb 2015 02:14:35 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:26686 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751540AbbBMHOe (ORCPT ); Fri, 13 Feb 2015 02:14:34 -0500 From: He Kuang To: CC: , , Subject: [PATCH v2] perf: fix building error in x86_64 Date: Fri, 13 Feb 2015 15:11:14 +0800 Message-ID: <1423811474-13266-1-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 2.2.0.33.gc18b867 In-Reply-To: <20150213053106.GH30788@sejong> References: <20150213053106.GH30788@sejong> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.189] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1256 Lines: 38 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 --- 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 -- 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/