disas: Fix build against Capstone v6 (again)

[PATCH] disas: Fix build against Capstone v6 (again)

Posted by Richard Henderson 1 year, 3 months ago

Like 9971cbac2f3, which set CAPSTONE_AARCH64_COMPAT_HEADER,
also set CAPSTONE_SYSTEMZ_COMPAT_HEADER.  Fixes the build
against capstone v6-alpha.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/disas/capstone.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/disas/capstone.h b/include/disas/capstone.h
index a11985151d..c43033f7f6 100644
--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
@@ -4,6 +4,7 @@
 #ifdef CONFIG_CAPSTONE
 
 #define CAPSTONE_AARCH64_COMPAT_HEADER
+#define CAPSTONE_SYSTEMZ_COMPAT_HEADER
 #include <capstone.h>
 
 #else
-- 
2.43.0

Re: [PATCH] disas: Fix build against Capstone v6 (again)

Posted by Gustavo Romero 1 year, 3 months ago

Hi Richard,

Sorry, I've missed that one and just found it when doing a
check before the soft freeze :)

On 10/21/24 22:30, Richard Henderson wrote:
> Like 9971cbac2f3, which set CAPSTONE_AARCH64_COMPAT_HEADER,
> also set CAPSTONE_SYSTEMZ_COMPAT_HEADER.  Fixes the build
> against capstone v6-alpha.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/disas/capstone.h | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/include/disas/capstone.h b/include/disas/capstone.h
> index a11985151d..c43033f7f6 100644
> --- a/include/disas/capstone.h
> +++ b/include/disas/capstone.h
> @@ -4,6 +4,7 @@
>   #ifdef CONFIG_CAPSTONE
>   
>   #define CAPSTONE_AARCH64_COMPAT_HEADER
> +#define CAPSTONE_SYSTEMZ_COMPAT_HEADER
>   #include <capstone.h>
>   
>   #else


Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org>

@Peter, would you mind adding this to your queue?


Cheers,
Gustavo

Re: [PATCH] disas: Fix build against Capstone v6 (again)

Posted by Peter Maydell 1 year, 3 months ago

On Sat, 2 Nov 2024 at 17:46, Gustavo Romero <gustavo.romero@linaro.org> wrote:
>
> Hi Richard,
>
> Sorry, I've missed that one and just found it when doing a
> check before the soft freeze :)
>
> On 10/21/24 22:30, Richard Henderson wrote:
> > Like 9971cbac2f3, which set CAPSTONE_AARCH64_COMPAT_HEADER,
> > also set CAPSTONE_SYSTEMZ_COMPAT_HEADER.  Fixes the build
> > against capstone v6-alpha.
> >
> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> > ---
> >   include/disas/capstone.h | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/include/disas/capstone.h b/include/disas/capstone.h
> > index a11985151d..c43033f7f6 100644
> > --- a/include/disas/capstone.h
> > +++ b/include/disas/capstone.h
> > @@ -4,6 +4,7 @@
> >   #ifdef CONFIG_CAPSTONE
> >
> >   #define CAPSTONE_AARCH64_COMPAT_HEADER
> > +#define CAPSTONE_SYSTEMZ_COMPAT_HEADER
> >   #include <capstone.h>
> >
> >   #else
>
>
> Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org>
>
> @Peter, would you mind adding this to your queue?

Sure; applied to target-arm.next, thanks.

-- PMM