02cfe04e36
Resolves: RHEL-15696 Includes two additional (well, 1.5) upstream patches to resolve roundeven redirects.
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From 653358535280a599382cb6c77538a187dac6a87f Mon Sep 17 00:00:00 2001
|
|
From: Noah Goldstein <goldstein.w.n@gmail.com>
|
|
Date: Wed, 23 Mar 2022 16:57:27 -0500
|
|
Subject: [PATCH] x86: Remove strpbrk-sse2.S and use the generic implementation
|
|
Content-type: text/plain; charset=UTF-8
|
|
|
|
The generic implementation is faster (see strcspn commit).
|
|
|
|
All string/memory tests pass.
|
|
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
|
|
---
|
|
.../x86_64/multiarch/{strpbrk-sse2.S => strpbrk-sse2.c} | 7 +++----
|
|
sysdeps/x86_64/strpbrk.S | 3 ---
|
|
2 files changed, 3 insertions(+), 7 deletions(-)
|
|
rename sysdeps/x86_64/multiarch/{strpbrk-sse2.S => strpbrk-sse2.c} (87%)
|
|
delete mode 100644 sysdeps/x86_64/strpbrk.S
|
|
|
|
Conflicts:
|
|
sysdeps/x86_64/multiarch/strpbrk-sse2.S
|
|
(copyright header)
|
|
|
|
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 3c6a74db..ec0b6fda 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 21888a5b..00000000
|
|
--- 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>
|
|
--
|
|
GitLab
|
|
|