From 32063086a731aaeb76e1a81623953f8a17fcdb6f Mon Sep 17 00:00:00 2001 From: Joelle van Dyne Date: Mon, 25 Jan 2021 17:24:57 -0800 Subject: [PATCH] darwin: remove 64-bit build detection on 32-bit OS A workaround added in early days of 64-bit OSX forced x86_64 if the host machine had 64-bit support. This creates issues when cross- compiling for ARM64. Additionally, the user can always use --cpu=* to manually set the host CPU and therefore this workaround should be removed. Reviewed-by: Peter Maydell Signed-off-by: Joelle van Dyne Message-id: 20210126012457.39046-12-j@getutm.app Signed-off-by: Peter Maydell --- configure | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure b/configure index 99bf627508..dd2225010b 100755 --- a/configure +++ b/configure @@ -625,13 +625,6 @@ fi # the correct CPU with the --cpu option. case $targetos in Darwin) - # on Leopard most of the system is 32-bit, so we have to ask the kernel if we can - # run 64-bit userspace code. - # If the user didn't specify a CPU explicitly and the kernel says this is - # 64 bit hw, then assume x86_64. Otherwise fall through to the usual detection code. - if test -z "$cpu" && test "$(sysctl -n hw.optional.x86_64)" = "1"; then - cpu="x86_64" - fi HOST_DSOSUF=".dylib" ;; SunOS) @@ -775,10 +768,6 @@ OpenBSD) Darwin) bsd="yes" darwin="yes" - if [ "$cpu" = "x86_64" ] ; then - QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS" - QEMU_LDFLAGS="-arch x86_64 $QEMU_LDFLAGS" - fi audio_drv_list="try-coreaudio try-sdl" audio_possible_drivers="coreaudio sdl" # Disable attempts to use ObjectiveC features in os/object.h since they