02cfe04e36
Resolves: RHEL-15696 Includes two additional (well, 1.5) upstream patches to resolve roundeven redirects.
109 lines
2.6 KiB
Diff
109 lines
2.6 KiB
Diff
From c328d0152d4b14cca58407ec68143894c8863004 Mon Sep 17 00:00:00 2001
|
|
From: "H.J. Lu" <hjl.tools@gmail.com>
|
|
Date: Sat, 5 Feb 2022 11:52:33 -0800
|
|
Subject: [PATCH] x86_64/multiarch: Sort sysdep_routines and put one entry per
|
|
line
|
|
Content-type: text/plain; charset=UTF-8
|
|
|
|
Conflicts:
|
|
sysdeps/x86_64/multiarch/Makefile
|
|
(test order changed)
|
|
|
|
---
|
|
sysdeps/x86_64/multiarch/Makefile | 78 +++++++++++++++++++------------
|
|
1 file changed, 48 insertions(+), 30 deletions(-)
|
|
|
|
diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile
|
|
index 37d8d6f0..8c9e7812 100644
|
|
--- a/sysdeps/x86_64/multiarch/Makefile
|
|
+++ b/sysdeps/x86_64/multiarch/Makefile
|
|
@@ -132,37 +132,55 @@ CFLAGS-strspn-c.c += -msse4
|
|
endif
|
|
|
|
ifeq ($(subdir),wcsmbs)
|
|
-sysdep_routines += wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c \
|
|
- wmemcmp-avx2-movbe \
|
|
- wmemchr-sse2 wmemchr-avx2 \
|
|
- wcscmp-sse2 wcscmp-avx2 \
|
|
- wcsncmp-sse2 wcsncmp-avx2 \
|
|
- wcscpy-ssse3 wcscpy-c \
|
|
- wcschr-sse2 wcschr-avx2 \
|
|
- wcsrchr-sse2 wcsrchr-avx2 \
|
|
- wcslen-sse2 wcslen-sse4_1 wcslen-avx2 \
|
|
- wcsnlen-c wcsnlen-sse4_1 wcsnlen-avx2 \
|
|
- wcschr-avx2-rtm \
|
|
- wcscmp-avx2-rtm \
|
|
- wcslen-avx2-rtm \
|
|
- wcsncmp-avx2-rtm \
|
|
- wcsnlen-avx2-rtm \
|
|
- wcsrchr-avx2-rtm \
|
|
- wmemchr-avx2-rtm \
|
|
- wmemcmp-avx2-movbe-rtm \
|
|
- wcschr-evex \
|
|
- wcscmp-evex \
|
|
- wcslen-evex \
|
|
- wcsncmp-evex \
|
|
- wcsnlen-evex \
|
|
- wcsrchr-evex \
|
|
- wmemchr-evex \
|
|
- wmemcmp-evex-movbe \
|
|
- wmemchr-evex-rtm
|
|
+sysdep_routines += \
|
|
+ wcschr-avx2 \
|
|
+ wcschr-avx2-rtm \
|
|
+ wcschr-evex \
|
|
+ wcschr-sse2 \
|
|
+ wcscmp-avx2 \
|
|
+ wcscmp-avx2-rtm \
|
|
+ wcscmp-evex \
|
|
+ wcscmp-sse2 \
|
|
+ wcscpy-c \
|
|
+ wcscpy-ssse3 \
|
|
+ wcslen-avx2 \
|
|
+ wcslen-avx2-rtm \
|
|
+ wcslen-evex \
|
|
+ wcslen-sse2 \
|
|
+ wcslen-sse4_1 \
|
|
+ wcsncmp-avx2 \
|
|
+ wcsncmp-avx2-rtm \
|
|
+ wcsncmp-evex \
|
|
+ wcsncmp-sse2 \
|
|
+ wcsnlen-avx2 \
|
|
+ wcsnlen-avx2-rtm \
|
|
+ wcsnlen-c \
|
|
+ wcsnlen-evex \
|
|
+ wcsnlen-sse4_1 \
|
|
+ wcsrchr-avx2 \
|
|
+ wcsrchr-avx2-rtm \
|
|
+ wcsrchr-evex \
|
|
+ wcsrchr-sse2 \
|
|
+ wmemchr-avx2 \
|
|
+ wmemchr-avx2-rtm \
|
|
+ wmemchr-evex \
|
|
+ wmemchr-evex-rtm \
|
|
+ wmemchr-sse2 \
|
|
+ wmemcmp-avx2-movbe \
|
|
+ wmemcmp-avx2-movbe-rtm \
|
|
+ wmemcmp-c \
|
|
+ wmemcmp-evex-movbe \
|
|
+ wmemcmp-sse4 \
|
|
+ wmemcmp-ssse3 \
|
|
+# sysdep_routines
|
|
endif
|
|
|
|
ifeq ($(subdir),debug)
|
|
-sysdep_routines += memcpy_chk-nonshared mempcpy_chk-nonshared \
|
|
- memmove_chk-nonshared memset_chk-nonshared \
|
|
- wmemset_chk-nonshared
|
|
+sysdep_routines += \
|
|
+ memcpy_chk-nonshared \
|
|
+ memmove_chk-nonshared \
|
|
+ mempcpy_chk-nonshared \
|
|
+ memset_chk-nonshared \
|
|
+ wmemset_chk-nonshared \
|
|
+# sysdep_routines
|
|
endif
|
|
--
|
|
GitLab
|
|
|