From patchwork Thu Aug 29 19:53:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 1978609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=RJl+sPub; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WvsSF45jXz1yZ9 for ; Fri, 30 Aug 2024 05:54:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6D07D3865487 for ; Thu, 29 Aug 2024 19:54:35 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id EF344386102B for ; Thu, 29 Aug 2024 19:53:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF344386102B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EF344386102B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1033 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724961229; cv=none; b=oRXsbHH16eJJGQve9zcVok3NHLwPvGLQWr8vAxlYG98GO6lt/++SlNL9JlKa8Ry3h0O3/f/+QFxjT8xiT7iza96U4TeMXiUqhIv/s81MEojhCY+UDohJMJ70txlXcwpvFkfMdqtTLwkHckOhNeZJo3X8DVnDTibt1XOYt6yzXHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724961229; c=relaxed/simple; bh=uDqjaV0x5cWRujfkHg2hFlzYs8RuMpsua5pmUJl6ybk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=s7CWCldgK7mllAvpQU+5mFymBrdEdnUdgN1yq4IYJSOFdYjHI5tyeFP/6KsYtRjikeQFc81bQgN3sJvgCq80/nb2jCx5AVui5HBqEzRavVdbpYHlz2uQRXWV6XERo3gHbqGAXzxrngrly9NJvBRSmW1nO6lALdjzeoXzGPUYh6U= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2d3c99033d6so814297a91.0 for ; Thu, 29 Aug 2024 12:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724961225; x=1725566025; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=PujsWWYsY2olFdDYWljj9xL75sQ6K/2kNF7vcpgv58g=; b=RJl+sPub/FY+UmrDG6YHSo+PJ60K60Si29iK5P2SGGz7aW9hx7I6RAXSKbBB8MwLNU Uu9G2GedklTqLw97q0nK6VFSj0lKvXnJjKiPFbE96gORjcuH6Hz0ZSBrbmyOOhVG3bU4 biNoMKw5Dt08fsvTxKsDT5a08jYldrp5TnRFqSW//k9GLFDP483GcMp+DA66aeBV1RiA jqCsdcNp+xCkBzJJssy9EXAFLeUWjBiv5OZZF+3EZxPIe1cWht4O2d4Jvm3CmXQojI76 vMeSdBLALOWO4I7FNAX5E4w0Wx5R0z2J0QuBIDOFg11JXmgFmdJpaecH8ShsTQe4yHgx OiJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724961225; x=1725566025; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PujsWWYsY2olFdDYWljj9xL75sQ6K/2kNF7vcpgv58g=; b=mbNR2TvicOHr9ATipkS8adPBhVNNTO7Lz2XwhU5QFGYIZ48XB+WDaIVpeethci4/ni t6QV4D1kIxDHH1Mk1umbR6CTAl7SIEyb6gRrmKPeHKiB74axckG/vf8ARHa3179f5ZC0 7ReBRLQp6Bq42eogqR7ItgnDzvF/YioKnSjXya2bXyBqBGhNjE6ru+X0cQoV4KTCrmdQ S3j4eidgAaEq3JpcAYwj5xFEky5HvRAki+o/qFSBQyRM5cMcATJhE3RhyzgJ77eTyd7R dZNlI1ies67vz709Fn5dQ6V+sFEYo2XVemWQYUOAZPckDGmkrFbetnL2RukZJN4ZvDg7 fYzw== X-Gm-Message-State: AOJu0YxVINHSNOw2PJa9UqSuhTSdr0/qnM7TOZ4anSqIGUJFA9FUGlJ9 Vkx2OkJSNyaHf8wwJetFR2P9k/1Ig12l9sPt6c3oInLgLBsdGheg4NXCJD+mgUYp06x0Kv+InVY Y X-Google-Smtp-Source: AGHT+IFkritF44QiC2gVSfPuXS4rjNw3YFADdPDBGmht+PXjgK7LoLu2NldyLEBCZp3ltczQNVLD8w== X-Received: by 2002:a17:90b:4b07:b0:2c9:6d8:d823 with SMTP id 98e67ed59e1d1-2d85617d48bmr5006040a91.1.1724961225192; Thu, 29 Aug 2024 12:53:45 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:4c2c:4190:b7ef:2928:18cc]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d85b11b7e0sm2135420a91.17.2024.08.29.12.53.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 12:53:44 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] linux: mips: Fix syscall_cancell build for __mips_isa_rev >= 6 Date: Thu, 29 Aug 2024 16:53:35 -0300 Message-ID: <20240829195341.1997338-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org Use beqzc instead of bnel. Checked with a mipsisa64r6el-n64-linux-gnu build and some nptl cancellation tests on qemu. --- sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S b/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S index f172041324..cfc0596b6a 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S +++ b/sysdeps/unix/sysv/linux/mips/mips64/syscall_cancel.S @@ -77,7 +77,11 @@ __syscall_cancel_arch_end: .set noreorder .set nomacro +#if __mips_isa_rev >= 6 + beqzc $7, 1f +#else bnel a3, zero, 1f +#endif SUBU v0, zero, v0 .set macro .set reorder