openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/xtensa: fix meson.build rule for xtensa cores 

import_core.sh tries to change Makefile.objs when importing new xtensa
core, but that file no longer exists. Rewrite meson.build rule to pick
up all source files that match core-*.c pattern and drop commands that
change Makefile.objs.

Cc: qemu-stable@nongnu.org # v5.2.0
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Max Filippov 2021-03-30 00:25:24 -07:00
parent 6d40ce00c1
commit 84317d57e8
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/xtensa/import_core.sh
View File

@ -65,6 +65,3 @@ 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

13
target/xtensa/meson.build
View File

@ -1,14 +1,9 @@
xtensa_ss = ss.source_set()
xtensa_cores = run_command('sh', '-c', 'cd $MESON_SOURCE_ROOT/$MESON_SUBDIR ; ls -1 core-*.c')
xtensa_ss.add(files(xtensa_cores.stdout().strip().split('\n')))
xtensa_ss.add(files(
'core-dc232b.c',
'core-dc233c.c',
'core-de212.c',
'core-de233_fpu.c',
'core-dsp3400.c',
'core-fsf.c',
'core-sample_controller.c',
'core-test_kc705_be.c',
'core-test_mmuhifi_c3.c',
'cpu.c',
'exc_helper.c',
'fpu_helper.c',