target/xtensa/import_core.sh: don't add duplicate 'static'

[Qemu-devel] [PATCH] target/xtensa/import_core.sh: don't add duplicate 'static'

Max Filippov posted 1 patch 5 years, 4 months ago

Download mbox

Test checkpatch passed

Test docker-quick@centos7 passed

Test docker-clang@ubuntu passed

Test docker-mingw@fedora passed

Test asan passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181208000423.2807-1-jcmvbkbc@gmail.com

target/xtensa/import_core.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] target/xtensa/import_core.sh: don't add duplicate 'static'

Posted by Max Filippov 5 years, 4 months ago

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 <jcmvbkbc@gmail.com>
---
 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' \
-- 
2.11.0