From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <skpgkp2@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7852)
 id 0C1573857348; Tue, 17 May 2022 03:20:26 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C1573857348
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Sunil Pandey <skpgkp2@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/release/2.34/master] x86: Remove strpbrk-sse2.S and use the
 generic implementation
X-Act-Checkin: glibc
X-Git-Author: Noah Goldstein <goldstein.w.n@gmail.com>
X-Git-Refname: refs/heads/release/2.34/master
X-Git-Oldrev: 0dafa75e3c42994d0f23db62651d1802577272f2
X-Git-Newrev: 38115446558e6d0976299eb592ba7266681c27d5
Message-Id: <20220517032026.0C1573857348@sourceware.org>
Date: Tue, 17 May 2022 03:20:26 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 17 May 2022 03:20:26 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=38115446558e6d0976299eb592ba7266681c27d5

commit 38115446558e6d0976299eb592ba7266681c27d5
Author: Noah Goldstein <goldstein.w.n@gmail.com>
Date:   Wed Mar 23 16:57:27 2022 -0500

    x86: Remove strpbrk-sse2.S and use the generic implementation
    
    The generic implementation is faster (see strcspn commit).
    
    All string/memory tests pass.
    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
    
    (cherry picked from commit 653358535280a599382cb6c77538a187dac6a87f)

Diff:
---
 sysdeps/x86_64/multiarch/{strpbrk-sse2.S => strpbrk-sse2.c} | 7 +++----
 sysdeps/x86_64/strpbrk.S                                    | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sysdeps/x86_64/multiarch/strpbrk-sse2.S b/sysdeps/x86_64/multiarch/strpbrk-sse2.c
similarity index 87%
rename from sysdeps/x86_64/multiarch/strpbrk-sse2.S
rename to sysdeps/x86_64/multiarch/strpbrk-sse2.c
index c5b95d08ff..8a58f051c3 100644
--- a/sysdeps/x86_64/multiarch/strpbrk-sse2.S
+++ b/sysdeps/x86_64/multiarch/strpbrk-sse2.c
@@ -19,11 +19,10 @@
 #if IS_IN (libc)
 
 # include <sysdep.h>
-# define strcspn __strpbrk_sse2
+# define STRPBRK __strpbrk_sse2
 
 # undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(strpbrk)
+# define libc_hidden_builtin_def(STRPBRK)
 #endif
 
-#define USE_AS_STRPBRK
-#include <sysdeps/x86_64/strcspn.S>
+#include <string/strpbrk.c>
diff --git a/sysdeps/x86_64/strpbrk.S b/sysdeps/x86_64/strpbrk.S
deleted file mode 100644
index 21888a5b92..0000000000
--- a/sysdeps/x86_64/strpbrk.S
+++ /dev/null
@@ -1,3 +0,0 @@
-#define strcspn strpbrk
-#define USE_AS_STRPBRK
-#include <sysdeps/x86_64/strcspn.S>