[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] capstone: Update to upstream "next" branch
From: |
Richard Henderson |
Subject: |
[PULL 02/11] capstone: Update to upstream "next" branch |
Date: |
Tue, 22 Sep 2020 10:47:32 -0700 |
This branch contains a number of improvements over master,
including making all of the disassembler data constant.
We are skipping past the 4.0 branchpoint, which changed
the location of the includes within the source directory.
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
meson.build | 3 ++-
capstone | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index f23273693d..4c92b43fe5 100644
--- a/meson.build
+++ b/meson.build
@@ -677,6 +677,7 @@ if capstone_opt == 'internal'
'capstone/arch/X86/X86DisassemblerDecoder.c',
'capstone/arch/X86/X86ATTInstPrinter.c',
'capstone/arch/X86/X86IntelInstPrinter.c',
+ 'capstone/arch/X86/X86InstPrinterCommon.c',
'capstone/arch/X86/X86Mapping.c',
'capstone/arch/X86/X86Module.c'
)
@@ -701,7 +702,7 @@ if capstone_opt == 'internal'
c_args: capstone_cargs,
include_directories: 'capstone/include')
capstone = declare_dependency(link_with: libcapstone,
- include_directories: 'capstone/include')
+ include_directories:
'capstone/include/capstone')
endif
config_host_data.set('CONFIG_CAPSTONE', capstone.found())
diff --git a/capstone b/capstone
index 22ead3e0bf..f8b1b83301 160000
--- a/capstone
+++ b/capstone
@@ -1 +1 @@
-Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf
+Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d
--
2.25.1
- [PULL 00/11] capstone + disassembler patch queue, Richard Henderson, 2020/09/22
- [PULL 05/11] disas: Clean up CPUDebug initialization, Richard Henderson, 2020/09/22
- [PULL 01/11] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/22
- [PULL 04/11] disas: Move host asm annotations to tb_gen_code, Richard Henderson, 2020/09/22
- [PULL 03/11] capstone: Require version 4.0 from a system library, Richard Henderson, 2020/09/22
- [PULL 02/11] capstone: Update to upstream "next" branch,
Richard Henderson <=
- [PULL 06/11] disas: Use qemu/bswap.h for bfd endian loads, Richard Henderson, 2020/09/22
- [PULL 08/11] disas: Configure capstone for aarch64 host without libvixl, Richard Henderson, 2020/09/22
- [PULL 11/11] disas/capstone: Add skipdata hook for s390x, Richard Henderson, 2020/09/22
- [PULL 10/11] disas: Enable capstone disassembly for s390x, Richard Henderson, 2020/09/22
- [PULL 07/11] disas: Cleanup plugin_disas, Richard Henderson, 2020/09/22
- [PULL 09/11] disas: Split out capstone code to disas/capstone.c, Richard Henderson, 2020/09/22
- Re: [PULL 00/11] capstone + disassembler patch queue, Paolo Bonzini, 2020/09/24
- Re: [PULL 00/11] capstone + disassembler patch queue, Peter Maydell, 2020/09/25