* [PATCH] target/xtensa: fix core import to meson.build
@ 2021-03-30 7:30 Max Filippov
2021-03-30 20:32 ` Richard Henderson
0 siblings, 1 reply; 3+ messages in thread
From: Max Filippov @ 2021-03-30 7:30 UTC (permalink / raw)
To: qemu-devel; +Cc: Max Filippov, qemu-stable
import_core.sh was not updated to change meson.build when new xtensa
core is imported. Fix that.
Cc: qemu-stable@nongnu.org # v5.2.0
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
target/xtensa/import_core.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index c8626a8c02eb..f3404039cc20 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -66,5 +66,5 @@ static XtensaConfig $NAME __attribute__((unused)) = {
REGISTER_CORE($NAME)
EOF
-grep -q core-${NAME}.o "$BASE"/Makefile.objs || \
- echo "obj-y += core-${NAME}.o" >> "$BASE"/Makefile.objs
+grep -q core-${NAME}.c "$BASE"/meson.build || \
+ echo "xtensa_ss.add(files('core-${NAME}.c'))" >> "$BASE"/meson.build
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] target/xtensa: fix core import to meson.build
2021-03-30 7:30 [PATCH] target/xtensa: fix core import to meson.build Max Filippov
@ 2021-03-30 20:32 ` Richard Henderson
2021-03-30 23:17 ` Max Filippov
0 siblings, 1 reply; 3+ messages in thread
From: Richard Henderson @ 2021-03-30 20:32 UTC (permalink / raw)
To: Max Filippov, qemu-devel; +Cc: qemu-stable
On 3/30/21 1:30 AM, Max Filippov wrote:
> import_core.sh was not updated to change meson.build when new xtensa
> core is imported. Fix that.
>
> Cc: qemu-stable@nongnu.org # v5.2.0
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
> target/xtensa/import_core.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
> index c8626a8c02eb..f3404039cc20 100755
> --- a/target/xtensa/import_core.sh
> +++ b/target/xtensa/import_core.sh
> @@ -66,5 +66,5 @@ static XtensaConfig $NAME __attribute__((unused)) = {
> REGISTER_CORE($NAME)
> EOF
>
> -grep -q core-${NAME}.o "$BASE"/Makefile.objs || \
> - echo "obj-y += core-${NAME}.o" >> "$BASE"/Makefile.objs
> +grep -q core-${NAME}.c "$BASE"/meson.build || \
> + echo "xtensa_ss.add(files('core-${NAME}.c'))" >> "$BASE"/meson.build
We should be able to do this directly in meson.build, without having to modify
the source file at all.
r~
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] target/xtensa: fix core import to meson.build
2021-03-30 20:32 ` Richard Henderson
@ 2021-03-30 23:17 ` Max Filippov
0 siblings, 0 replies; 3+ messages in thread
From: Max Filippov @ 2021-03-30 23:17 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, qemu-stable
On Tue, Mar 30, 2021 at 1:32 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
> On 3/30/21 1:30 AM, Max Filippov wrote:
> > -grep -q core-${NAME}.o "$BASE"/Makefile.objs || \
> > - echo "obj-y += core-${NAME}.o" >> "$BASE"/Makefile.objs
> > +grep -q core-${NAME}.c "$BASE"/meson.build || \
> > + echo "xtensa_ss.add(files('core-${NAME}.c'))" >> "$BASE"/meson.build
>
> We should be able to do this directly in meson.build, without having to modify
> the source file at all.
Are there examples that I could follow?
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-30 23:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-30 7:30 [PATCH] target/xtensa: fix core import to meson.build Max Filippov
2021-03-30 20:32 ` Richard Henderson
2021-03-30 23:17 ` Max Filippov
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).