configure: map x32 to cpu_family x86_64 for meson

[PATCH] configure: map x32 to cpu_family x86_64 for meson

Posted by David Michael 2 years, 10 months ago

The meson.build file defines supported_cpus which does not contain
x32, and x32 is not one of meson's stable built-in values:
https://mesonbuild.com/Reference-tables.html#cpu-families

Signed-off-by: David Michael <fedora.dm0@gmail.com>
---

Hi,

QEMU fails to build for x32 due to that cpu_family not being defined in
supported_cpus.  Can something like this be applied?

Alternatively, maybe it could be added to supported_cpus and accepted
everywhere that matches x86 in meson.build, but upstream meson does not
define a CPU type for x32.

Thanks.

David

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 8dcb9965b2..4478f3889a 100755
--- a/configure
+++ b/configure
@@ -6384,7 +6384,7 @@ if test "$skip_meson" = no; then
         i386)
             echo "cpu_family = 'x86'" >> $cross
             ;;
-        x86_64)
+        x86_64|x32)
             echo "cpu_family = 'x86_64'" >> $cross
             ;;
         ppc64le)
-- 
2.31.1

Re: [PATCH] configure: map x32 to cpu_family x86_64 for meson

Posted by Paolo Bonzini 2 years, 10 months ago

On 09/06/21 14:28, David Michael wrote:
> The meson.build file defines supported_cpus which does not contain
> x32, and x32 is not one of meson's stable built-in values:
> https://mesonbuild.com/Reference-tables.html#cpu-families
> 
> Signed-off-by: David Michael <fedora.dm0@gmail.com>
> ---
> 
> Hi,
> 
> QEMU fails to build for x32 due to that cpu_family not being defined in
> supported_cpus.  Can something like this be applied?
> 
> Alternatively, maybe it could be added to supported_cpus and accepted
> everywhere that matches x86 in meson.build, but upstream meson does not
> define a CPU type for x32.
> 
> Thanks.
> 
> David
Queued, thanks.

Paolo

>   configure | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 8dcb9965b2..4478f3889a 100755
> --- a/configure
> +++ b/configure
> @@ -6384,7 +6384,7 @@ if test "$skip_meson" = no; then
>           i386)
>               echo "cpu_family = 'x86'" >> $cross
>               ;;
> -        x86_64)
> +        x86_64|x32)
>               echo "cpu_family = 'x86_64'" >> $cross
>               ;;
>           ppc64le)
>