aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2020-09-11 17:59:01 -0700
committerRichard Henderson <richard.henderson@linaro.org>2020-10-03 04:25:14 -0500
commita4038a00ed94d3752044edae8f285772a244a887 (patch)
treee2a58a12578b535d5dbbafa052259f8d1afe067c
parentb71f3a68e2b67c2a26be0a528482fd99a089af3f (diff)
disas: Configure capstone for aarch64 host without libvixl
The ifdef tangle failed to set cap_arch if libvixl itself was not configured (e.g. due to lack of c++ compiler). Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--disas.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/disas.c b/disas.c
index 54a540180f..cafd063d42 100644
--- a/disas.c
+++ b/disas.c
@@ -430,9 +430,11 @@ static void initialize_debug_host(CPUDebug *s)
#else
#error unsupported RISC-V ABI
#endif
-#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS)
- s->info.print_insn = print_insn_arm_a64;
+#elif defined(__aarch64__)
s->info.cap_arch = CS_ARCH_ARM64;
+# ifdef CONFIG_ARM_A64_DIS
+ s->info.print_insn = print_insn_arm_a64;
+# endif
#elif defined(__alpha__)
s->info.print_insn = print_insn_alpha;
#elif defined(__sparc__)