target/xtensa: fix core import to meson.build

[PATCH] target/xtensa: fix core import to meson.build

Posted by Max Filippov 3 years ago

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

Re: [PATCH] target/xtensa: fix core import to meson.build

Posted by Richard Henderson 3 years ago

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~

Re: [PATCH] target/xtensa: fix core import to meson.build

Posted by Max Filippov 3 years ago

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