From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23A26C3276C for ; Fri, 3 Jan 2020 02:43:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5CC6217F4 for ; Fri, 3 Jan 2020 02:43:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UsPDxGf6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5CC6217F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inCw6-0003AX-Su for qemu-devel@archiver.kernel.org; Thu, 02 Jan 2020 21:43:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43566) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inCue-0001Wi-HR for qemu-devel@nongnu.org; Thu, 02 Jan 2020 21:42:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inCuc-00031G-Vw for qemu-devel@nongnu.org; Thu, 02 Jan 2020 21:42:08 -0500 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:46889) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1inCuc-0002yi-Nc; Thu, 02 Jan 2020 21:42:06 -0500 Received: by mail-lj1-x244.google.com with SMTP id m26so40106230ljc.13; Thu, 02 Jan 2020 18:42:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=ms4NaygvNRHvsZd1PAOASNhPz2q6OnH4agnIhRCQ+z8=; b=UsPDxGf6jFi6KA4R4irJywbvMgXmKSvshWccQagpGeifxo4NIKYXZtzqpwVBaGvclH c3R4V+++mUVPmEEvE9DnHqe0ZBtwP8z7Ey/1S5W09PnADV6JrZ4qH9xC8mxYIdN7pDDr oIBfD8Z9VgLr5BIt+GNoEgqNWf1fU2gX4vz1x1t7DjWAqx4Pp4Ef1rb3eGV2XcNp2o8E q5ysgJluRv2aFF+VCEDtACYjSAa+W2PWGYOLSX/Dh0RH3HbQhTADvS2CyBW4HuBGET+S Q1DabUhLCOs0gCvRzPXVF+iqVlkf/x/5HxYe7DfbJB5TjawwVVwEOMtaSubRX0YjhrIP nN+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=ms4NaygvNRHvsZd1PAOASNhPz2q6OnH4agnIhRCQ+z8=; b=QdQAGYRZiUFvEhyDutDhtv+UE1meHzmsAYP28Ppi1BRfx0L8NPXygfcV0gx3gk4Fdm +IjwPOTkIGb0msdvGikVLRBpEsuCiQqsdXZVQtWbpU+ZztWZ4holttCDDVqN9ihNyyhn BIDNnW2caWVZd+8NZENLQh/rWlKK9XMRTFpgHoDv5S4k2W7ZkqDh/ru5QnMDPhdqMD4T VEJWYkza/pC3FpZFiF41x7/rmfTrV5ueOlxVszYh36jZQ6M7Xd83FrXIsyYI11o8gL/r 4z7wmflQnDJYPe4Wa0pMq66jfSgNC12sLzFXhItOyEG8PXQLXaXmVYa8C1oXQiFo5l7k WmAw== X-Gm-Message-State: APjAAAXAJzKofh693LcOtep1XF9/sWxkfBkdDWpMAPavXdE692FPZ5iF s/QkQVum2vwW5v1GQywbc1ms1QhDiHdGuhSQsCU= X-Google-Smtp-Source: APXvYqzHxXUC/K9ZwYuM8l3CJQ7xn4L5Lxch/8BwmdlnngfPj9T3d6bzKAA6Z5/R05DoObE1bhfQ5tantM4fmhOVRic= X-Received: by 2002:a2e:7505:: with SMTP id q5mr38612705ljc.7.1578019325458; Thu, 02 Jan 2020 18:42:05 -0800 (PST) MIME-Version: 1.0 References: <20200101112303.20724-1-philmd@redhat.com> <20200101112303.20724-3-philmd@redhat.com> In-Reply-To: <20200101112303.20724-3-philmd@redhat.com> From: Alistair Francis Date: Thu, 2 Jan 2020 18:41:38 -0800 Message-ID: Subject: Re: [PATCH v2 2/4] tcg: Search includes in the parent source directory To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::244 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Cornelia Huck , Sagar Karandikar , David Hildenbrand , Anthony Green , Mark Cave-Ayland , "qemu-devel@nongnu.org Developers" , Max Filippov , Alistair Francis , "Edgar E. Iglesias" , Guan Xuetao , Marek Vasut , "open list:New World" , Aleksandar Rikalo , David Gibson , Artyom Tarasenko , Eduardo Habkost , Stefan Weil , Riku Voipio , qemu-s390x , qemu-arm , Stafford Horne , Richard Henderson , "open list:RISC-V" , Bastian Koppelmann , Chris Wulff , Claudio Fontana , Laurent Vivier , Michael Walle , Palmer Dabbelt , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Jan 1, 2020 at 3:24 AM Philippe Mathieu-Daud=C3=A9 wrote: > > All the *.inc.c files included by tcg/$TARGET/tcg-target.inc.c > are in tcg/, their parent directory. To simplify the preprocessor > search path, include the relative parent path: '..'. > > Patch created mechanically by running: > > $ for x in tcg-pool.inc.c tcg-ldst.inc.c; do \ > sed -i "s,#include \"$x\",#include \"../$x\"," \ > $(git grep -l "#include \"$x\""); \ > done > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > tcg/aarch64/tcg-target.inc.c | 4 ++-- > tcg/arm/tcg-target.inc.c | 4 ++-- > tcg/i386/tcg-target.inc.c | 4 ++-- > tcg/mips/tcg-target.inc.c | 2 +- > tcg/ppc/tcg-target.inc.c | 4 ++-- > tcg/riscv/tcg-target.inc.c | 4 ++-- > tcg/s390/tcg-target.inc.c | 4 ++-- > tcg/sparc/tcg-target.inc.c | 2 +- > 8 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c > index 3f921015d3..843fd0ca69 100644 > --- a/tcg/aarch64/tcg-target.inc.c > +++ b/tcg/aarch64/tcg-target.inc.c > @@ -10,7 +10,7 @@ > * See the COPYING file in the top-level directory for details. > */ > > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > #include "qemu/bitops.h" > > /* We're going to re-use TCGType in setting of the SF bit, which control= s > @@ -1541,7 +1541,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext= , TCGReg d, > } > > #ifdef CONFIG_SOFTMMU > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, > * TCGMemOpIdx oi, uintptr_t ra) > diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c > index 94d80d79d1..fffb6611e2 100644 > --- a/tcg/arm/tcg-target.inc.c > +++ b/tcg/arm/tcg-target.inc.c > @@ -23,7 +23,7 @@ > */ > > #include "elf.h" > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > > int arm_arch =3D __ARM_ARCH; > > @@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TC= GArg *args, > } > > #ifdef CONFIG_SOFTMMU > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, > * int mmu_idx, uintptr_t ra) > diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c > index 9d8ed974e0..cdedcb2b25 100644 > --- a/tcg/i386/tcg-target.inc.c > +++ b/tcg/i386/tcg-target.inc.c > @@ -22,7 +22,7 @@ > * THE SOFTWARE. > */ > > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > > #ifdef CONFIG_DEBUG_TCG > static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { > @@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n) > } > > #if defined(CONFIG_SOFTMMU) > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, > * int mmu_idx, uintptr_t ra) > diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c > index 5442167045..1da663ce84 100644 > --- a/tcg/mips/tcg-target.inc.c > +++ b/tcg/mips/tcg-target.inc.c > @@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_un= it *arg) > } > > #if defined(CONFIG_SOFTMMU) > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > static void * const qemu_ld_helpers[16] =3D { > [MO_UB] =3D helper_ret_ldub_mmu, > diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c > index d308d69aba..ee1f9227c1 100644 > --- a/tcg/ppc/tcg-target.inc.c > +++ b/tcg/ppc/tcg-target.inc.c > @@ -23,7 +23,7 @@ > */ > > #include "elf.h" > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > > #if defined _CALL_DARWIN || defined __APPLE__ > #define TCG_TARGET_CALL_DARWIN > @@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] =3D { > }; > > #if defined (CONFIG_SOFTMMU) > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, > * int mmu_idx, uintptr_t ra) > diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c > index 7018509693..2bc0ba71f2 100644 > --- a/tcg/riscv/tcg-target.inc.c > +++ b/tcg/riscv/tcg-target.inc.c > @@ -27,7 +27,7 @@ > * THE SOFTWARE. > */ > > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > > #ifdef CONFIG_DEBUG_TCG > static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { > @@ -921,7 +921,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) > */ > > #if defined(CONFIG_SOFTMMU) > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, > * TCGMemOpIdx oi, uintptr_t ra) > diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c > index 8aaa4cebe8..b07e9ff7d6 100644 > --- a/tcg/s390/tcg-target.inc.c > +++ b/tcg/s390/tcg-target.inc.c > @@ -29,7 +29,7 @@ > #error "unsupported code generation mode" > #endif > > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > #include "elf.h" > > /* ??? The translation blocks produced by TCG are generally small enough= to > @@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, M= emOp opc, TCGReg data, > } > > #if defined(CONFIG_SOFTMMU) > -#include "tcg-ldst.inc.c" > +#include "../tcg-ldst.inc.c" > > /* We're expecting to use a 20-bit negative offset on the tlb memory ops= . */ > QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0); > diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c > index d7986cda5c..65fddb310d 100644 > --- a/tcg/sparc/tcg-target.inc.c > +++ b/tcg/sparc/tcg-target.inc.c > @@ -22,7 +22,7 @@ > * THE SOFTWARE. > */ > > -#include "tcg-pool.inc.c" > +#include "../tcg-pool.inc.c" > > #ifdef CONFIG_DEBUG_TCG > static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { > -- > 2.21.0 > >