From nobody Thu Mar 26 13:02:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fhP7n1sbVz6FWXl for ; Thu, 26 Mar 2026 13:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhP7n1HYYz3SKG for ; Thu, 26 Mar 2026 13:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774530149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NMSFUbHsExui3D6F1HmeFnr6O1QfccsCc66whqvBpI=; b=rOSezfCAvo1T9Y/DfdgrNhDlgaV65sjSDoWiIrfanzQATtQ60S3824vdLwdZeKv85FOQ+p fkZRFlztYVwUG3c0W6EogqU1Ti+pfXuvqH/4ZCHdSblJwV52ID+A+RkEAr8FolVwQ/i9X8 j956fOOmMckSMWB+U2/rWLZ+nl3+EC2V8aybLH8+377uGSrB+Z04TO2zCp+c5JjeG+al9i GU6lbUUjkFZXphI2qmLEa17AlAKueh9xP/UR8rw65eyZmPI/9yiNrcPDS8v6Wc53VWUoQ6 F4NWg1IXNtgRwV7dCXQkTzcBf3Xei2bKiKJ0q9Yx+QEz6uhEfwBQX9fx7KqqvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774530149; a=rsa-sha256; cv=none; b=ouHusiFETlIZ6+dw98pgFcU0Ugt9moBXYil1zrOMk2xJ8b8Djqi2sC5WxnKR2262F6iqGn iE/lfjCPvbNH4zpLNZPHUFI1MfH/FB0TMRcML0QSitQXAbQc3nH0RV2vIqDhG+VfmkXSl6 FywoRer9l7ckr8rrP3Gx769R2PvIS2AH2GLFplqE87afHs6dGoNj+Fmhj+QJcSRSxvQIA7 wEdnQmtpvnyPfor5SrCMpD0P6hgs+Zrco8cVcjpy6ZN2eTuOZapuih+snMk6db/vum3BXW EYpPnzZJXlh/96qG256vuPPgSvsIC2mFvWMEaZELB6CBtBAZX9+wMkNnMq6cmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774530149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NMSFUbHsExui3D6F1HmeFnr6O1QfccsCc66whqvBpI=; b=A4DYPzMIgL8sKL0qg0RmCzCbXiNKkXv6G/ad8Q/vDtarHNxeLMCFYc8WmTXdc5C+8mK2OG Mvjl3IthLwr3a1Tcy6lmEN3NlkAjRDGWud/0lGrpX1sMlNrvgeBztcr6nMY0aT62jMVihw 90mm6+kswf3B5zisyoZGHZMFtmCvK8VX1kXa8RBgsEf3dzNoq8sOmOtHpQ/uy4QSfl4RVA 5f87rVZ342tFw1bvx5F3zdygLU/6LKaPXQdMNBzHiKwjaUCz8SWVB1lzEJ1plogV9Qz+HB 0/Sj9jARbKWYmLfkgo+VUExCca2JmBYOUJI1u/xp/AFpWCz+4ben2oR1EQlR5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhP7n0szbztXl for ; Thu, 26 Mar 2026 13:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 441a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 13:02:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 23d651677391 - main - libc/amd64/strrchr.S: fix rebase error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23d6516773916d8f324bea51867b0713c476f379 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 13:02:24 +0000 Message-Id: <69c52e60.441a9.66701590@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=23d6516773916d8f324bea51867b0713c476f379 commit 23d6516773916d8f324bea51867b0713c476f379 Author: Robert Clausecker AuthorDate: 2026-03-26 13:00:21 +0000 Commit: Robert Clausecker CommitDate: 2026-03-26 13:01:57 +0000 libc/amd64/strrchr.S: fix rebase error I accidentally dropped a part of the patch on squash rebase. Should be fine now. Fixes: 253f15c016ca699906f78b8e522a3f7ed675929b PR: 293915 MFC after: 1 week --- lib/libc/amd64/string/strrchr.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/amd64/string/strrchr.S b/lib/libc/amd64/string/strrchr.S index 29587456752a..a22a821a1d4d 100644 --- a/lib/libc/amd64/string/strrchr.S +++ b/lib/libc/amd64/string/strrchr.S @@ -82,8 +82,8 @@ ARCHENTRY(strrchr, scalar) not %rcx # ~(str ^ c) and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) and %r9, %rcx # matches in str, not including junk bits - cmovnz %rdi, %r11 # if match found, update match vector - cmovnz %rcx, %r10 # ... and match pointer + cmovnz %rdi, %r10 # if match found, update match vector + cmovnz %rcx, %r11 # ... and match pointer add $8, %rdi # advance to next iteration mov %rsi, %rcx @@ -104,8 +104,8 @@ ARCHENTRY(strrchr, scalar) not %rcx # ~(str ^ c) and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) and %r9, %rcx # matches in str, not including junk bits - cmovnz %rdi, %r11 # if match found, update match vector - cmovnz %rcx, %r10 # ... and match pointer + cmovnz %rdi, %r10 # if match found, update match vector + cmovnz %rcx, %r11 # ... and match pointer tzcnt %r11, %rcx # location of last match lea -1(%r10), %rax # address of last character in vector shr $3, %ecx # as byte offset