Re: Build for qemu-sh4 broken since 2445971604c

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

Hi John,

On 2/15/20 11:53 AM, John Paul Adrian Glaubitz wrote:
> Hi!
> 
> Currently trying to build qemu-sh4 in static configuration fails with:
> 
> make[1]: Entering directory '/root/qemu/slirp'
> make[1]: Nothing to be done for 'all'.
> make[1]: Leaving directory '/root/qemu/slirp'
>    CC      sh4-linux-user/tcg/tcg-op-gvec.o
> /root/qemu/tcg/tcg-op-gvec.c:298:25: error: unknown type name ‘gen_helper_gvec_5_ptr’; did you mean ‘gen_helper_gvec_4_ptr’?
>    298 |                         gen_helper_gvec_5_ptr *fn)
>        |                         ^~~~~~~~~~~~~~~~~~~~~
>        |                         gen_helper_gvec_4_ptr
> make[1]: *** [/root/qemu/rules.mak:69: tcg/tcg-op-gvec.o] Error 1
> make: *** [Makefile:497: sh4-linux-user/all] Error 2

I believe your build directory is out of date and might have dangling 
old files.

> This seems to have been introduced with:
> 
> commit 2445971604c1cfd3ec484457159f4ac300fb04d2
> Author: Richard Henderson <richard.henderson@linaro.org>
> Date:   Tue Feb 11 16:31:38 2020 -0800
> 
>      tcg: Add tcg_gen_gvec_5_ptr
>      
>      Extend the vector generator infrastructure to handle
>      5 vector arguments.
>      
>      Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>      Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
>      Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
>      Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

If you look the content of this commit, the new type is properly declared:

--- a/include/tcg/tcg-op-gvec.h
+++ b/include/tcg/tcg-op-gvec.h
@@ -83,6 +83,13 @@ void tcg_gen_gvec_4_ptr(uint32_t dofs, uint32_t aofs, 
uint32_t bofs,
                          uint32_t maxsz, int32_t data,
                          gen_helper_gvec_4_ptr *fn);

                          uint32_t maxsz, int32_t data,
                          gen_helper_gvec_4_ptr *fn);

+typedef void gen_helper_gvec_5_ptr(TCGv_ptr, TCGv_ptr, TCGv_ptr, TCGv_ptr,
+                                   TCGv_ptr, TCGv_ptr, TCGv_i32);
+void tcg_gen_gvec_5_ptr(uint32_t dofs, uint32_t aofs, uint32_t bofs,
+                        uint32_t cofs, uint32_t eofs, TCGv_ptr ptr,
+                        uint32_t oprsz, uint32_t maxsz, int32_t data,
+                        gen_helper_gvec_5_ptr *fn);
+

BTW what capstone configuration are you using?
Is that --disable-capstone or another?

Regards,

Phil.