diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-05 11:25:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-05 11:25:55 +0100 |
| commit | 671ad7c4468f795b66b4cd8f376f1b1ce6701b63 (patch) | |
| tree | a5b9838f62c5902965f82df211c2a018ae4b7a84 /meson_options.txt | |
| parent | 469e72ab7dbbd7ff4ee601e5ea7c29545d46593b (diff) | |
| parent | c6d3da962f058bca09b25f99da35436816fb6de8 (diff) | |
Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-cap-20201003' into staging
Update capstone submodule from v3.0.5 to v5 ("next").
Convert submodule build to meson.
Enable capstone disassembly for s390x.
Code cleanups in disas.c
# gpg: Signature made Sat 03 Oct 2020 10:33:44 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth-gitlab/tags/pull-cap-20201003:
disas/capstone: Add skipdata hook for s390x
disas: Enable capstone disassembly for s390x
disas: Split out capstone code to disas/capstone.c
disas: Configure capstone for aarch64 host without libvixl
disas: Cleanup plugin_disas
disas: Use qemu/bswap.h for bfd endian loads
disas: Clean up CPUDebug initialization
disas: Move host asm annotations to tb_gen_code
capstone: Require version 4.0 from a system library
capstone: Update to upstream "next" branch
capstone: Convert Makefile bits to meson bits
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meson_options.txt b/meson_options.txt index 46ea1d889a..a1228d29a9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -31,3 +31,7 @@ option('vnc_sasl', type : 'feature', value : 'auto', description: 'SASL authentication for VNC server') option('xkbcommon', type : 'feature', value : 'auto', description: 'xkbcommon support') + +option('capstone', type: 'combo', value: 'auto', + choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], + description: 'Whether and how to find the capstone library') |