aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2020-09-14 16:02:02 -0700
committerRichard Henderson <richard.henderson@linaro.org>2020-10-03 04:23:14 -0500
commiteef20e402c8ff5cacd86222288a722ce7e1a3cb8 (patch)
tree4460b7301128a6078bc482814fb387dd9e8b3f5f
parent8b18cdbfd6c7add5fb8dae5c81596c381fe6e237 (diff)
capstone: Update to upstream "next" branch
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>
m---------capstone0
-rw-r--r--meson.build3
2 files changed, 2 insertions, 1 deletions
diff --git a/capstone b/capstone
-Subproject 22ead3e0bfdb87516656453336160e0a37b066b
+Subproject f8b1b833015a4ae47110ed068e0deb7106ced66
diff --git a/meson.build b/meson.build
index b9f6e84c2b..8d6fb809bc 100644
--- a/meson.build
+++ b/meson.build
@@ -802,6 +802,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'
)
@@ -826,7 +827,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())