From patchwork Mon Jul 7 15:25:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 33163 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BAB4E20969 for ; Mon, 7 Jul 2014 15:26:48 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id w8sf14043360qac.0 for ; Mon, 07 Jul 2014 08:26:48 -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-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=fRgMRnafmz/Y6JUPqnJg1LUPssW5Fgm+T/fexFHQpFo=; b=OxYIiZkDQi5xCEwgPxYB4DJ/6SmwMOQgjPikrl/sCHAmjIAmlkfCa0jnKa7qPsGVEv E//zDPtkJ0zzk3kHxy7gFrweugVS/nIuyhkHWrxcsaLwCF96M48BhKy3s8565FGcz/bv jhWIA01m1sfZYtU6XUj/telyUFh18RypmjhXhVXEK9/U0DH2Pimr83asltp1Aij6fVvQ HWUQBSXxCG8ZCm2ie+2FQNIm4ShHstiAQ9vZulP0c3bJ4dKqCjnY0C96QKAWvJ8/93e8 itgaDS+Al1LuKijvYv+uybizpkOnTGz6NolVcCxsTOBYgTFqbgmOnpC5Us+UwrMeL9Q0 NHWQ== X-Gm-Message-State: ALoCoQk8G4w5y3uqzAsam0vZfxWfjyIBbUkcWW2xpZiC7m/dqD7/Pwic941r+e0ao4zVSUDBJaGK X-Received: by 10.58.132.68 with SMTP id os4mr12926951veb.15.1404746808512; Mon, 07 Jul 2014 08:26:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.77 with SMTP id r71ls510962qga.71.gmail; Mon, 07 Jul 2014 08:26:48 -0700 (PDT) X-Received: by 10.221.4.66 with SMTP id ob2mr16036722vcb.28.1404746808411; Mon, 07 Jul 2014 08:26:48 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id wz8si18893663vdb.13.2014.07.07.08.26.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jul 2014 08:26:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id il7so4142413vcb.12 for ; Mon, 07 Jul 2014 08:26:48 -0700 (PDT) X-Received: by 10.58.46.34 with SMTP id s2mr3198162vem.49.1404746808303; Mon, 07 Jul 2014 08:26:48 -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 tc5csp677429vcb; Mon, 7 Jul 2014 08:26:48 -0700 (PDT) X-Received: by 10.224.22.12 with SMTP id l12mr50397602qab.88.1404746807909; Mon, 07 Jul 2014 08:26:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j106si30213400qge.0.2014.07.07.08.26.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 07 Jul 2014 08:26:47 -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]:51285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4AoZ-0000Mi-Hd for patch@linaro.org; Mon, 07 Jul 2014 11:26:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Anz-0008VK-Nv for qemu-devel@nongnu.org; Mon, 07 Jul 2014 11:26:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Anu-0003DR-5T for qemu-devel@nongnu.org; Mon, 07 Jul 2014 11:26:11 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:26198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Ant-0003DA-Ti for qemu-devel@nongnu.org; Mon, 07 Jul 2014 11:26:06 -0400 X-IronPort-AV: E=Sophos;i="5.01,618,1400025600"; d="scan'208";a="150503338" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 07 Jul 2014 15:25:50 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 7 Jul 2014 11:25:50 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1X4Ane-0004VW-4F; Mon, 07 Jul 2014 16:25:50 +0100 Date: Mon, 7 Jul 2014 16:25:07 +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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: xen-devel@lists.xensource.com, Ian Campbell , Stefano Stabellini , Ian Jackson , qemu-devel@nongnu.org, claudio.fontana@linaro.org Subject: [Qemu-devel] [PATCH] 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: 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.181 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 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 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)