Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751541AbbBKCFN (ORCPT ); Tue, 10 Feb 2015 21:05:13 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:50024 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751380AbbBKCFL (ORCPT ); Tue, 10 Feb 2015 21:05:11 -0500 From: He Kuang To: , CC: , , Subject: [PATCH] perf: fix building error in x86_64 Date: Wed, 11 Feb 2015 10:01:08 +0800 Message-ID: <1423620068-10137-1-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 2.2.0.33.gc18b867 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.189] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.54DAB8D5.00EE,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8e59426ce551ddc6ec7cb5d30d019818 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1328 Lines: 39 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 | 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 -- 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/