From patchwork Wed Jul 9 20:49:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 33350 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B07BC203F4 for ; Wed, 9 Jul 2014 20:53:08 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id o8sf26924385qcw.11 for ; Wed, 09 Jul 2014 13:53:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:user-agent :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=uDptueFcdg2fpMKrT6blqzpfBLnZDBqc5DjUF7Lp5bA=; b=cYeULrPTJkvbZmEM8mkVCkTO/FmcM5OKSGPEYKfUzj+ACnRutUpbvEy8bbLUY9pzHV SEFWjGIeV0+Q7OvUqzP76p6jcEjDsfLpODTtPJfu+RJdtbBoJgS35qqbwDol3mIXqABg 7jI5F37jS03uWYBKDcvz1KwLDjaJQdJNq/OMV2mmf+zeapH36vhtT7at4Q2SOeHw31RA s60EOWhbvqTZ013IYY9C2VQHTlujOZiYgwdwkY+rVRbsTyzlu2O1HUbKYN8dgaD+vkQz A940iWZTA9lHPGYyfL7ULqLTnOPydZVa6t8mrLz4C2tc/r/TvXld3qfjmCGOgqM6TWTL Yr0A== X-Gm-Message-State: ALoCoQmw2r72uu6sYKJmuDN74GOgD0DksFnA91BQb904PJ6JxUj+CZfcOV00SL4druDKmXhlB8J9 X-Received: by 10.236.66.178 with SMTP id h38mr10381546yhd.44.1404939188481; Wed, 09 Jul 2014 13:53:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.198 with SMTP id 64ls2622387qgn.8.gmail; Wed, 09 Jul 2014 13:53:08 -0700 (PDT) X-Received: by 10.58.49.98 with SMTP id t2mr26439562ven.29.1404939188376; Wed, 09 Jul 2014 13:53:08 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id pv20si22041033vdb.48.2014.07.09.13.53.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 13:53:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hy4so8376872vcb.6 for ; Wed, 09 Jul 2014 13:53:08 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr2531749vca.45.1404939188243; Wed, 09 Jul 2014 13:53:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp77374vcb; Wed, 9 Jul 2014 13:53:07 -0700 (PDT) X-Received: by 10.229.103.130 with SMTP id k2mr71133153qco.1.1404939187832; Wed, 09 Jul 2014 13:53:07 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id o9si61325828qcf.12.2014.07.09.13.53.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 13:53:07 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X4ypE-0006j8-PL; Wed, 09 Jul 2014 20:50:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X4ypB-0006j3-VB for xen-devel@lists.xensource.com; Wed, 09 Jul 2014 20:50:47 +0000 Received: from [85.158.139.211:39951] by server-13.bemta-5.messagelabs.com id 65/87-02995-52BADB35; Wed, 09 Jul 2014 20:50:45 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1404939043!14657760!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5961 invoked from network); 9 Jul 2014 20:50:44 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Jul 2014 20:50:44 -0000 X-IronPort-AV: E=Sophos;i="5.01,633,1400025600"; d="scan'208";a="151117532" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 09 Jul 2014 20:50:42 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 9 Jul 2014 16:50:42 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1X4yp8-0001G8-7j; Wed, 09 Jul 2014 21:50:42 +0100 Date: Wed, 9 Jul 2014 21:49:57 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA2 Cc: Peter Maydell , xen-devel@lists.xensource.com, Stefano Stabellini Subject: [Xen-devel] [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The following commit: commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f Author: Stefano Stabellini Date: Mon Jul 7 16:25:07 2014 +0100 disas/libvixl: prepend the include path of libvixl header files moves -Idisas/libvixl at the beginning of QEMU_CFLAGS. QEMU 2.0 needs one more fix to disas/Makefile.objs. QEMU 2.1 uses $($*.o-cflags) to accomplish the same thing, see: http://marc.info/?l=xen-devel&m=140493820011322 I had to fix QEMU 2.0 too because qemu-xen is based on QEMU 2.0. Signed-off-by: Stefano Stabellini diff --git a/disas/Makefile.objs b/disas/Makefile.objs index 41c2374..a70c592 100644 --- a/disas/Makefile.objs +++ b/disas/Makefile.objs @@ -4,7 +4,7 @@ common-obj-$(CONFIG_ARM_DIS) += arm.o common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/ libvixldir = $(SRC_PATH)/disas/libvixl -$(obj)/arm-a64.o: QEMU_CFLAGS += -I$(libvixldir) +$(obj)/arm-a64.o: QEMU_CFLAGS := -I$(libvixldir) $(QEMU_CFLAGS) common-obj-$(CONFIG_CRIS_DIS) += cris.o common-obj-$(CONFIG_HPPA_DIS) += hppa.o common-obj-$(CONFIG_I386_DIS) += i386.o