[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/11] capstone: Update to upstream "next" branch
From: |
Richard Henderson |
Subject: |
[PATCH 02/11] capstone: Update to upstream "next" branch |
Date: |
Sun, 13 Sep 2020 17:01:44 -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.
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 4417de1e14..00e2b8cc29 100644
--- a/meson.build
+++ b/meson.build
@@ -668,6 +668,7 @@ else
'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'
)
@@ -692,7 +693,7 @@ else
c_args: capstone_cargs,
include_directories: 'capstone/include')
capstone = declare_dependency(link_with: libcapstone,
- include_directories: 'capstone/include')
+ include_directories:
'capstone/include/capstone')
endif
# Generators
--
2.25.1
- [PATCH 00/11] capstone + disassembler patches, Richard Henderson, 2020/09/13
- [PATCH 01/11] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/13
- [PATCH 02/11] capstone: Update to upstream "next" branch,
Richard Henderson <=
- [PATCH 03/11] disas: Move host asm annotations to tb_gen_code, Richard Henderson, 2020/09/13
- [PATCH 05/11] disas: Use qemu/bswap.h for bfd endian loads, Richard Henderson, 2020/09/13
- [PATCH 04/11] disas: Clean up CPUDebug initialization, Richard Henderson, 2020/09/13
- [PATCH 06/11] disas: Cleanup plugin_disas, Richard Henderson, 2020/09/13
- [PATCH 07/11] disas: Configure capstone for aarch64 host without libvixl, Richard Henderson, 2020/09/13
- [PATCH 09/11] disas: Enable capstone disassembly for s390x, Richard Henderson, 2020/09/13
- [PATCH 08/11] disas: Split out capstone code to disas/capstone.c, Richard Henderson, 2020/09/13
- [PATCH 10/11] disas/capstone: Add skipdata hook for s390x, Richard Henderson, 2020/09/13