From patchwork Thu May 19 06:36:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 796322 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4J6bIQB021764 for ; Thu, 19 May 2011 06:37:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932452Ab1ESGhO (ORCPT ); Thu, 19 May 2011 02:37:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56172 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932304Ab1ESGhN (ORCPT ); Thu, 19 May 2011 02:37:13 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4J6ahCM011940 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 May 2011 02:36:44 -0400 Received: from cr0.nay.redhat.com ([10.66.13.38]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4J6aeva031243; Thu, 19 May 2011 02:36:41 -0400 From: Amerigo Wang To: kvm@vger.kernel.org Cc: penberg@kernel.org, mingo@elte.hu, WANG Cong Subject: [Patch] kvm tools: build rbtree.o from source Date: Thu, 19 May 2011 14:36:28 +0800 Message-Id: <1305786988-16120-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 19 May 2011 06:37:18 +0000 (UTC) Don't link the rbtree.o from kernel object tree, build rbtree.o from source by ourselves. Reported-by: Ingo Molnar Signed-off-by: WANG Cong Acked-by: Ingo Molnar --- -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 30f0f61..8cfa9a2 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -45,9 +45,10 @@ OBJS += disk/blk.o OBJS += mptable.o OBJS += threadpool.o OBJS += irq.o -OBJS += ../../lib/rbtree.o +OBJS += rbtree.o OBJS += util/rbtree-interval.o + FLAGS_BFD=$(CFLAGS) -lbfd has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD)) ifeq ($(has_bfd),y) @@ -123,6 +124,8 @@ kvm-help.d: $(KVM_INCLUDE)/common-cmds.h $(OBJS): +rbtree.o: ../../lib/rbtree.c + $(Q) $(CC) -c $(CFLAGS) $< -o $@ %.o: %.c $(E) " CC " $@ $(Q) $(CC) -c $(CFLAGS) $< -o $@