From patchwork Thu Mar 22 18:09:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10302063 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 02F95600F6 for ; Thu, 22 Mar 2018 18:11:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8F8E2891F for ; Thu, 22 Mar 2018 18:11:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D754D28927; Thu, 22 Mar 2018 18:11:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, HK_RANDOM_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 30CEB2892E for ; Thu, 22 Mar 2018 18:11:20 +0000 (UTC) Received: from localhost ([::1]:34102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez4gK-0003BG-0f for patchwork-qemu-devel@patchwork.kernel.org; Thu, 22 Mar 2018 14:11:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez4f9-0001bf-IR for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez4f8-0002hE-Nz for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:07 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:32986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ez4f8-0002gT-GF for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:06 -0400 Received: by mail-lf0-x243.google.com with SMTP id x205-v6so14559040lfa.0 for ; Thu, 22 Mar 2018 11:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2PqVJ3JaSzgM+geoZkuKFqimWnafGGkMD+uHyBb1h90=; b=ZSupgT0dYvlxicuCtM4YS774fvVwDDovnXWuSK717uGHNlsHS+nd1NYfYE5r1RDd8I +u+a3Iup7kRhsWlOYXbnNsboyGUXWz+OvyKo5R56ysgIUaKZ0fYnyAwy1CzngE4gUfSy OF62Ix7wHEB1sWhol3+RsU1aJOt96i2RiwHCkq7FDotdu4m0osCz8P0934yip3OGz7Ob scOn6zYTYcDJACBbsdMlytUnB4GEJ5xbp0RqcPOOWmJf/hdolzbCVAsCWMYEoraFiuDj G2vK++shnzT+yXDILAgwPaduE2n0vRTdT6fL6CFiywnb/sytXstGHhPuMU3cTA8up7SR h/sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2PqVJ3JaSzgM+geoZkuKFqimWnafGGkMD+uHyBb1h90=; b=JlEwCuV/3Fh2evgsbhCTcszQmqGvL7ZxMywvVxh0y3r7mZsN1gzTlQUuB3trbFF+sS Y++tvJ6J7cppyVOVpBymtlWnJUcoPUfrqhrW09hnTKAvYhS7MOEO5mUlM0Jo9eF9sm5a X5Aj/3kKoTdv8zK5SFinfauhU5VAO/DMaPV1Bn+7ow4ahB7uv06thvavIYyITM3H6h5x kzm8EHDCWDoVw7wLAjn2xdYuTTKjSrdFPUdtQZIjf91SOca/DIo5Gw1IcDwr71rliKAE 43yxmo8GNjsyDddlziy8MvKkSQnFOM1lVkAV1kcohqJ2PJO11iR2RRJHAb0RQ+t+dQZB geZw== X-Gm-Message-State: AElRT7FtvXJOEGmkYbYT5jC4Nm49Iex5I6731FzuOK+CkxrQr3s/AuH+ R7pPlnekuIQ7fDGifNnGqDAVNQAH X-Google-Smtp-Source: AG47ELuyDu4Jwk0YQWrIPbQ8iNxkBZsZALgeni1O1YkiWnfJr7SQ4lQXsKzuBQEbY5bmYYlce/YQRw== X-Received: by 10.46.151.209 with SMTP id m17mr5948772ljj.64.1521742204958; Thu, 22 Mar 2018 11:10:04 -0700 (PDT) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id m23sm1532138ljg.21.2018.03.22.11.10.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 11:10:04 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 11:09:39 -0700 Message-Id: <20180322180940.8253-3-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322180940.8253-1-jcmvbkbc@gmail.com> References: <20180322180940.8253-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PATCH 2/3] target/xtensa/import_core.sh: fix names of non-top level files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Max Filippov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add .inc. to the names of files imported from configuration overlay in the import_core.sh script to follow the rule of naming non-top level source files. Signed-off-by: Max Filippov --- target/xtensa/import_core.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh index 32255eea9b1b..58a42987d853 100755 --- a/target/xtensa/import_core.sh +++ b/target/xtensa/import_core.sh @@ -22,7 +22,7 @@ mkdir -p "$TARGET" tar -xf "$OVERLAY" -C "$TARGET" --strip-components=1 \ --xform='s/core/core-isa/' config/core.h tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \ - sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.c + sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c # # Fix up known issues in the xtensa-modules.c # @@ -33,7 +33,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \ -e '/^uint32 \*bypass_entry(int i)/,/}/d' \ -e '/^#include "ansidecl.h"/d' \ -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^ return 0;$/ return XTENSA_UNDEFINED;/' \ - > "$TARGET"/xtensa-modules.c + > "$TARGET"/xtensa-modules.inc.c cat < "${TARGET}.c" #include "qemu/osdep.h" @@ -47,13 +47,13 @@ cat < "${TARGET}.c" #include "overlay_tool.h" #define xtensa_modules xtensa_modules_$NAME -#include "core-$NAME/xtensa-modules.c" +#include "core-$NAME/xtensa-modules.inc.c" static XtensaConfig $NAME __attribute__((unused)) = { .name = "$NAME", .gdb_regmap = { .reg = { -#include "core-$NAME/gdb-config.c" +#include "core-$NAME/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules,