On 10/29/2026 9:44 AM, Philippe Mathieu-Daudé wrote:
> Add meson tcg_tests_cross_cc/cflags options for mips32r6el,
> similarly of the previous mips32r5el commit c7b1a7bc9d33
> ("tests/tcg/mipsel/mips32r5el: add msa tests"). This allows
> compiling TCG tests for the mips32r6el-linux-user targets.
>
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> meson_options.txt | 4 ++++
> scripts/meson-buildoptions.sh | 2 ++
> 2 files changed, 6 insertions(+)
>
> diff --git a/meson_options.txt b/meson_options.txt
> index 895c6e63c28a..9ae8e44ab54e 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -461,6 +461,10 @@ option('tcg_tests_cross_cc_mips32r5el', type: 'string',
> description: 'cc for mips32r5el tcg tests')
> option('tcg_tests_cross_cflags_mips32r5el', type: 'string',
> description: 'cflags for mips32r5el tcg tests')
> +option('tcg_tests_cross_cc_mips32r6el', type: 'string',
> + description: 'cc for mips32r6el tcg tests')
> +option('tcg_tests_cross_cflags_mips32r6el', type: 'string',
> + description: 'cflags for mips32r6el tcg tests')
> option('tcg_tests_cross_cc_or1k', type: 'string',
> description: 'cc for or1k tcg tests')
> option('tcg_tests_cross_cflags_or1k', type: 'string',
> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> index 14990966d31d..0f8b56bd7f8c 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -539,6 +539,7 @@ _meson_option_parse() {
> --tcg-tests-cross-cc-m68k=*) quote_sh "-Dtcg_tests_cross_cc_m68k=$2" ;;
> --tcg-tests-cross-cc-mips=*) quote_sh "-Dtcg_tests_cross_cc_mips=$2" ;;
> --tcg-tests-cross-cc-mips32r5el=*) quote_sh
> "-Dtcg_tests_cross_cc_mips32r5el=$2" ;;
> + --tcg-tests-cross-cc-mips32r6el=*) quote_sh
> "-Dtcg_tests_cross_cc_mips32r6el=$2" ;;
> --tcg-tests-cross-cc-mips64=*) quote_sh "-Dtcg_tests_cross_cc_mips64=$2"
> ;;
> --tcg-tests-cross-cc-mips64el=*) quote_sh
> "-Dtcg_tests_cross_cc_mips64el=$2" ;;
> --tcg-tests-cross-cc-mips64r6=*) quote_sh
> "-Dtcg_tests_cross_cc_mips64r6=$2" ;;
> @@ -566,6 +567,7 @@ _meson_option_parse() {
> --tcg-tests-cross-cflags-m68k=*) quote_sh
> "-Dtcg_tests_cross_cflags_m68k=$2" ;;
> --tcg-tests-cross-cflags-mips=*) quote_sh
> "-Dtcg_tests_cross_cflags_mips=$2" ;;
> --tcg-tests-cross-cflags-mips32r5el=*) quote_sh
> "-Dtcg_tests_cross_cflags_mips32r5el=$2" ;;
> + --tcg-tests-cross-cflags-mips32r6el=*) quote_sh
> "-Dtcg_tests_cross_cflags_mips32r6el=$2" ;;
> --tcg-tests-cross-cflags-mips64=*) quote_sh
> "-Dtcg_tests_cross_cflags_mips64=$2" ;;
> --tcg-tests-cross-cflags-mips64el=*) quote_sh
> "-Dtcg_tests_cross_cflags_mips64el=$2" ;;
> --tcg-tests-cross-cflags-mips64r6=*) quote_sh
> "-Dtcg_tests_cross_cflags_mips64r6=$2" ;;
Need to update also scripts/meson-buildoptions.sh.
make or make check-tcg should update it for you.
It's a pain, I know, and TLDR: it's a chicken-egg problem between
configure and meson.
Regards,
Pierrick
