diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-04 21:48:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-04 21:48:45 +0100 |
| commit | 25d75c99b2e5941c67049ee776efdb226414f4c6 (patch) | |
| tree | 524d0e6ec6c3ae3e5871a42c0dad6c59a4ca4e8c /target | |
| parent | 11577d85b1a6939380bd16ed9a861653194de044 (diff) | |
| parent | 30c676134eb8f956853a55023d694062062d40d7 (diff) | |
Merge remote-tracking branch 'remotes/xtensa/tags/20210403-xtensa' into staging
target/xtensa fixes for v6.0:
- make meson.build pick up all available xtensa core definitions;
- don't modify Makefile.objs in import_core.sh;
- add sed rule to import_core.sh to make xtensa_modules variable static.
# gpg: Signature made Sat 03 Apr 2021 17:08:41 BST
# gpg: using RSA key 2B67854B98E5327DCDEB17D851F9CC91F83FA044
# gpg: issuer "jcmvbkbc@gmail.com"
# gpg: Good signature from "Max Filippov <filippov@cadence.com>" [unknown]
# gpg: aka "Max Filippov <max.filippov@cogentembedded.com>" [full]
# gpg: aka "Max Filippov <jcmvbkbc@gmail.com>" [full]
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB 17D8 51F9 CC91 F83F A044
* remotes/xtensa/tags/20210403-xtensa:
target/xtensa: make xtensa_modules static on import
target/xtensa: fix meson.build rule for xtensa cores
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rwxr-xr-x | target/xtensa/import_core.sh | 4 | ||||
| -rw-r--r-- | target/xtensa/meson.build | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh index c8626a8c02..396b264be9 100755 --- a/target/xtensa/import_core.sh +++ b/target/xtensa/import_core.sh @@ -35,6 +35,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \ -e '/^#include "ansidecl.h"/d' \ -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^ return 0;$/ return XTENSA_UNDEFINED;/' \ -e 's/#include <xtensa-isa.h>/#include "xtensa-isa.h"/' \ + -e 's/^\(xtensa_isa_internal xtensa_modules\)/static \1/' \ > "$TARGET"/xtensa-modules.c.inc cat <<EOF > "${TARGET}.c" @@ -65,6 +66,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 diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build index dd750a977e..7c4efa6c62 100644 --- a/target/xtensa/meson.build +++ b/target/xtensa/meson.build @@ -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', |