From nobody Sat Nov 15 02:55:19 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=1755699800; cv=none; d=zohomail.com; s=zohoarc; b=IN0nVbWtJr/bHk0vaENkiCoen1nO6rM/Z4tt8qq5hmYGf5VkdA4PQr8cuVONdWsx3nYJzhNPy9/f6dD7EGL5DdeXtvj09S8qJ/JyVfAwQl0Ke46IXddA4kkpuSK0/Wo8VZ388CwzwtWmhb0D0WGALqwgpQ4xodX/QYBtMPB4AX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755699800; 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=tV9lKlTpVnTEM5miEI9pLJzly0/wCZEDVMKwbl2Bf4U=; b=MHOj1lJCQKi+r8fUwWtK+/HQLbBRof87CUlbgpyzBr4l9Z0QlEeFAXO0BhrUT3itEWRzlJR69VSsNjnod7eNmkipn+yn24YerHs/wY8N18Hgd9Nw+BwikQqyCC8w9AILXdYupyzSbGUAGo1rO+Nu4IdeboVvNgrnbcpHqhlyYn0= 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 1755699800185818.8843430134909; Wed, 20 Aug 2025 07:23:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uojhI-000454-TU; Wed, 20 Aug 2025 10:21:52 -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 1uojh9-00042f-8S for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uojgm-0006ta-AN for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:41 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3c380aa1ad0so466409f8f.3 for ; Wed, 20 Aug 2025 07:21:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c077c5776fsm7924100f8f.61.2025.08.20.07.21.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Aug 2025 07:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755699675; x=1756304475; 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=tV9lKlTpVnTEM5miEI9pLJzly0/wCZEDVMKwbl2Bf4U=; b=JGGN+ef9bQKl+B8cpELbo+B1nUp7PlqKXsp+bc03wxTrx2SZy6QnSGYoRseNDWzGlw vOLcj0AKj5QW00/wZhd5u3kNTS6G2pmNhIQslc+tPzAK1zReBPJkCdKuyjeTz4mOibXA x9jhyeNrasYxAXp+LwST44O1y4752cphIikj8rKdTGyWcZFLRHsk9m5t0d3Txm/V5oAy aruDOSw6+eJN+8UxVpyx0xZ040eDXgSq7FdOKNPUvz1GBUxT9xrsy8kivt0EtxJDgQou +FpWOTjWNzCrGuK3GA7UUqc41330JAzKWPXiEMwOwAiqmaOa6RqACRlhds0kBvMWrMf+ h0aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755699675; x=1756304475; 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=tV9lKlTpVnTEM5miEI9pLJzly0/wCZEDVMKwbl2Bf4U=; b=DAq1ypYY5uH0MoXsMmSUdPEO3dxVVOzF4EFQ9xNHqG4eu9paGBjZomgSaCGRg7Tpi+ OUvv4peO4s6+yRDtmWYX9DeTjdqwvuOPeeY+tOybNf3q0pCMWlqFwakwpIyrqk1UgfbM P7NZupmhRsvicP40WxIrp2QCWmh9TatuHDPTy5sHZEFvbuvNYpgjnB4fmsOHuPAUdcxF 1pzFbzZ0WGXXQVPyIYPn5sgTtfYRvN8rfG4kUIiKK18z/pVru+jQwb/2psLrKzGlP5Bb 0p/V1swXs5NANVLhxuPoWDB4iat+xRfLaQ1619sUXLIwDwpD2WWtwM770zeIyIN1/him hzQQ== X-Gm-Message-State: AOJu0YwboSZ+SHe00DaXsHDHeNH12C5JOZFwbigxMVa206xlnrPKnMIH 9A9JOeFhTKms17/SNYhrq9UHwWaUfkt0UKfs/xiuKlnKEtAEj7TaF+dgD3oYxtCsImAljLO7zHb ERTRD X-Gm-Gg: ASbGncvnR8Bhjbvyxzc9xUS+jq7vAv83A5l6M4nte9TmyhspG/+1E/Xhr4+rC4R7Qr3 +yo4ZBLc9oLRuFpzWWxj/t4gBgQJ+6jonDr8uS5a7SvQZgMNWkmWDd0sNs4O/YHdFeu2Z/xB5ae xXNAq7xLZTVMxzpfr2urFlTjhRDHrMrFj3kYEO4RDDrpXoDYJMaMJPVflJwCybhiEdiGtfCjEnr w++X6X0o8O5ITJtpj0uRvWh/7QKCGP/CSw3P4dV+uHNXvc6RUuwdBs3ukek18IJw7NPJu5avHmD GWjxoCv8lyoTF0IKDt+q4Qe5e2oS/OH2b8e3DMLDoBljQSgHBb2CbeVbTVlWVrbkqxj6vy9Wcdd XbAbXBxFLESY/pBoa96J0pbsXSmSPHVKGOmitw8M0KMQvdBlt3C9iZtOsVZivoVPYUaJW16lrlB s5ig== X-Google-Smtp-Source: AGHT+IEd4wSaUboXf2BALxkOyDO4yLUgkE6MStOJhCazaR/TrKcC8xLfcfRtIZtmeu8NZC0uR0xjvg== X-Received: by 2002:a05:6000:250a:b0:3b7:7c3b:1073 with SMTP id ffacd0b85a97d-3c32fe1a409mr2035567f8f.52.1755699675453; Wed, 20 Aug 2025 07:21:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Riku Voipio , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Huacai Chen , Jiaxun Yang Subject: [PATCH 1/5] docker: Remove 32-bit MIPS toolchain from debian-all-test image Date: Wed, 20 Aug 2025 16:21:04 +0200 Message-ID: <20250820142108.46639-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820142108.46639-1-philmd@linaro.org> References: <20250820142108.46639-1-philmd@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=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1755699802422124100 In commit d3322023bfe ("configure: unify again the case arms in probe_target_compiler") we lost coverage of 32-bit MIPS with the debian-all-test image. No need to keep installing the toolchain. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/docker/dockerfiles/debian-all-test-cross.docker | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index 420a4e33e60..bc74d65a634 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -40,14 +40,10 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ - gcc-mips-linux-gnu \ - libc6-dev-mips-cross \ gcc-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross \ gcc-mips64el-linux-gnuabi64 \ libc6-dev-mips64el-cross \ - gcc-mipsel-linux-gnu \ - libc6-dev-mipsel-cross \ gcc-powerpc64le-linux-gnu \ libc6-dev-ppc64el-cross \ gcc-riscv64-linux-gnu \ --=20 2.51.0 From nobody Sat Nov 15 02:55:19 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=1755699789; cv=none; d=zohomail.com; s=zohoarc; b=Y5gxh1Q5HQyaT+8BZmqn0O2UvsKXQWDqNA2U4kK4TUqEJer8pxn1EpGuz95kX1OGTcvcRb7HfpOcT6jTtD2yGkjVTQipg9Hv/EZPaiaF11hjbzNvwv8gvnCpcW6utTm9M8DNL1VlRGA99rGgKb5QlkA0LRenUq608v8/zOXlUeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755699789; 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=772OS377XKtHYwDSpPY0kVBlSk5H9tu1pRyE03fGer0=; b=dw6V/qHzEnWV8XbAu2I8IdlnWcX0SUmtieXAGOxZANpxkTTBLFadYDtjm/aHhEj2MpASvVufn1V6rNGXJSH7i5fUXDl6V88AvXeHVqMNz4RocZai6fWr79DissBatZ4eR118sGUWczLh46KWoHW9fv39gg4tHkovPpCUd0qjph8= 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 1755699789939620.3755553713626; Wed, 20 Aug 2025 07:23:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uojhP-00045W-72; Wed, 20 Aug 2025 10:21:59 -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 1uojhA-00042s-LN for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:47 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uojh0-0006uK-Jn for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:44 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3b9d41bea3cso6630911f8f.0 for ; Wed, 20 Aug 2025 07:21:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c07487986fsm8927591f8f.1.2025.08.20.07.21.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Aug 2025 07:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755699680; x=1756304480; 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=772OS377XKtHYwDSpPY0kVBlSk5H9tu1pRyE03fGer0=; b=pDOj7wpTXQU/66Ut8ttnzAspPjOrtPBw/mYVdAT1hBgg23xbHncBA1Q4M9qWiN31VD ejLe4kt6N5egUQTTAZBpf+YPqwj3S8LeI+uJWYcghg9EnzL178YCID8GA/mDobXDFxVK MNLU1bJBKITWfwmZRrVjfI7In/9KwEwlukRG8ev5ju/YBG3T7UqwBzeON82+EJVIBM9z gR/SUmPVZzbLf0USqJHEuRjkNs3XYON0wqhM+WbXjkzhu2XhMaobbXzGj/dKvG18CI+l XJsDIcRDTCwkwcFsyAUOBvDQEkiNJiR/yQWKpMvtajb9N711mOcILX/rc3uRbUHgQ/3d dDLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755699680; x=1756304480; 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=772OS377XKtHYwDSpPY0kVBlSk5H9tu1pRyE03fGer0=; b=LzY0LZOCcJ/NrB0ok/EXv0V0jEgvbo9YKpKxDWOn4Ig5fraULctncBwB5n2jN5i8Eg Ei6MS+L351LafWfy3riRm9bNjR9g9IN48PDGyuWjndvE1eZZheYi5AJuTryYWZOkSSt+ mynUM5XdAf9F0hC7u7xuBFuweNTpAqApd1ZM+1a3qXNRnDRrpd7F4e7qkEVRqfMaqllD WLvJ/b6u3YpwCB8zpHqOWBU9PnITXZ8s3VP9i3E6IOROIw2ed94VtWu+C1WbrM5A7E8s 0ljXfaXXMw5IcdqXRWuRQqc0NpXw2lVDKlwE2DUME9uvB84XSBh57tm/Eqpbnrg8PSgQ /4XA== X-Gm-Message-State: AOJu0Yzl/YKALz6UT/9gtuOQOw6zjXJGQM1q8Qt+B6yGBYn7pTWMmQmn btOl7bLb3jnMSCgFdRGVdjJ4No+GEKuFNYhNrn4EIMlvpZZdaWY0U8Z2GrhjSoZB4Z7lim/aH7Z GjMhn X-Gm-Gg: ASbGncu2Np014TFc29lU9fsz9aMsLWCrvmXpTQOavjz/vK4XFSWEQIXGAgQqRDE3icU CG6yX1yrbEEgYLaYhfBgBolAp3yo96gJ6n1YtwFnIPozChaVGs0bYLCY7FhqnZqCRpgIF706WAv VCjr0Kpg3H68xn25NiPf8/znVcf2FkAFwThGfsnCsABF9jWZtyhiR8ju9mckycd3QV8d7NhbwQT LK4gmQtkzgBgKM3BBU1IUcYL96X7mlYt2ISlJvzN9dgpjudUCkavkAk52GOEPMrMMARMgNBOQqN KNhu6m/68V3gK4BTs7ym8xUqakF3tq4ISEWqqFE7KfmN3rGUjUjzdnAQ7EuN8rYQwPtkQ3uqi5Y ZkvqtM2DnFP3n8N1Oaes3x9MEeCPBZ7V2Dfw+KVcfPUwB7bGGhRhqnKKDNtFTAgP7JCsHSb8caT wemg== X-Google-Smtp-Source: AGHT+IFZcugBSIteUr+AXN34bVPQfFvD0EvZ55dsD4gOzvw8mmmEnu2+3T8qRpyJlOczFY+YnTARYQ== X-Received: by 2002:a05:6000:24c9:b0:3b8:d69b:93b with SMTP id ffacd0b85a97d-3c32ecce485mr2008274f8f.52.1755699680169; Wed, 20 Aug 2025 07:21:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Riku Voipio , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Huacai Chen , Jiaxun Yang Subject: [PATCH 2/5] gitlab: Stop cross-testing for 32-bit MIPS hosts Date: Wed, 20 Aug 2025 16:21:05 +0200 Message-ID: <20250820142108.46639-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820142108.46639-1-philmd@linaro.org> References: <20250820142108.46639-1-philmd@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=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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: 1755699791178116600 32-bit host support is deprecated since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"). Next commits will remove support for 32-bit MIPS hosts. Stop cross-building QEMU on our CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-cross.yml | 6 ------ .gitlab-ci.d/crossbuilds.yml | 14 -------------- 2 files changed, 20 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 8d3be53b75b..0fd7341afac 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -52,12 +52,6 @@ mips64el-debian-cross-container: variables: NAME: debian-mips64el-cross =20 -mipsel-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mipsel-cross - ppc64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 3f76c901ba8..721aea77a27 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -68,20 +68,6 @@ cross-i686-tci: # would otherwise be using a parallelism of 9. MAKE_CHECK_ARGS: check check-tcg -j2 =20 -cross-mipsel-system: - extends: .cross_system_build_job - needs: - job: mipsel-debian-cross-container - variables: - IMAGE: debian-mipsel-cross - -cross-mipsel-user: - extends: .cross_user_build_job - needs: - job: mipsel-debian-cross-container - variables: - IMAGE: debian-mipsel-cross - cross-mips64el-system: extends: .cross_system_build_job needs: --=20 2.51.0 From nobody Sat Nov 15 02:55:19 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=1755699783; cv=none; d=zohomail.com; s=zohoarc; b=fQCm7NyYcZCV6jg65Sn/P1hinzoRhPN88+QD3T3w8DM7z0WBJKFW4CO7PAWX5ELa/PG70VMkH/eD2PqDwrfLte8Eg3lea6Hdr3U6MRtId8mEnDYdTQYXgC5GoBWfe81vobd+y2MyEIvqqIihrsJMg9Qv6+KliMA5xl7J9DJ2Lmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755699783; 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=AA+lur7hdgcnhE/6Nghjh0Gy+07MKpaRzdBHxvMucdQ=; b=RCnEESoG7kbF5rkVl4HYY0ckm5CMk+2f1sOFtO+wNIdR4GRrQwVigjz31Fq6VR5QCO+pzB3zB1Dr15tMGNwGkBPjlD1s5qe5XoWR+vbs+gpF83rXEqm0beK9J2URl48dW6KigHMNvm3pqerhyzaLgQYJU5hK/R9a3rXYUjYJSYk= 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 1755699783535222.51128410948513; Wed, 20 Aug 2025 07:23:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uojhM-000458-2c; Wed, 20 Aug 2025 10:21:56 -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 1uojhE-00043V-Az for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:49 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uojh9-0006uw-4X for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:46 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45a1b0d231eso36228175e9.3 for ; Wed, 20 Aug 2025 07:21:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c077788b39sm8003934f8f.47.2025.08.20.07.21.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Aug 2025 07:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755699685; x=1756304485; 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=AA+lur7hdgcnhE/6Nghjh0Gy+07MKpaRzdBHxvMucdQ=; b=mdDlSXWfuRcq9atlYwbkvImgKL2V50+a5xi+s/m9bRPv+DDFbd7OENEsoCif5ezJry ZyqfWNNGPx78z1cYT5yvAz63oKg8T1efLfFWbGYZ3tWQNjy3BC644zHysnSwV/PekypT VGWJ8TGVSyRWeTj9F+KfI9ArBxfQdUDmet6X+cMNEl8E2pOFgqg0NqdyOycredc1jIDv sOePvkLtqGbpOAQuGwg1TB/xCYH65ZQ14ZxCv2cL81gGm79Iyc+caru9xIg80xYy8WrF m46RiZpSPezPIhkrr+LTZT9Rb+uSfqMhUPxiPyFP7/M2RWejevKqEI9OINPsY17JAdSl KJJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755699685; x=1756304485; 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=AA+lur7hdgcnhE/6Nghjh0Gy+07MKpaRzdBHxvMucdQ=; b=oQ25BCyrLFuWCIlcYriq8hUOdfpcT115bZDJN8Rc44ZXA5UbBbGtZOK9EK/EosZq92 KjjlbGP0Y0Lq6iPJZLWbuCr2Iq3R55NnOpJ7Ms/gKR80hkqfD4mA0UJUpTRP/bW4J4zj Xkzie+dHAa+3IjzJRhV6D3m6dsTesvhVynaSuA/tKQ68BjKZklrpxURbnFL//3lR6mQp V8Owgy7NewmeStJ2I4c9TyN2/td8N34ZxFVWkuo37nTnVagTB6pnFBXK6ESXbSg79Drp nMQcQcdj+sCllUC9Rl8Zprtl3Bqm8nnMUAvbM6o7ckFBYd1UmYeCWNe9vZYUOSfRZpxY 6ICw== X-Gm-Message-State: AOJu0Yxtja+jcjZ1cqJbWetGdaGAQiU8RlVWN/dWa46xAhFFf1vIHKaC HhfHw0Dby7baJdp6DsShEDfjwasT//n58qF3ZQHYwU8Sj2AktBSz2A/DyO3SDdmPEU0FbISLKPR nvds+ X-Gm-Gg: ASbGncuN1SzLB+xwt8mL+3VywPVohC1f3CrL1QnPp22Okaqs6p4lP83v7CVuLizaAih 6Zl63Pjsn576km+wYaauT0FxeY7OFKcw7uJX+qQMNtOrNbRAWAH4d8sYZoPAwUQxff6Hi5/nA09 1V4W6hptcqnVbZf+Qq4jhzhFHndEcNqhXaXEofxSUDhtLrd5pTFeZY64rvMj3tyLPEACyywYQX6 lYcRwe90KVoZ/HZbk+anK6fsALZpxnutirScdXrrCQI9o8D1g1qcb8mhCwbO5IzwfMV6f/v36YC MqdYsx1HRqCwmIk9s8x/xZ8zRMv0QdORP6W3P6JtSz+XcG+UJtgsuIP+wOFGmR62mhBZ+NbPdev U8jmLEPr+0wFoKm3DwsJH5Bj3Xxsy9rVzd2yLgyP89gZm824tPk+4xrhbKOmTqokCAQGg58nic/ 0Osw== X-Google-Smtp-Source: AGHT+IGBZfM98QWYDh+mIZnSDSPulPKqFMZhVKjuBe90JIqA5Nt8pj1ruV7Ayr0dQF1rg5KGV3Dyhg== X-Received: by 2002:a05:600c:190d:b0:456:1560:7c5f with SMTP id 5b1f17b1804b1-45b479b8f95mr24444435e9.14.1755699685081; Wed, 20 Aug 2025 07:21:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Riku Voipio , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Huacai Chen , Jiaxun Yang Subject: [PATCH 3/5] docker: Stop building 32-bit MIPS images Date: Wed, 20 Aug 2025 16:21:06 +0200 Message-ID: <20250820142108.46639-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820142108.46639-1-philmd@linaro.org> References: <20250820142108.46639-1-philmd@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=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1755699786300124100 32-bit host support is deprecated since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"). Besides, the Debian distribution we are using to cross-build dropped support for MIPS as of Debian 13 [*]: From trixie, the architectures mipsel and mips64el are no longer supported by Debian. Users of these architectures are advised to switch to different hardware. Next commits will remove support for 32-bit MIPS hosts. Stop building the mipsel Docker image. [*] https://www.debian.org/releases/trixie/release-notes/issues.en.html#mip= s-architectures-removed Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- configure | 2 - tests/docker/Makefile.include | 2 +- .../dockerfiles/debian-mipsel-cross.docker | 180 ------------------ tests/lcitool/refresh | 5 - 4 files changed, 1 insertion(+), 188 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-mipsel-cross.docker diff --git a/configure b/configure index 274a7787642..2d85a6a156c 100755 --- a/configure +++ b/configure @@ -1347,8 +1347,6 @@ fi : ${cross_prefix_microblaze=3D"microblaze-linux-musl-"} : ${cross_prefix_mips64el=3D"mips64el-linux-gnuabi64-"} : ${cross_prefix_mips64=3D"mips64-linux-gnuabi64-"} -: ${cross_prefix_mipsel=3D"mipsel-linux-gnu-"} -: ${cross_prefix_mips=3D"mips-linux-gnu-"} : ${cross_prefix_ppc=3D"powerpc-linux-gnu-"} : ${cross_prefix_ppc64=3D"powerpc64-linux-gnu-"} : ${cross_prefix_ppc64le=3D"$cross_prefix_ppc64"} diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3959d8a028a..ac8ca1fe3a0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -82,7 +82,7 @@ endif =20 # For non-x86 hosts not all cross-compilers have been packaged ifneq ($(HOST_ARCH),x86_64) -DOCKER_PARTIAL_IMAGES +=3D debian-mipsel-cross debian-mips64el-cross +DOCKER_PARTIAL_IMAGES +=3D debian-mips64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-ppc64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker deleted file mode 100644 index 4d3e5d711bd..00000000000 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ /dev/null @@ -1,180 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross-arch mipsel debian-12 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bindgen \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcc \ - gcovr \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - llvm \ - locales \ - make \ - meson \ - mtools \ - ncat \ - ninja-build \ - openssh-client \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - rustc-web \ - sed \ - socat \ - sparse \ - swtpm \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - vulkan-tools \ - xorriso \ - zstd && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - dpkg --add-architecture mipsel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libaio-dev:mipsel \ - libasound2-dev:mipsel \ - libattr1-dev:mipsel \ - libbpf-dev:mipsel \ - libbrlapi-dev:mipsel \ - libbz2-dev:mipsel \ - libc6-dev:mipsel \ - libcacard-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcapstone-dev:mipsel \ - libcbor-dev:mipsel \ - libcmocka-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdaxctl-dev:mipsel \ - libdrm-dev:mipsel \ - libepoxy-dev:mipsel \ - libfdt-dev:mipsel \ - libffi-dev:mipsel \ - libfuse3-dev:mipsel \ - libgbm-dev:mipsel \ - libgcrypt20-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libgtk-3-dev:mipsel \ - libgtk-vnc-2.0-dev:mipsel \ - libibverbs-dev:mipsel \ - libiscsi-dev:mipsel \ - libjemalloc-dev:mipsel \ - libjpeg62-turbo-dev:mipsel \ - libjson-c-dev:mipsel \ - liblttng-ust-dev:mipsel \ - liblzo2-dev:mipsel \ - libncursesw5-dev:mipsel \ - libnfs-dev:mipsel \ - libnuma-dev:mipsel \ - libpam0g-dev:mipsel \ - libpcre2-dev:mipsel \ - libpipewire-0.3-dev:mipsel \ - libpixman-1-dev:mipsel \ - libpng-dev:mipsel \ - libpulse-dev:mipsel \ - librbd-dev:mipsel \ - librdmacm-dev:mipsel \ - libsasl2-dev:mipsel \ - libsdl2-dev:mipsel \ - libsdl2-image-dev:mipsel \ - libseccomp-dev:mipsel \ - libselinux1-dev:mipsel \ - libslirp-dev:mipsel \ - libsnappy-dev:mipsel \ - libsndio-dev:mipsel \ - libspice-protocol-dev:mipsel \ - libspice-server-dev:mipsel \ - libssh-dev:mipsel \ - libsystemd-dev:mipsel \ - libtasn1-6-dev:mipsel \ - libudev-dev:mipsel \ - liburing-dev:mipsel \ - libusb-1.0-0-dev:mipsel \ - libusbredirhost-dev:mipsel \ - libvdeplug-dev:mipsel \ - libvirglrenderer-dev:mipsel \ - libvte-2.91-dev:mipsel \ - libxdp-dev:mipsel \ - libzstd-dev:mipsel \ - nettle-dev:mipsel \ - systemtap-sdt-dev:mipsel \ - zlib1g-dev:mipsel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips'\n\ -cpu =3D 'mipsel'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc - -ENV ABI "mipsel-linux-gnu" -ENV MESON_OPTS "--cross-file=3Dmipsel-linux-gnu" -ENV RUST_TARGET "mipsel-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dmipsel-linux-gnu- -ENV DEF_TARGET_LIST mipsel-softmmu,mipsel-linux-user -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index d3488b2679e..6a70e1dc497 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -214,11 +214,6 @@ try: trailer=3Dcross_build("mips64el-linux-gnuabi64-", "mips64el-softmmu,mips64el-lin= ux-user")) =20 - generate_dockerfile("debian-mipsel-cross", "debian-12", - cross=3D"mipsel", - trailer=3Dcross_build("mipsel-linux-gnu-", - "mipsel-softmmu,mipsel-linux-u= ser")) - generate_dockerfile("debian-ppc64el-cross", "debian-12", cross=3D"ppc64le", trailer=3Dcross_build("powerpc64le-linux-gnu-", --=20 2.51.0 From nobody Sat Nov 15 02:55:19 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=1755699750; cv=none; d=zohomail.com; s=zohoarc; b=nrEADTcJJv8dO7djaVLwUbGIsB7cUQDE80V+o4es0WrpgASZFFyO+p6hd7LKMVdAVCI2dxQDyBr1iaiPYO3lSTvKp0gkT/UJM5cjWmWbBcg5+WK5ZpSQXwZ0GxjWYyKTH16F6qpNDwmBXFGbVNSiSdJy8TFxK6op4eprXWRqwLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755699750; 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=HTVEFWP0rG0yPttwcQLTQbA0y7Ht9HpAvtAti5sHVks=; b=J+xcpxd4LDZXBOzVtM+ycXVZMUST2V0vUNJ/Dg9646upIQvCeKSeyIws83d8g4gpEJkLMm1vtRDf93zxX56aRmnVc86amtLg3szGlyySPG42g7Vj3BNZXSyt2SMDZsjz/yzz0n98JH+f4AZ0pZX3PP3oDVQ7yEkk70wekq5+wk4= 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 1755699750389727.9097612474739; Wed, 20 Aug 2025 07:22:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uojhJ-000455-0Y; Wed, 20 Aug 2025 10:21:53 -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 1uojhE-00043U-97 for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:49 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uojh9-0006vK-Hp for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:46 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-45a28ff47a0so20291005e9.0 for ; Wed, 20 Aug 2025 07:21:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c3c85efc57sm1943245f8f.40.2025.08.20.07.21.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Aug 2025 07:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755699690; x=1756304490; 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=HTVEFWP0rG0yPttwcQLTQbA0y7Ht9HpAvtAti5sHVks=; b=uCQiJY49HZaiz2unH+D7rtbNcUwYG2WTN8NDWcUbDEe4l2QPc+hBXgSUbiMIuON5AU 0AcJpqtEkBrvdbeLEXzhblFd2WhONolV1Jkbai+Jz7saW5s3+UvjmqjqDV3TpRe3jQp+ WYiMBDCh0B8JEIoPi5MxkLrtclbMX9Qb9CMIIapAb5XcQyz05grwSQWN+I4YwRPBBB48 7iECf21vmA6CFDhNS50Uyuzt9NPraYc2/u6AUMLiliqQUQgqpU0kcvRFHO1H11iBKpho oKIQUbyRAPSCJQRswBjxz8POc6Z/64K/9LoU7UadtELCi82B+92m+O1rHBSiypKKmxDc 89xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755699690; x=1756304490; 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=HTVEFWP0rG0yPttwcQLTQbA0y7Ht9HpAvtAti5sHVks=; b=scRcwLoecIP2U8YHT0WnEmoyWM3vHTToXiaLowMFLOOjoWTVXBXfPKkBRlTZtcusEs r2FtJcn/fAscYIxraCDz4aLPwCkkuSVgh2rQMNeVZCTmB5iKq7ENZF4KceTtUbSP4q08 JDP//eBLz7bTNlT58ujnWZOQWinI2knjLjSNjvm6jfP3yS/XomAUst3ODF4A4xA3U//E mD53JVNU1UVnCm4jN0dDnXYzy5GtZAzC7fWn7dKNfizkGKFxDJeGHAX4CKj34MUQ7u0X QNvAEr3/kpggLcEL0rB0fIPoHO/wT5Y8dJpoVme949iZ6F0t1DS9tOqvr2M+TE8UTb0C TPYw== X-Gm-Message-State: AOJu0Yz0gGuBXoaqOXbp3o6qKKOGvzJbxmvuqCC+hqKkEznNiq1ZH8mk 4hGHmFSq5mACnq3p3hyQ9GWRiy0A5RHqdj0xXOLSkNiTJQz8bH7MtUOFe1/cVepHv/g6/hRfKDm suTqP X-Gm-Gg: ASbGncsoe1T0kIaru9069Zpy0BFCdgxogPbzuu0ESNJrS4XT57w5Ocw59Fg3HrS9018 mfqGr8vSrPuUJkMS/0OWizraQAuL5afBHs19WIwEIKXanJSkzLjTkItYoDgJvkUjo2iouf2Mjgp FkegQ0m/BgQEFXXIMoKrKAjJ6xWwPoxDPiPQe32sStHxX5G1R+HwJnw51p7/KlI3pOzo+z6U44r Mw5ut+ZRq7RvagtIblBNZkfzQqEEQyNkrcyZNwByf4Bx7PebGCFosPn/Qn6j16YsG2WBri9pw/c APyM02DfnO/FbnGGgs7h9k8qMim/6qCrjenFY0DmPYxrjCU8qsx91ARlo6K0x96SqpifJMfkcTy ybuUGTlL7OJYf11eqjo32hBjqa2d+Kz2MO+uZyaXps4MnBMEDv1GD2tSVOtuYkKKRlqgunEXQav sjFw== X-Google-Smtp-Source: AGHT+IEaa/Aa0jQv0ed5wog+TEFIFk2ve/5BZYKXuTmBPUCJwJbl6qn4FYaD6IcswKzNbcoQv9alFA== X-Received: by 2002:a5d:64e7:0:b0:3b7:6d94:a032 with SMTP id ffacd0b85a97d-3c32d59d143mr2153308f8f.3.1755699689931; Wed, 20 Aug 2025 07:21:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Riku Voipio , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Huacai Chen , Jiaxun Yang Subject: [PATCH 4/5] tcg/mips: Check O32/N32/64 ABI definitions actually exist Date: Wed, 20 Aug 2025 16:21:07 +0200 Message-ID: <20250820142108.46639-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820142108.46639-1-philmd@linaro.org> References: <20250820142108.46639-1-philmd@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=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1755699752151124100 Similarly noted in libunwind: https://reviews.llvm.org/D38110#895887, when _ABIO32 / _ABIN32 / _ABI64 are not defined (like on OpenBSD) we get: [666/1234] Compiling C object libsystem.a.p/tcg_tcg-common.c.o In file included from ../tcg/tcg-common.c:26: In file included from include/tcg/tcg.h:34: tcg/mips/tcg-target-reg-bits.h:10:18: warning: '_ABIO32' is not defined, = evaluates to 0 [-Wundef] #if _MIPS_SIM =3D=3D _ABIO32 ^ tcg/mips/tcg-target-reg-bits.h:12:20: warning: '_ABIN32' is not defined, = evaluates to 0 [-Wundef] #elif _MIPS_SIM =3D=3D _ABIN32 || _MIPS_SIM =3D=3D _ABI64 ^ 2 warnings generated. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tcg/mips/tcg-target-reg-bits.h | 5 +++-- tcg/mips/tcg-target.c.inc | 5 +++-- common-user/host/mips/safe-syscall.inc.S | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tcg/mips/tcg-target-reg-bits.h b/tcg/mips/tcg-target-reg-bits.h index 56fe0a725e9..a957d2312f3 100644 --- a/tcg/mips/tcg-target-reg-bits.h +++ b/tcg/mips/tcg-target-reg-bits.h @@ -7,9 +7,10 @@ #ifndef TCG_TARGET_REG_BITS_H #define TCG_TARGET_REG_BITS_H =20 -#if _MIPS_SIM =3D=3D _ABIO32 +#if defined(_ABIO32) && _MIPS_SIM =3D=3D _ABIO32 # define TCG_TARGET_REG_BITS 32 -#elif _MIPS_SIM =3D=3D _ABIN32 || _MIPS_SIM =3D=3D _ABI64 +#elif (defined(_ABIN32) && _MIPS_SIM =3D=3D _ABIN32) \ + || (defined(_ABI64) && _MIPS_SIM =3D=3D _ABI64) # define TCG_TARGET_REG_BITS 64 #else # error "Unknown ABI" diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 400eafbab4b..5cdaaaa9286 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -26,7 +26,7 @@ =20 /* used for function call generation */ #define TCG_TARGET_STACK_ALIGN 16 -#if _MIPS_SIM =3D=3D _ABIO32 +#if defined(_ABIO32) && _MIPS_SIM =3D=3D _ABIO32 # define TCG_TARGET_CALL_STACK_OFFSET 16 # define TCG_TARGET_CALL_ARG_I64 TCG_CALL_ARG_EVEN # define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_BY_REF @@ -135,7 +135,8 @@ static const TCGReg tcg_target_call_iarg_regs[] =3D { TCG_REG_A1, TCG_REG_A2, TCG_REG_A3, -#if _MIPS_SIM =3D=3D _ABIN32 || _MIPS_SIM =3D=3D _ABI64 +#if (defined(_ABIN32) && _MIPS_SIM =3D=3D _ABIN32) \ + || (defined(_ABI64) && _MIPS_SIM =3D=3D _ABI64) TCG_REG_T0, TCG_REG_T1, TCG_REG_T2, diff --git a/common-user/host/mips/safe-syscall.inc.S b/common-user/host/mi= ps/safe-syscall.inc.S index 6a446149704..8857d708dae 100644 --- a/common-user/host/mips/safe-syscall.inc.S +++ b/common-user/host/mips/safe-syscall.inc.S @@ -30,7 +30,7 @@ * arguments being syscall arguments (also 'long'). */ =20 -#if _MIPS_SIM =3D=3D _ABIO32 +#if defined(_ABIO32) && _MIPS_SIM =3D=3D _ABIO32 /* 8 * 4 =3D 32 for outgoing parameters; 1 * 4 for s0 save; 1 * 4 for alig= n. */ #define FRAME 40 #define OFS_S0 32 @@ -47,7 +47,7 @@ NESTED(safe_syscall_base, FRAME, ra) .cfi_adjust_cfa_offset FRAME REG_S s0, OFS_S0(sp) .cfi_rel_offset s0, OFS_S0 -#if _MIPS_SIM =3D=3D _ABIO32 +#if defined(_ABIO32) && _MIPS_SIM =3D=3D _ABIO32 /* * The syscall calling convention is nearly the same as C: * we enter with a0 =3D=3D &signal_pending --=20 2.51.0 From nobody Sat Nov 15 02:55:19 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=1755699775; cv=none; d=zohomail.com; s=zohoarc; b=frIWt5AEIA8yX+MtOvnGbQ7AxZix2jGFFaqZeP8Ca1YMwsXdVPOA5N8TPguCZrdR/pEqvfNTgXCYhLngqUKVCh4Az/PAZ1oPLH/siGu62/1D9NXL+3ADUeEYrSXFFSDYH/uhhWSz6i/1DJst3dmspcAOex8ptJhwFaXSJF7s5YQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755699775; 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=OsqVTXBmBw2TMQGfTsUgNo4ps9KgAF1GpJc1m6GbXsg=; b=f/HQB1q+S3fFGBHxS9rYG2cy9NsO44Hj77a1yIfsQYz1vq+177FHaQKLBTVfGKwsNJ3JV6iygISks/M2N8HiZcQSV/MsW49xc+fsXFsZjvN4G2jaDNb8kXsd4mTZaspLS+K9Gwsh8CbuKCudUxmCJPTHya8K4vVSK2BLbh9qj3E= 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 1755699775123248.76241467826253; Wed, 20 Aug 2025 07:22:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uojhN-00045U-8q; Wed, 20 Aug 2025 10:21:57 -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 1uojhE-00043W-Ba for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:49 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uojh9-0006wE-4k for qemu-devel@nongnu.org; Wed, 20 Aug 2025 10:21:47 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-45a1b00797dso44471715e9.0 for ; Wed, 20 Aug 2025 07:21:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4976bc73sm32169625e9.6.2025.08.20.07.21.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Aug 2025 07:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755699696; x=1756304496; 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=OsqVTXBmBw2TMQGfTsUgNo4ps9KgAF1GpJc1m6GbXsg=; b=a7Q/AdAPMy+cc6IVcaIQl6uBoYEviVQN739qbr1LRDS/sGTXFfmhS/zCAIVWemevsn Dtaeae9FDp7MZKCq4ZvOHG01fm7cof0mOhsGm/zy7G08TRN9uOZokexI6wXNEu/Ts9yb YZQRfR13ChzRjTQlCACcvCejZMAYGPOT5nvX6zjlULe3kDOfMlJwWOxs7utp5ktF+xOG uKRvcfRj+ny4XtZy8f0JEZhoCY+DTUc389js7KUdcEJCXvVq5/thOKC50kM4MlI9RVdh /9M5CLmKKAfnJg+Uofw1H2MCW4UgSKCKiRR590Q/YuvT3TkTfgGXQurNTMKvtUdusB4A JfLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755699696; x=1756304496; 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=OsqVTXBmBw2TMQGfTsUgNo4ps9KgAF1GpJc1m6GbXsg=; b=t4OuaVuAcgKEdCfmIZ440OZnA/v6g5Ns4fqaOkJzh5m9U+M4c3+ShDBcghl8PoW6OU ar+GPpESdWX6Yiz4+hHpp1TI7MTYhNE0sWbZXaeO6syrghEuzUMtF2zj0HPGZol4kno7 SKPnBGBS0z4MQTp7TKyMKekMh2exkUjYiMkgb/XszrRgm9/3OXVVFTWZI8JG20y3J+pJ 6vflfEK7KCHjjReNFBTYo2BGt3n9q6+FnxniHfScIudccMUcDL7T3/sSu+ANmSMzZnOD XwfZ/JWZ+ce5elYo3YRI43I0mVCVjAX9xUUSs6V/fF0+jWlyZWtUREVQ7DqjVOP+MiCM +7iw== X-Gm-Message-State: AOJu0YxKGIrQyHigXbpRPCGr2xnCJPs2jgsjO2JnPPFHalWBRrz+el5O XyMKOQO/XrOB85bJuDmVr6BIDDssmTDApTuKZXRikstslwSySPyUK0wtqJpXTY1T23b1FHp5htK 7gMcI X-Gm-Gg: ASbGnctC2Rw+CU5Im/iJz7UkYcb7WNiIpFj0fG13go62WxR+oxgoJIGLgpD9VWZ5cVx UJIFL4atjcTxvtWa8wEay+Af9opVx9J4afiS6Xb6Os/OurrhQAexI2arpXmAGAypDL6tfUxz5OD WdgBi2bW8AFUhhqgmIs7IS4MWUbMoZn26n7czw83TpL0HxSHi/3vhkvgEir/YjrmZzQZ2Q6GDNy Sar0no600AK4lgV401p2IVbC+CWX+WPiXD3oRXV2/QXsl2L1qDmSC72BCtRR+UUMK2u6W9u3OK3 mPzkB9cSHUBMJwj2dPP630QlAxNxGbxaAs+yCtgwP9zAolGc7+Oj5y0m+FVZSmtmilEXBaOO416 nP8INH5o4+4ir6DVjsPsXd2abRhToH/XhhhFB/E28qp4FNKr5QAkVzvubZpAvndoJnmk/3us1I5 z9NA== X-Google-Smtp-Source: AGHT+IH+4I4oHJMrkl7ZNXq1tS8rncbD6pGHySxfQRdMG2y+NjsKyUBup/QwPp2vbXicJeyWKlUdiA== X-Received: by 2002:a05:600c:4683:b0:458:bfb1:1fb6 with SMTP id 5b1f17b1804b1-45b479a3ademr23002445e9.2.1755699694891; Wed, 20 Aug 2025 07:21:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Riku Voipio , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Huacai Chen , Jiaxun Yang Subject: [PATCH 5/5] tcg/mips: Remove support for 32-bit hosts Date: Wed, 20 Aug 2025 16:21:08 +0200 Message-ID: <20250820142108.46639-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820142108.46639-1-philmd@linaro.org> References: <20250820142108.46639-1-philmd@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=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1755699777238116600 32-bit host support is deprecated since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"), released as v10.0. The next release being v10.2, we can remove the TCG backend for 32-bit MIPS hosts. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tcg/mips/tcg-target-has.h | 2 - tcg/mips/tcg-target-reg-bits.h | 4 +- tcg/mips/tcg-target.c.inc | 277 ++++----------------------------- 3 files changed, 35 insertions(+), 248 deletions(-) diff --git a/tcg/mips/tcg-target-has.h b/tcg/mips/tcg-target-has.h index b9eb3385288..88f0145efba 100644 --- a/tcg/mips/tcg-target-has.h +++ b/tcg/mips/tcg-target-has.h @@ -39,11 +39,9 @@ extern bool use_mips32r2_instructions; #endif =20 /* optional instructions */ -#if TCG_TARGET_REG_BITS =3D=3D 64 #define TCG_TARGET_HAS_extr_i64_i32 1 #define TCG_TARGET_HAS_ext32s_i64 1 #define TCG_TARGET_HAS_ext32u_i64 1 -#endif =20 /* optional instructions detected at runtime */ #define TCG_TARGET_HAS_qemu_ldst_i128 0 diff --git a/tcg/mips/tcg-target-reg-bits.h b/tcg/mips/tcg-target-reg-bits.h index a957d2312f3..e608250c72f 100644 --- a/tcg/mips/tcg-target-reg-bits.h +++ b/tcg/mips/tcg-target-reg-bits.h @@ -7,9 +7,7 @@ #ifndef TCG_TARGET_REG_BITS_H #define TCG_TARGET_REG_BITS_H =20 -#if defined(_ABIO32) && _MIPS_SIM =3D=3D _ABIO32 -# define TCG_TARGET_REG_BITS 32 -#elif (defined(_ABIN32) && _MIPS_SIM =3D=3D _ABIN32) \ +#if (defined(_ABIN32) && _MIPS_SIM =3D=3D _ABIN32) \ || (defined(_ABI64) && _MIPS_SIM =3D=3D _ABI64) # define TCG_TARGET_REG_BITS 64 #else diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 5cdaaaa9286..05b93d69146 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -38,15 +38,6 @@ #define TCG_TARGET_CALL_ARG_I32 TCG_CALL_ARG_NORMAL #define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_EVEN =20 -#if TCG_TARGET_REG_BITS =3D=3D 32 -# define LO_OFF (HOST_BIG_ENDIAN * 4) -# define HI_OFF (4 - LO_OFF) -#else -/* Assert at compile-time that these values are never used for 64-bit. */ -# define LO_OFF ({ qemu_build_not_reached(); 0; }) -# define HI_OFF ({ qemu_build_not_reached(); 0; }) -#endif - #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { "zero", @@ -90,11 +81,7 @@ static const char * const tcg_target_reg_names[TCG_TARGE= T_NB_REGS] =3D { #define TCG_TMP3 TCG_REG_T7 =20 #define TCG_GUEST_BASE_REG TCG_REG_S7 -#if TCG_TARGET_REG_BITS =3D=3D 64 #define TCG_REG_TB TCG_REG_S6 -#else -#define TCG_REG_TB ({ qemu_build_not_reached(); TCG_REG_ZERO; }) -#endif =20 /* check if we really need so many registers :P */ static const int tcg_target_reg_alloc_order[] =3D { @@ -568,7 +555,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType typ= e, TCGReg ret, tcg_target_long tmp; int sh, lo; =20 - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I32) { + if (type =3D=3D TCG_TYPE_I32) { arg =3D (int32_t)arg; } =20 @@ -576,7 +563,6 @@ static void tcg_out_movi_int(TCGContext *s, TCGType typ= e, TCGReg ret, if (tcg_out_movi_two(s, ret, arg)) { return; } - assert(TCG_TARGET_REG_BITS =3D=3D 64); =20 /* Load addresses within 2GB of TB with 1 or 3 insns. */ tmp =3D tcg_tbrel_diff(s, (void *)arg); @@ -639,7 +625,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType typ= e, TCGReg ret, static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg ret, tcg_target_long arg) { - TCGReg tbreg =3D TCG_TARGET_REG_BITS =3D=3D 64 ? TCG_REG_TB : 0; + TCGReg tbreg =3D TCG_REG_TB; tcg_out_movi_int(s, type, ret, arg, tbreg); } =20 @@ -667,7 +653,6 @@ static void tcg_out_ext16u(TCGContext *s, TCGReg rd, TC= GReg rs) =20 static void tcg_out_ext32s(TCGContext *s, TCGReg rd, TCGReg rs) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out_opc_sa(s, OPC_SLL, rd, rs, 0); } =20 @@ -710,7 +695,6 @@ static void tcg_out_bswap_subr(TCGContext *s, const tcg= _insn_unit *sub) =20 static void tcg_out_ext32u(TCGContext *s, TCGReg ret, TCGReg arg) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); if (use_mips32r2_instructions) { tcg_out_opc_bf(s, OPC_DEXT, ret, arg, 31, 0); } else { @@ -737,7 +721,7 @@ static void tcg_out_ld(TCGContext *s, TCGType type, TCG= Reg arg, TCGReg arg1, intptr_t arg2) { MIPSInsn opc =3D OPC_LD; - if (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I32) { + if (type =3D=3D TCG_TYPE_I32) { opc =3D OPC_LW; } tcg_out_ldst(s, opc, arg, arg1, arg2); @@ -747,7 +731,7 @@ static void tcg_out_st(TCGContext *s, TCGType type, TCG= Reg arg, TCGReg arg1, intptr_t arg2) { MIPSInsn opc =3D OPC_SD; - if (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I32) { + if (type =3D=3D TCG_TYPE_I32) { opc =3D OPC_SW; } tcg_out_ldst(s, opc, arg, arg1, arg2); @@ -927,72 +911,6 @@ void tcg_out_br(TCGContext *s, TCGLabel *l) tgen_brcond(s, TCG_TYPE_I32, TCG_COND_EQ, TCG_REG_ZERO, TCG_REG_ZERO, = l); } =20 -static int tcg_out_setcond2_int(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg al, TCGReg ah, TCGReg bl, TCGReg bh) -{ - int flags =3D 0; - - switch (cond) { - case TCG_COND_EQ: - flags |=3D SETCOND_INV; - /* fall through */ - case TCG_COND_NE: - flags |=3D SETCOND_NEZ; - tcg_out_opc_reg(s, OPC_XOR, TCG_TMP0, al, bl); - tcg_out_opc_reg(s, OPC_XOR, TCG_TMP1, ah, bh); - tcg_out_opc_reg(s, OPC_OR, ret, TCG_TMP0, TCG_TMP1); - break; - - default: - tgen_setcond(s, TCG_TYPE_I32, TCG_COND_EQ, TCG_TMP0, ah, bh); - tgen_setcond(s, TCG_TYPE_I32, tcg_unsigned_cond(cond), - TCG_TMP1, al, bl); - tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, TCG_TMP0); - tgen_setcond(s, TCG_TYPE_I32, tcg_high_cond(cond), TCG_TMP0, ah, b= h); - tcg_out_opc_reg(s, OPC_OR, ret, TCG_TMP0, TCG_TMP1); - break; - } - return ret | flags; -} - -static void tgen_setcond2(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg al, TCGReg ah, - TCGArg bl, bool const_bl, - TCGArg bh, bool const_bh) -{ - int tmpflags =3D tcg_out_setcond2_int(s, cond, ret, al, ah, bl, bh); - tcg_out_setcond_end(s, ret, tmpflags); -} - -#if TCG_TARGET_REG_BITS !=3D 32 -__attribute__((unused)) -#endif -static const TCGOutOpSetcond2 outop_setcond2 =3D { - .base.static_constraint =3D C_O1_I4(r, r, r, rz, rz), - .out =3D tgen_setcond2, -}; - -static void tgen_brcond2(TCGContext *s, TCGCond cond, TCGReg al, TCGReg ah, - TCGArg bl, bool const_bl, - TCGArg bh, bool const_bh, TCGLabel *l) -{ - int tmpflags =3D tcg_out_setcond2_int(s, cond, TCG_TMP0, al, ah, bl, b= h); - TCGReg tmp =3D tmpflags & ~SETCOND_FLAGS; - MIPSInsn b_opc =3D tmpflags & SETCOND_INV ? OPC_BEQ : OPC_BNE; - - tcg_out_reloc(s, s->code_ptr, R_MIPS_PC16, l, 0); - tcg_out_opc_br(s, b_opc, tmp, TCG_REG_ZERO); - tcg_out_nop(s); -} - -#if TCG_TARGET_REG_BITS !=3D 32 -__attribute__((unused)) -#endif -static const TCGOutOpBrcond2 outop_brcond2 =3D { - .base.static_constraint =3D C_O0_I4(r, r, rz, rz), - .out =3D tgen_brcond2, -}; - static void tgen_movcond(TCGContext *s, TCGType type, TCGCond cond, TCGReg ret, TCGReg c1, TCGArg c2, bool const_c2, TCGArg v1, bool const_v1, TCGArg v2, bool const_v= 2) @@ -1198,7 +1116,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP1, TCG_AREG0, table_off); =20 /* Extract the TLB index from the address into TMP3. */ - if (TCG_TARGET_REG_BITS =3D=3D 32 || addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_opc_sa(s, OPC_SRL, TCG_TMP3, addr, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); } else { @@ -1210,7 +1128,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, tcg_out_opc_reg(s, ALIAS_PADD, TCG_TMP3, TCG_TMP3, TCG_TMP1); =20 /* Load the tlb comparator. */ - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_ld(s, TCG_TYPE_I32, TCG_TMP0, TCG_TMP3, cmp_off + HOST_BIG_ENDIAN * 4); } else { @@ -1227,8 +1145,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, */ tcg_out_movi(s, addr_type, TCG_TMP1, TARGET_PAGE_MASK | a_mask); if (a_mask < s_mask) { - tcg_out_opc_imm(s, (TCG_TARGET_REG_BITS =3D=3D 32 - || addr_type =3D=3D TCG_TYPE_I32 + tcg_out_opc_imm(s, (addr_type =3D=3D TCG_TYPE_I32 ? OPC_ADDIU : OPC_DADDIU), TCG_TMP2, addr, s_mask - a_mask); tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, TCG_TMP2); @@ -1237,7 +1154,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, } =20 /* Zero extend a 32-bit guest address for a 64-bit host. */ - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_TMP2, addr); addr =3D TCG_TMP2; } @@ -1270,7 +1187,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, } =20 base =3D addr; - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_REG_A0, base); base =3D TCG_REG_A0; } @@ -1306,7 +1223,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, tcg_out_opc_imm(s, OPC_LH, lo, base, 0); break; case MO_UL: - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I64) { + if (type =3D=3D TCG_TYPE_I64) { tcg_out_opc_imm(s, OPC_LWU, lo, base, 0); break; } @@ -1316,15 +1233,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TC= GReg lo, TCGReg hi, break; case MO_UQ: /* Prefer to load from offset 0 first, but allow for overlap. */ - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, OPC_LD, lo, base, 0); - } else if (HOST_BIG_ENDIAN ? hi !=3D base : lo =3D=3D base) { - tcg_out_opc_imm(s, OPC_LW, hi, base, HI_OFF); - tcg_out_opc_imm(s, OPC_LW, lo, base, LO_OFF); - } else { - tcg_out_opc_imm(s, OPC_LW, lo, base, LO_OFF); - tcg_out_opc_imm(s, OPC_LW, hi, base, HI_OFF); - } + tcg_out_opc_imm(s, OPC_LD, lo, base, 0); break; default: g_assert_not_reached(); @@ -1366,21 +1275,14 @@ static void tcg_out_qemu_ld_unalign(TCGContext *s, = TCGReg lo, TCGReg hi, case MO_32: tcg_out_opc_imm(s, lw1, lo, base, 0); tcg_out_opc_imm(s, lw2, lo, base, 3); - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I64 && != sgn) { + if (type =3D=3D TCG_TYPE_I64 && !sgn) { tcg_out_ext32u(s, lo, lo); } break; =20 case MO_64: - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, ld1, lo, base, 0); - tcg_out_opc_imm(s, ld2, lo, base, 7); - } else { - tcg_out_opc_imm(s, lw1, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 0= ); - tcg_out_opc_imm(s, lw2, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 3= ); - tcg_out_opc_imm(s, lw1, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 0= ); - tcg_out_opc_imm(s, lw2, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 3= ); - } + tcg_out_opc_imm(s, ld1, lo, base, 0); + tcg_out_opc_imm(s, ld2, lo, base, 7); break; =20 default: @@ -1416,38 +1318,6 @@ static const TCGOutOpQemuLdSt outop_qemu_ld =3D { .out =3D tgen_qemu_ld, }; =20 -static void tgen_qemu_ld2(TCGContext *s, TCGType type, TCGReg datalo, - TCGReg datahi, TCGReg addr, MemOpIdx oi) -{ - MemOp opc =3D get_memop(oi); - TCGLabelQemuLdst *ldst; - HostAddress h; - - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 32); - ldst =3D prepare_host_addr(s, &h, addr, oi, true); - - if (use_mips32r6_instructions || h.aa.align >=3D (opc & MO_SIZE)) { - tcg_out_qemu_ld_direct(s, datalo, datahi, h.base, opc, type); - } else { - tcg_out_qemu_ld_unalign(s, datalo, datahi, h.base, opc, type); - } - - if (ldst) { - ldst->type =3D type; - ldst->datalo_reg =3D datalo; - ldst->datahi_reg =3D datahi; - ldst->raddr =3D tcg_splitwx_to_rx(s->code_ptr); - } -} - -static const TCGOutOpQemuLdSt2 outop_qemu_ld2 =3D { - /* Ensure that the mips32 code is compiled but discarded for mips64. */ - .base.static_constraint =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? C_O2_I1(r, r, r) : C_NotImplemente= d, - .out =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? tgen_qemu_ld2 : NULL, -}; - static void tcg_out_qemu_st_direct(TCGContext *s, TCGReg lo, TCGReg hi, TCGReg base, MemOp opc) { @@ -1462,12 +1332,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TC= GReg lo, TCGReg hi, tcg_out_opc_imm(s, OPC_SW, lo, base, 0); break; case MO_64: - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, OPC_SD, lo, base, 0); - } else { - tcg_out_opc_imm(s, OPC_SW, HOST_BIG_ENDIAN ? hi : lo, base, 0); - tcg_out_opc_imm(s, OPC_SW, HOST_BIG_ENDIAN ? lo : hi, base, 4); - } + tcg_out_opc_imm(s, OPC_SD, lo, base, 0); break; default: g_assert_not_reached(); @@ -1495,15 +1360,8 @@ static void tcg_out_qemu_st_unalign(TCGContext *s, T= CGReg lo, TCGReg hi, break; =20 case MO_64: - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, sd1, lo, base, 0); - tcg_out_opc_imm(s, sd2, lo, base, 7); - } else { - tcg_out_opc_imm(s, sw1, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 0= ); - tcg_out_opc_imm(s, sw2, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 3= ); - tcg_out_opc_imm(s, sw1, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 0= ); - tcg_out_opc_imm(s, sw2, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 3= ); - } + tcg_out_opc_imm(s, sd1, lo, base, 0); + tcg_out_opc_imm(s, sd2, lo, base, 7); break; =20 default: @@ -1539,38 +1397,6 @@ static const TCGOutOpQemuLdSt outop_qemu_st =3D { .out =3D tgen_qemu_st, }; =20 -static void tgen_qemu_st2(TCGContext *s, TCGType type, TCGReg datalo, - TCGReg datahi, TCGReg addr, MemOpIdx oi) -{ - MemOp opc =3D get_memop(oi); - TCGLabelQemuLdst *ldst; - HostAddress h; - - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 32); - ldst =3D prepare_host_addr(s, &h, addr, oi, false); - - if (use_mips32r6_instructions || h.aa.align >=3D (opc & MO_SIZE)) { - tcg_out_qemu_st_direct(s, datalo, datahi, h.base, opc); - } else { - tcg_out_qemu_st_unalign(s, datalo, datahi, h.base, opc); - } - - if (ldst) { - ldst->type =3D type; - ldst->datalo_reg =3D datalo; - ldst->datahi_reg =3D datahi; - ldst->raddr =3D tcg_splitwx_to_rx(s->code_ptr); - } -} - -static const TCGOutOpQemuLdSt2 outop_qemu_st2 =3D { - /* Ensure that the mips32 code is compiled but discarded for mips64. */ - .base.static_constraint =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? C_O0_I3(rz, rz, r) : C_NotImplemen= ted, - .out =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? tgen_qemu_st2 : NULL, -}; - static void tcg_out_mb(TCGContext *s, unsigned a0) { static const MIPSInsn sync[] =3D { @@ -1593,22 +1419,14 @@ static void tcg_out_exit_tb(TCGContext *s, uintptr_= t a0) int16_t lo =3D 0; =20 if (a0) { - intptr_t ofs; - if (TCG_TARGET_REG_BITS =3D=3D 64) { - ofs =3D tcg_tbrel_diff(s, (void *)a0); - lo =3D ofs; - if (ofs =3D=3D lo) { - base =3D TCG_REG_TB; - } else { - base =3D TCG_REG_V0; - tcg_out_movi(s, TCG_TYPE_PTR, base, ofs - lo); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, TCG_REG_TB); - } + intptr_t ofs =3D tcg_tbrel_diff(s, (void *)a0); + lo =3D ofs; + if (ofs =3D=3D lo) { + base =3D TCG_REG_TB; } else { - ofs =3D a0; - lo =3D ofs; base =3D TCG_REG_V0; tcg_out_movi(s, TCG_TYPE_PTR, base, ofs - lo); + tcg_out_opc_reg(s, ALIAS_PADD, base, base, TCG_REG_TB); } } if (!tcg_out_opc_jmp(s, OPC_J, tb_ret_addr)) { @@ -1625,35 +1443,24 @@ static void tcg_out_goto_tb(TCGContext *s, int whic= h) TCGReg base, dest; =20 /* indirect jump method */ - if (TCG_TARGET_REG_BITS =3D=3D 64) { - dest =3D TCG_REG_TB; - base =3D TCG_REG_TB; - ofs =3D tcg_tbrel_diff(s, (void *)ofs); - } else { - dest =3D TCG_TMP0; - base =3D TCG_REG_ZERO; - } + dest =3D TCG_REG_TB; + base =3D TCG_REG_TB; + ofs =3D tcg_tbrel_diff(s, (void *)ofs); tcg_out_ld(s, TCG_TYPE_PTR, dest, base, ofs); tcg_out_opc_reg(s, OPC_JR, 0, dest, 0); /* delay slot */ tcg_out_nop(s); =20 set_jmp_reset_offset(s, which); - if (TCG_TARGET_REG_BITS =3D=3D 64) { - /* For the unlinked case, need to reset TCG_REG_TB. */ - tcg_out_ldst(s, ALIAS_PADDI, TCG_REG_TB, TCG_REG_TB, - -tcg_current_code_size(s)); - } + /* For the unlinked case, need to reset TCG_REG_TB. */ + tcg_out_ldst(s, ALIAS_PADDI, TCG_REG_TB, TCG_REG_TB, + -tcg_current_code_size(s)); } =20 static void tcg_out_goto_ptr(TCGContext *s, TCGReg a0) { tcg_out_opc_reg(s, OPC_JR, 0, a0, 0); - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, a0); - } else { - tcg_out_nop(s); - } + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, a0); } =20 void tb_target_set_jmp_target(const TranslationBlock *tb, int n, @@ -1848,7 +1655,6 @@ static const TCGOutOpBinary outop_eqv =3D { .base.static_constraint =3D C_NotImplemented, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_extrh_i64_i32(TCGContext *s, TCGType t, TCGReg a0, TCGReg= a1) { tcg_out_dsra(s, a0, a1, 32); @@ -1858,7 +1664,6 @@ static const TCGOutOpUnary outop_extrh_i64_i32 =3D { .base.static_constraint =3D C_O1_I1(r, r), .out_rr =3D tgen_extrh_i64_i32, }; -#endif =20 static void tgen_mul(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2) @@ -2247,7 +2052,6 @@ static const TCGOutOpBswap outop_bswap32 =3D { .out_rr =3D tgen_bswap32, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_bswap64(TCGContext *s, TCGType type, TCGReg ret, TCGReg a= rg) { if (use_mips32r2_instructions) { @@ -2265,7 +2069,6 @@ static const TCGOutOpUnary outop_bswap64 =3D { .base.static_constraint =3D C_O1_I1(r, r), .out_rr =3D tgen_bswap64, }; -#endif /* TCG_TARGET_REG_BITS =3D=3D 64 */ =20 static void tgen_neg(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1) { @@ -2393,7 +2196,6 @@ static const TCGOutOpLoad outop_ld16s =3D { .out =3D tgen_ld16s, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_ld32u(TCGContext *s, TCGType type, TCGReg dest, TCGReg base, ptrdiff_t offset) { @@ -2415,7 +2217,6 @@ static const TCGOutOpLoad outop_ld32s =3D { .base.static_constraint =3D C_O1_I1(r, r), .out =3D tgen_ld32s, }; -#endif =20 static void tgen_st8_r(TCGContext *s, TCGType type, TCGReg data, TCGReg base, ptrdiff_t offset) @@ -2586,17 +2387,15 @@ static void tcg_target_qemu_prologue(TCGContext *s) * with the address of the prologue, so we can use that instead * of TCG_REG_TB. */ -#if TCG_TARGET_REG_BITS =3D=3D 64 && !defined(__mips_abicalls) +#if !defined(__mips_abicalls) # error "Unknown mips abi" #endif tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base, - TCG_TARGET_REG_BITS =3D=3D 64 ? TCG_REG_T9 : 0); + TCG_REG_T9); tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG); } =20 - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, tcg_target_call_iarg_regs= [1]); - } + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, tcg_target_call_iarg_regs[1]); =20 /* Call generated code */ tcg_out_opc_reg(s, OPC_JR, 0, tcg_target_call_iarg_regs[1], 0); @@ -2652,10 +2451,6 @@ static void tcg_target_qemu_prologue(TCGContext *s) /* t3 =3D dcba -- delay slot */ tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); =20 - if (TCG_TARGET_REG_BITS =3D=3D 32) { - return; - } - /* * bswap32u -- unsigned 32-bit swap. a0 =3D ....abcd. */ @@ -2750,9 +2545,7 @@ static void tcg_target_init(TCGContext *s) { tcg_target_detect_isa(); tcg_target_available_regs[TCG_TYPE_I32] =3D 0xffffffff; - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_target_available_regs[TCG_TYPE_I64] =3D 0xffffffff; - } + tcg_target_available_regs[TCG_TYPE_I64] =3D 0xffffffff; =20 tcg_target_call_clobber_regs =3D 0; tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_V0); @@ -2783,9 +2576,7 @@ static void tcg_target_init(TCGContext *s) tcg_regset_set_reg(s->reserved_regs, TCG_REG_RA); /* return address = */ tcg_regset_set_reg(s->reserved_regs, TCG_REG_SP); /* stack pointer */ tcg_regset_set_reg(s->reserved_regs, TCG_REG_GP); /* global pointer = */ - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_regset_set_reg(s->reserved_regs, TCG_REG_TB); /* tc->tc_ptr */ - } + tcg_regset_set_reg(s->reserved_regs, TCG_REG_TB); /* tc->tc_ptr */ } =20 typedef struct { --=20 2.51.0