From patchwork Sat Dec 8 00:04:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10719033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57D4213BF for ; Sat, 8 Dec 2018 00:05:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F7D92E945 for ; Sat, 8 Dec 2018 00:05:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 339142E9AD; Sat, 8 Dec 2018 00:05:16 +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=-7.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 BF23D2E945 for ; Sat, 8 Dec 2018 00:05:15 +0000 (UTC) Received: from localhost ([::1]:48406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVQ7O-0003EH-72 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 07 Dec 2018 19:05:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVQ6n-0002vW-EQ for qemu-devel@nongnu.org; Fri, 07 Dec 2018 19:04:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVQ6m-0002xI-Lp for qemu-devel@nongnu.org; Fri, 07 Dec 2018 19:04:37 -0500 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:35663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gVQ6m-0002tX-DQ for qemu-devel@nongnu.org; Fri, 07 Dec 2018 19:04:36 -0500 Received: by mail-lj1-x244.google.com with SMTP id x85-v6so4997328ljb.2 for ; Fri, 07 Dec 2018 16:04:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=dFQ2FlBKmUHrAfve8c6ZWXGrE9jsKqzogZCcN55Ioog=; b=ILyT65GziHa4FZ0TROxcy8Tqzqy5YWJ0vdqMI2WN54Q+6b2TY8gkF8ih4Mlu7nnrWS O588KjxpUttS/83HJD/uW++MWNZqb0uHLz6cvtSlmAyEHtYuyvdDzUtgMRHQhhyxtJ/L IgepE4AXp9WJHNKny7i7MBplkMgrdNwwNyQjDW51WuDjCJw8gIn1YBQPC0RsufNMA+xX 5kPk22CjeIWUqxGIlaxn4+pU/ktPH7vVRdKl6TK8N1KVq3s+q2SHpjMpKR/NlKb2ynG9 ZMCj94fIIllnYmOi+qfeLcYOMDyTv2nHoenreMrJmVZJ9bgaKp6D9JWtu0S7GzRBZJtl siUg== 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; bh=dFQ2FlBKmUHrAfve8c6ZWXGrE9jsKqzogZCcN55Ioog=; b=rr5sTWsOf4EyrGKgB5yUxYyKuDCvc1wLysbE/F5sQKbq07upTp3AbdKYTVi2ym/GnC yq5dzQb1UrGDAq0S2HSoUYYw9eZ6atDqJ8wUlPe62nhLFx4VRAeVPHQIaBKXztFUcAvC lwH4S3EQ2bZvABDYTiJgYam0sd+SZFhgo4Cm2TXGd3FjEOhw3GFmvTxS9DGjndhMyU5G 9tkz6GgNcJ/sj4z0T1Z+I+oNUlsvHt8/OmTXKm8WzQoHypnGWtHl9tINc931JDxyyBFm f4/m3c8KL/3AMwRo25XeXJsnmtqdsTfgJ3d7JAZOwlBk0AvVgPdQUjdUmoSXEfJGn5IY w1yQ== X-Gm-Message-State: AA+aEWbiPzQJTC1wPZVNP8eq5BcUu6yiJ5cUYEr0MDLh5C+uHIK1tMs8 Xi1yn4wx6HC7UareU/mllema+VACYus= X-Google-Smtp-Source: AFSGD/WstGrv0ETRVqfUGKQaNnoPRXbXRLjoOa5y8xj2vcZo94h+DbsGM30S+x/AsMgcrlo7GaXWcA== X-Received: by 2002:a2e:5816:: with SMTP id m22-v6mr2333239ljb.177.1544227474387; Fri, 07 Dec 2018 16:04:34 -0800 (PST) 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 m21sm845148lfl.97.2018.12.07.16.04.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Dec 2018 16:04:33 -0800 (PST) From: Max Filippov To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2018 16:04:23 -0800 Message-Id: <20181208000423.2807-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::244 Subject: [Qemu-devel] [PATCH] target/xtensa/import_core.sh: don't add duplicate 'static' 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: Max Filippov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP xtensa-modules.c produced by recent Tensilica tools have Opcode_*_encode_fns arrays defined as static. Don't add extra 'static' in front of them when importing. Signed-off-by: Max Filippov --- target/xtensa/import_core.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh index 039406bf28fa..e4a2e39f6353 100755 --- a/target/xtensa/import_core.sh +++ b/target/xtensa/import_core.sh @@ -27,7 +27,7 @@ tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \ # Fix up known issues in the xtensa-modules.c # tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \ - sed -e 's/\(xtensa_opcode_encode_fn.*\[\] =\)/static \1/' \ + sed -e 's/^\(xtensa_opcode_encode_fn.*\[\] =\)/static \1/' \ -e '/^int num_bypass_groups()/,/}/d' \ -e '/^int num_bypass_group_chunks()/,/}/d' \ -e '/^uint32 \*bypass_entry(int i)/,/}/d' \