From nobody Fri Nov 14 21:03:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760718813; cv=none; d=zohomail.com; s=zohoarc; b=g42B3yZVm68Go9rkFN85r0oQDeFB+4UC6CqAxR70JOQwf8D3rD8gYGWm7sdIK46VGLXI61kpKkld34b5noeOXbtOvCsmxgzD5BH/JX5zVt7fW4KWs9qsBwHKtb2l5mMhUYDvDfHpAbxvWP0xsesDrnSQX6zANMWfksVjPYckf3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718813; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m+6QxrQ2Grf7WmLsUxgCW2QmJGtF5cs8k5PSTxarhNg=; b=Hx+wVc3XUlVGFIvoOkhci33DhQxFhuwXcivWJbGKRtIQfT/CQFmz+VH537Gi53r24ZCrfv7Tj0pVofV5GLguCondfnmXg1YX6Cjz0n6n21BoukoQxufqXAj/61qyM+3AVzbbc4TdqarueOW6UE+aHu+gHVAQ5UozussQnTfURuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760718813391849.2343754142591; Fri, 17 Oct 2025 09:33:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nNT-0004q2-3d; Fri, 17 Oct 2025 12:32:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9nNQ-0004pO-Mc for qemu-devel@nongnu.org; Fri, 17 Oct 2025 12:32:24 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v9nNH-0001CD-Hv for qemu-devel@nongnu.org; Fri, 17 Oct 2025 12:32:24 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-b5579235200so1342902a12.3 for ; Fri, 17 Oct 2025 09:32:14 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29099a7d1bbsm68667715ad.65.2025.10.17.09.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Oct 2025 09:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760718733; x=1761323533; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m+6QxrQ2Grf7WmLsUxgCW2QmJGtF5cs8k5PSTxarhNg=; b=pK5WD73JxeGXke8DeVopapGTOQZI2Hw4EiETb7mSnzcJ8k2NHpBIWu0xFFGHMecM8/ dcZFM2ZoXCRgaaJvGfbwcVqcG5gF24BZN9ro+javJOZde90FooBnnvlodZr+DQ4ldFWJ GWg7JBBFfGYl/t9hMrDBJ4grAR2TK5tTqny6tLDu2bTxlPfK/BXfUvRjDkVotGurE6Ha OYsOenPnnYorKHs4TkZrmRdgNkeR1+OyptK81oNztvwIQiynhJ2EFn92JIwdD0k8FkeW IP5wcTHXi12Lv52zIZFuAui2Q++Tw2278OjhEWqHCsMyLB2tk+OtInVtHVzPl0e4ilKN Zu9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760718733; x=1761323533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m+6QxrQ2Grf7WmLsUxgCW2QmJGtF5cs8k5PSTxarhNg=; b=o99iDDpjhZooX70xqCeiVDDlLdMKWDSBbG+HnFeaW08R42YKd4M1ztbsW9aajA5CDK fsGyvtcC3uV8IjbDqLU+BUK59PR9E3rul92RnazCxt9w/YclNKagcLy7bH837K90GhIq YYYXGElXf/mAnhr7efFY1QOavDF/Ic/24Z+qJsXQsvHKGkrKZuwJh3l7im8IRnNnrlGW oCXd7sXbOmIYGp/hfqwEVtkEooDCtxqw9c4tVHl8DkF90OaEGsRTnJgOErfBJoaqGXXR WexPRHp9wGAAZPHBdATywj381U7p53Nsmh8ZculZYkhfhiQRPrImljs3XKkTNdtzckyT 5IUA== X-Gm-Message-State: AOJu0YwDFFvSdzOsdeWOi+OOSWuE7M/vxm1pxEfixQtjtnmJ0xwm2csu 7YYaZxEJmR+BI1GSmy9Vkrv51WOj8xjFVQtCCFbI1/1zSk/hVrVEMQXqrqcYIeRN2kzeMkeUhlh 9HUBUVlg= X-Gm-Gg: ASbGncsxiqee8OZkxT+gqwUc05/QM6A22GxayxjNFaW5eg52M1lY7y5/EYQlkK0LLg3 bufG/NF5g5MLteoFZ7MNAIfb8Psv0oPrX4TRLPPPI3tXwzNuYSiSWaHN0P8r5U9b8+AY6jMvM6P fDDvrIwdsoQ28/J56VSfCUKu30eZSuP3mxlVqwoVGEn2nt+rwXJ1smzx+cfgLoZvuajSVOuCJYc kM8bIyUVjsq1spcjdEHS5m9uRmhvX5YgziQAQff9xGVqdUKlpeO9BT8zcQyF3LlPIbZZNUvrHW5 O4rhvbUqUqn31N1f2X6e0KDRRAVI6iUXY3UUtNFfPPOD6CI9SWFdZdPKxJYMy5EMU/BecybAeWg 2y/yQaqGC/q0rdwZy+CaFSOj4CNoUHLY4/QzvXNh8UQwsoqdjq3gGgZ8ATAUzDm6d0dyssU3ItL PWYjZtVuanua2vy7Dr X-Google-Smtp-Source: AGHT+IHjO1SHOqiJmGu6zQXNfaaKRF9sLcyHK7HrWaHrKVr2QNLhBDd193tOMKz3vZIgQX/VT7XgAA== X-Received: by 2002:a17:903:3c24:b0:24c:6125:390a with SMTP id d9443c01a7336-290c9c8c7cdmr40367215ad.10.1760718733160; Fri, 17 Oct 2025 09:32:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PATCH v3 7/9] buildsys: Remove support for 32-bit PPC hosts Date: Fri, 17 Oct 2025 09:32:04 -0700 Message-ID: <20251017163206.344542-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251017163206.344542-1-richard.henderson@linaro.org> References: <20251017163206.344542-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760718817867158500 From: Philippe Mathieu-Daud=C3=A9 Stop detecting 32-bit PPC host as supported. See previous commit for rationale. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 [rth: Retain _ARCH_PPC64 check in udiv_qrnnd] Signed-off-by: Richard Henderson Message-ID: <20251014173900.87497-4-philmd@linaro.org> --- include/qemu/timer.h | 13 +------------ disas/disas-host.c | 4 +--- util/cacheflush.c | 4 ++-- configure | 19 +++++-------------- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index aec730ac25..406d741120 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -850,12 +850,11 @@ static inline int64_t get_clock(void) /*******************************************/ /* host CPU ticks (if available) */ =20 -#if defined(_ARCH_PPC) +#if defined(_ARCH_PPC64) =20 static inline int64_t cpu_get_host_ticks(void) { int64_t retval; -#ifdef _ARCH_PPC64 /* This reads timebase in one 64bit go and includes Cell workaround fr= om: http://ozlabs.org/pipermail/linuxppc-dev/2006-October/027052.html */ @@ -863,16 +862,6 @@ static inline int64_t cpu_get_host_ticks(void) "cmpwi %0,0\n\t" "beq- $-8" : "=3Dr" (retval)); -#else - /* http://ozlabs.org/pipermail/linuxppc-dev/1999-October/003889.html */ - unsigned long junk; - __asm__ __volatile__ ("mfspr %1,269\n\t" /* mftbu */ - "mfspr %L0,268\n\t" /* mftb */ - "mfspr %0,269\n\t" /* mftbu */ - "cmpw %0,%1\n\t" - "bne $-16" - : "=3Dr" (retval), "=3Dr" (junk)); -#endif return retval; } =20 diff --git a/disas/disas-host.c b/disas/disas-host.c index 8146fafe80..4b06f41fa6 100644 --- a/disas/disas-host.c +++ b/disas/disas-host.c @@ -56,11 +56,9 @@ static void initialize_debug_host(CPUDebug *s) s->info.cap_mode =3D CS_MODE_64; s->info.cap_insn_unit =3D 1; s->info.cap_insn_split =3D 8; -#elif defined(_ARCH_PPC) +#elif defined(_ARCH_PPC64) s->info.cap_arch =3D CS_ARCH_PPC; -# ifdef _ARCH_PPC64 s->info.cap_mode =3D CS_MODE_64; -# endif #elif defined(__riscv) #if defined(_ILP32) || (__riscv_xlen =3D=3D 32) s->info.print_insn =3D print_insn_riscv32; diff --git a/util/cacheflush.c b/util/cacheflush.c index 17c58918de..69c9614e2c 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -153,7 +153,7 @@ static void arch_cache_info(int *isize, int *dsize) } } =20 -#elif defined(_ARCH_PPC) && defined(__linux__) +#elif defined(_ARCH_PPC64) && defined(__linux__) # include "elf.h" =20 static void arch_cache_info(int *isize, int *dsize) @@ -187,7 +187,7 @@ static void fallback_cache_info(int *isize, int *dsize) } else if (*dsize) { *isize =3D *dsize; } else { -#if defined(_ARCH_PPC) +#if defined(_ARCH_PPC64) /* * For PPC, we're going to use the cache sizes computed for * flush_idcache_range. Which means that we must use the diff --git a/configure b/configure index 8263f81370..a2f66f7ff9 100755 --- a/configure +++ b/configure @@ -391,15 +391,11 @@ elif check_define __sparc__ ; then else cpu=3D"sparc" fi -elif check_define _ARCH_PPC ; then - if check_define _ARCH_PPC64 ; then - if check_define _LITTLE_ENDIAN ; then - cpu=3D"ppc64le" - else - cpu=3D"ppc64" - fi +elif check_define _ARCH_PPC64 ; then + if check_define _LITTLE_ENDIAN ; then + cpu=3D"ppc64le" else - cpu=3D"ppc" + cpu=3D"ppc64" fi elif check_define __mips__ ; then if check_define __mips64 ; then @@ -472,11 +468,6 @@ case "$cpu" in linux_arch=3Dmips ;; =20 - ppc) - host_arch=3Dppc - linux_arch=3Dpowerpc - CPU_CFLAGS=3D"-m32" - ;; ppc64) host_arch=3Dppc64 linux_arch=3Dpowerpc @@ -1471,7 +1462,7 @@ probe_target_compiler() { container_image=3Ddebian-all-test-cross container_cross_prefix=3Dmips64-linux-gnuabi64- ;; - ppc|ppc64|ppc64le) + ppc64|ppc64le) container_image=3Ddebian-all-test-cross container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- ;; --=20 2.43.0