From patchwork Fri Jan 29 10:59:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373298 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2094133jam; Fri, 29 Jan 2021 03:09:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJwCAGf4WSwfFJLyBR31Gcd823cT3hQZHQjvr5Nb8rm4LEDns/+VuZyS8eOEG52bGk5hc9 X-Received: by 2002:a05:6902:706:: with SMTP id k6mr5288247ybt.52.1611918565364; Fri, 29 Jan 2021 03:09:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611918565; cv=none; d=google.com; s=arc-20160816; b=UUY6geu6gjlgIMdH3O/M5EnHPQ4mX/974d/bSBuMKvOXbRhAY6/qNYZdf9lweRt1PW PFzZj00j0RDzO27Lhsrcr64mINjCSF/G1RDrHf6ouxobYbTB79OYOujsNkPnKhLwDP2W 58JwgGRQhtPuYh2xpPaIPQcpU+OZZwmhlNVIzd+G+JJybw1rCL7Pwz8gHeqLRydaOEfS 6qvs2iYSxhIqMUqBEv0axuS3Z6NhIqZQPIDr8hRxw0lk2lyWsPW4+XYGgg+rOvHIeUZ4 vzFnBYB7aNAU1FdvR9gyltGMLA0CEkrl6RYY0jnkOeQHSB5U/MYQX3nzo4KqvlIxhudG HlPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=FjD0OXwGzNNfv2GlQuSHJeUVuFbskTZTRqIPXs9Gv+I=; b=slhdm1tm2vrq/h4k0QPx7zF8lHDkUUk7X7ohAJdIARaFNpxd2Sl0zM7IMjKvXjg9rU WM+/PzjJQOE4NGn83GMP3JsCaTULM5/q/yjo6c4mYzzhhnSzbWsZrY3TR+KSwzF23fCi 4wCI0b/oHuqOgj95SBtGAj01a/x99Z+z/u2qbYTua0TmQgXm5D4GqLzq7ZTKNaLIDKoi MNwlOYbMiKXcc+okfcJUxLwNFOKxZmQuSL1Lu3inu1j/RcusVI6hI0m9yDvmAtT/cm3T e35Mk4IUE+kfCDhU5U9d84gQe0dqcPgbJQpa8yJaX4dp9GtBFQw+ZiQel3raihzVfFnl RLUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VUNTc6U4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j190si8212932ybg.286.2021.01.29.03.09.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:09:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VUNTc6U4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5ReW-0001BQ-Rx for patch@linaro.org; Fri, 29 Jan 2021 06:09:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RW7-0004XO-LX for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:43 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:40700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RVw-0006zY-Qn for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:43 -0500 Received: by mail-wm1-x32b.google.com with SMTP id c127so6804291wmf.5 for ; Fri, 29 Jan 2021 03:00:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FjD0OXwGzNNfv2GlQuSHJeUVuFbskTZTRqIPXs9Gv+I=; b=VUNTc6U4eNi0A2AtcDUlH1IZ9PGcg9XKbk1PVFjeoXxxnRcxQGBtUXDourtzZ2XWJD BcD1Q+MPOclsMb/RHyelOoxhwmqvrrF3qSTTlhtAlNmkrPz74X9XUz9dbL66CenBDako 9tNek22IEMTaMucMRNUnC2EoIv1qPTdLfAIVqSBQ2bVUNnaqSvv4WX7TA8s95Q/6i2DX jLQzeSx6Ho+D9+i2J49osrKse8XxCTquU2wnbE+04q9dYF4ZI5DQdHmE7jUBobfR9W8a IvIqy5QEJtdgojlwlMGeINQPgoXcDok7vQ1peQCyRAH1cZwj74jJPuYwCCuY7d+Azfy1 ffmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FjD0OXwGzNNfv2GlQuSHJeUVuFbskTZTRqIPXs9Gv+I=; b=YTiSaPvHCr+j1c9ixydGEaKkKBUa9ePHG958S9zl4aC2KLfnBdXFIwArSnrmUjLj8b tMR1R66H8qVzip/KihffVzdgAvHTBYxnT3NFJnGpEOOs88hbYBfV1N1xKrdfLWPbu923 ZpH17O8KsVxaenDCrc18A2UKrl+ybsMxN1Wv4yTmS7KchpoEZ00Z0Xbkcq9T9KLrk8QJ FxW3EX7bVP+OPEKuE3swjfmWOmiUo45atAU3gXQ4yCrCesc9TGAMeOO2ZofXC8OVAhoe xTWsNDyZdigkOGfUgLiakaU944plhLkN6svkokOzumQaXKJNPNW0HdkVHVfaWMqnK5sp 4h+w== X-Gm-Message-State: AOAM530Ixi8WLUNe0Zc84wyq2IR+0rUE1z20GGpm3W1xyse1GX5UohYS yDoqW+7Jr7DgnFXe0Dk7K2Z2qLTqBICeMQ== X-Received: by 2002:a7b:cbd5:: with SMTP id n21mr3375267wmi.5.1611918029507; Fri, 29 Jan 2021 03:00:29 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w20sm9268761wmm.12.2021.01.29.03.00.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:28 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/46] darwin: remove 64-bit build detection on 32-bit OS Date: Fri, 29 Jan 2021 10:59:42 +0000 Message-Id: <20210129110012.8660-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org> References: <20210129110012.8660-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Joelle van Dyne 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(-) -- 2.20.1 diff --git a/configure b/configure index 99bf6275087..dd2225010b7 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