From: Max Filippov <jcmvbkbc@gmail.com>
To: qemu-devel@nongnu.org
Cc: Eric Blake <eblake@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Max Filippov <jcmvbkbc@gmail.com>
Subject: [Qemu-devel] [PATCH 2/3] target/xtensa/import_core.sh: fix names of non-top level files
Date: Thu, 22 Mar 2018 11:09:39 -0700 [thread overview]
Message-ID: <20180322180940.8253-3-jcmvbkbc@gmail.com> (raw)
In-Reply-To: <20180322180940.8253-1-jcmvbkbc@gmail.com>
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 <jcmvbkbc@gmail.com>
---
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 <<EOF > "${TARGET}.c"
#include "qemu/osdep.h"
@@ -47,13 +47,13 @@ cat <<EOF > "${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,
--
2.11.0
next prev parent reply other threads:[~2018-03-22 18:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 18:09 [Qemu-devel] [PATCH 0/3] target/xtensa: improvements for core-specific files Max Filippov
2018-03-22 18:09 ` [Qemu-devel] [PATCH 1/3] target/xtensa: add .inc. to non-top level source file names Max Filippov
2018-03-22 19:16 ` Eric Blake
2018-03-22 20:37 ` Max Filippov
2018-03-23 2:28 ` Philippe Mathieu-Daudé
2018-03-22 18:09 ` Max Filippov [this message]
2018-03-22 19:15 ` [Qemu-devel] [PATCH 2/3] target/xtensa/import_core.sh: fix names of non-top level files Eric Blake
2018-03-22 18:09 ` [Qemu-devel] [PATCH 3/3] target/xtensa/import_core.sh: fix #include <xtensa-isa.h> Max Filippov
2018-03-23 2:30 ` Philippe Mathieu-Daudé
2018-03-22 19:17 ` [Qemu-devel] [PATCH 0/3] target/xtensa: improvements for core-specific files Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180322180940.8253-3-jcmvbkbc@gmail.com \
--to=jcmvbkbc@gmail.com \
--cc=eblake@redhat.com \
--cc=lvivier@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).