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:
parent
6d40ce00c1
commit
84317d57e8
|
@ -65,6 +65,3 @@ static XtensaConfig $NAME __attribute__((unused)) = {
|
||||||
|
|
||||||
REGISTER_CORE($NAME)
|
REGISTER_CORE($NAME)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
grep -q core-${NAME}.o "$BASE"/Makefile.objs || \
|
|
||||||
echo "obj-y += core-${NAME}.o" >> "$BASE"/Makefile.objs
|
|
||||||
|
|
|
@ -1,14 +1,9 @@
|
||||||
xtensa_ss = ss.source_set()
|
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(
|
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',
|
'cpu.c',
|
||||||
'exc_helper.c',
|
'exc_helper.c',
|
||||||
'fpu_helper.c',
|
'fpu_helper.c',
|
||||||
|
|
Loading…
Reference in a new issue