[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/10] capstone: Update to upstream "next" branch
From: |
Richard Henderson |
Subject: |
[PATCH v2 02/10] capstone: Update to upstream "next" branch |
Date: |
Mon, 14 Sep 2020 16:02:02 -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>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
capstone | 2 +-
meson.build | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/capstone b/capstone
index 22ead3e0bf..f8b1b83301 160000
--- a/capstone
+++ b/capstone
@@ -1 +1 @@
-Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf
+Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d
diff --git a/meson.build b/meson.build
index df7d2eb52f..cbb8257d6b 100644
--- a/meson.build
+++ b/meson.build
@@ -681,6 +681,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'
)
@@ -705,7 +706,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())
--
2.25.1
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, (continued)
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/14
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Paolo Bonzini, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Yonggang Luo, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Paolo Bonzini, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Yonggang Luo, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Paolo Bonzini, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Yonggang Luo, 2020/09/15
- Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Paolo Bonzini, 2020/09/15
Re: [PATCH v2 01/10] capstone: Convert Makefile bits to meson bits, Thomas Huth, 2020/09/15
[PATCH v2 02/10] capstone: Update to upstream "next" branch,
Richard Henderson <=
[PATCH v2 03/10] disas: Move host asm annotations to tb_gen_code, Richard Henderson, 2020/09/14
[PATCH v2 04/10] disas: Clean up CPUDebug initialization, Richard Henderson, 2020/09/14
[PATCH v2 05/10] disas: Use qemu/bswap.h for bfd endian loads, Richard Henderson, 2020/09/14
[PATCH v2 06/10] disas: Cleanup plugin_disas, Richard Henderson, 2020/09/14
[PATCH v2 07/10] disas: Configure capstone for aarch64 host without libvixl, Richard Henderson, 2020/09/14