From patchwork Tue Jul 8 12:13:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 33368 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C908B208CF for ; Thu, 10 Jul 2014 03:21:09 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id uz6sf45607856obc.8 for ; Wed, 09 Jul 2014 20:21:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=AHHc/0OZqOPQXMe7sfRjDKqHmSDg7ObhwyD6/VOMr4M=; b=Zx8kFm1Fj5TUrr73/OqFbprC7MOY7nkPul2MqliQetJ+f8u3M+riBbhtlhZ1H0F9pc t3CYIsnLicoKybKxp1aIeeDox12MCO5hYQ6NIxA6D06hy7vLkwC95hrXMxPLukzK4+6O 87o4/OcAFJUaZcibxHZOTF5pqwiI80gNXR2+4F7BlJsjP7Q6pA7kUTItAff+OSgfFfgj Gh7kGRFsZQhWf6gXVn4vD3xerMtR5ZPuO6gk1MFmXovzvhJQzoEROHQTN03YVWiNiQNp yyJpxpqW9ZOHN1OV26GpmRqcUjqwc38x0PgRLaC1LplUa2/TueY1Eu33fvhX5tROOISE 2dJA== X-Gm-Message-State: ALoCoQlRAbARWKqZsqMdy/1bd6FxXt6ia2oz/eAnI/nmr1d5He1R6gJdIrKnf9wv1UQRR9BC1KwE X-Received: by 10.42.27.18 with SMTP id h18mr21795283icc.25.1404962469006; Wed, 09 Jul 2014 20:21:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.16 with SMTP id 16ls2603478qgg.57.gmail; Wed, 09 Jul 2014 20:21:08 -0700 (PDT) X-Received: by 10.220.174.137 with SMTP id t9mr1015101vcz.12.1404962468922; Wed, 09 Jul 2014 20:21:08 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id xs1si22432146vec.64.2014.07.09.20.21.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 20:21:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id ij19so9210520vcb.22 for ; Wed, 09 Jul 2014 20:21:08 -0700 (PDT) X-Received: by 10.220.161.8 with SMTP id p8mr42285856vcx.4.1404962468818; Wed, 09 Jul 2014 20:21: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 tc5csp98148vcb; Wed, 9 Jul 2014 20:21:08 -0700 (PDT) X-Received: by 10.140.101.86 with SMTP id t80mr73557228qge.108.1404962468346; Wed, 09 Jul 2014 20:21:08 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m9si30111492qge.84.2014.07.09.20.21.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 20:21:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X54ux-0001fE-NN for patch@linaro.org; Wed, 09 Jul 2014 23:21:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4UHC-000360-9F for qemu-devel@nongnu.org; Tue, 08 Jul 2014 08:13:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4UHA-00087b-K9 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 08:13:37 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4UHA-00086v-Dz for qemu-devel@nongnu.org; Tue, 08 Jul 2014 08:13:36 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1X4UH2-0003Gc-W6 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:13:28 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 8 Jul 2014 13:13:26 +0100 Message-Id: <1404821608-12529-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404821608-12529-1-git-send-email-peter.maydell@linaro.org> References: <1404821608-12529-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 1/3] disas/libvixl: prepend the include path of libvixl header files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org 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.177 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 From: Stefano Stabellini Currently the Makefile of disas/libvixl appends -I$(SRC_PATH)/disas/libvixl to QEMU_CFLAGS. As a consequence C++ files that #include "utils.h", such as disas/libvixl/a64/instructions-a64.cc, are going to look for utils.h on all the other include paths first. When building QEMU as part of the Xen make system, another unrelated utils.h file is going to be chosen for inclusion, causing a build failure: In file included from disas/libvixl/a64/instructions-a64.cc:27:0: /qemu/disas/libvixl/a64/instructions-a64.h:88:64: error: 'rawbits_to_float' was not declared in this scope const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000); Fix the problem by prepending (rather than appending) the libvixl include path to QEMU_CFLAGS. Signed-off-by: Stefano Stabellini Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- disas/libvixl/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs index 0adb3ce..17e6565 100644 --- a/disas/libvixl/Makefile.objs +++ b/disas/libvixl/Makefile.objs @@ -3,6 +3,6 @@ libvixl_OBJS = utils.o \ a64/decoder-a64.o \ a64/disasm-a64.o -$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -I$(SRC_PATH)/disas/libvixl +$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)