From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 09/20] libcpu-rt-c/i386: Add memcmp
Date: Tue, 12 Jun 2018 22:20:00 -0000 [thread overview]
Message-ID: <20180612221939.19545-10-hjl.tools@gmail.com> (raw)
In-Reply-To: <20180612221939.19545-1-hjl.tools@gmail.com>
Add memcmp to i386 libcpu-rt-c so that libcpu-rt-c with tunables can be
built for i386.
* sysdeps/i386/Makefile (cpu-rt-c-routines): Add memcmp.
(vpath %.c $(..)string): New.
* sysdeps/i386/i686/multiarch/Makefile
(libcpu-rt-c-sysdep_routines): Add memcmp-ia32, memcmp-ssse3
and memcmp-sse4.
* sysdeps/i386/i686/multiarch/memcmp-ia32.S: Support libcpu-rt-c.
* sysdeps/i386/i686/multiarch/memcmp-sse4.S: Likewise.
* sysdeps/i386/i686/multiarch/memcmp-ssse3.S: Likewise.
* sysdeps/i386/i686/multiarch/memcmp.c: Likewise.
---
sysdeps/i386/Makefile | 7 +++++++
sysdeps/i386/i686/multiarch/Makefile | 4 ++++
sysdeps/i386/i686/multiarch/memcmp-ia32.S | 8 ++++++--
sysdeps/i386/i686/multiarch/memcmp-sse4.S | 2 +-
sysdeps/i386/i686/multiarch/memcmp-ssse3.S | 2 +-
sysdeps/i386/i686/multiarch/memcmp.c | 2 +-
6 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index 1682394e76..313c88d164 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -40,6 +40,13 @@ $(objpfx)tst-audit3.out: $(objpfx)tst-auditmod3b.so
tst-audit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod3b.so
endif
+ifeq ($(subdir),cpu-rt-c)
+cpu-rt-c-routines += memcmp
+
+# For the CPU run-time tests.
+vpath %.c $(..)string
+endif
+
ifeq ($(subdir),csu)
gen-as-const-headers += tlsdesc.sym
endif
diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile
index bf75a9947f..7cc686a8a2 100644
--- a/sysdeps/i386/i686/multiarch/Makefile
+++ b/sysdeps/i386/i686/multiarch/Makefile
@@ -53,3 +53,7 @@ ifeq ($(subdir),debug)
sysdep_routines += memcpy_chk-nonshared mempcpy_chk-nonshared \
memmove_chk-nonshared memset_chk-nonshared
endif
+
+ifeq ($(subdir),cpu-rt-c)
+libcpu-rt-c-sysdep_routines += memcmp-ia32 memcmp-ssse3 memcmp-sse4
+endif
diff --git a/sysdeps/i386/i686/multiarch/memcmp-ia32.S b/sysdeps/i386/i686/multiarch/memcmp-ia32.S
index b468350474..8dbf6ac640 100644
--- a/sysdeps/i386/i686/multiarch/memcmp-ia32.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-ia32.S
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if IS_IN (libc)
+#if IS_IN (libc) || IS_IN (libcpu_rt_c)
# define memcmp __memcmp_ia32
# ifdef SHARED
@@ -24,8 +24,12 @@
/* IFUNC doesn't work with the hidden functions in shared library since
they will be called without setting up EBX needed for PLT which is
used by IFUNC. */
-# define libc_hidden_builtin_def(name) \
+# if IS_IN (libcpu_rt_c)
+# define libc_hidden_builtin_def(name)
+# else
+# define libc_hidden_builtin_def(name) \
.globl __GI_memcmp; __GI_memcmp = memcmp
+# endif
# endif
# undef weak_alias
diff --git a/sysdeps/i386/i686/multiarch/memcmp-sse4.S b/sysdeps/i386/i686/multiarch/memcmp-sse4.S
index be37108987..55c37e5717 100644
--- a/sysdeps/i386/i686/multiarch/memcmp-sse4.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-sse4.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if IS_IN (libc)
+#if IS_IN (libc) || IS_IN (libcpu_rt_c)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memcmp-ssse3.S b/sysdeps/i386/i686/multiarch/memcmp-ssse3.S
index 31a0b2908e..088eb2b4ff 100644
--- a/sysdeps/i386/i686/multiarch/memcmp-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if IS_IN (libc)
+#if IS_IN (libc) || IS_IN (libcpu_rt_c)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memcmp.c b/sysdeps/i386/i686/multiarch/memcmp.c
index dd5a93a26c..58687e7603 100644
--- a/sysdeps/i386/i686/multiarch/memcmp.c
+++ b/sysdeps/i386/i686/multiarch/memcmp.c
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for the definition in libc. */
-#if IS_IN (libc)
+#if IS_IN (libc) || IS_IN (libcpu_rt_c)
# define memcmp __redirect_memcmp
# include <string.h>
# undef memcmp
--
2.17.1
next prev parent reply other threads:[~2018-06-12 22:19 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 22:19 [PATCH 00/20] RFC: Add the CPU run-time library for C H.J. Lu
2018-06-12 22:19 ` [PATCH 04/20] libcpu-rt-c/x86-64: Add memchr H.J. Lu
2018-06-12 22:19 ` [PATCH 07/20] libcpu-rt-c/x86-64: Add memrchr H.J. Lu
2018-06-12 22:19 ` [PATCH 08/20] libcpu-rt-c/x86-64: Add memset and wmemset H.J. Lu
2018-06-12 22:19 ` [PATCH 03/20] libcpu-rt-c/x86: Add cpu-rt-tunables.c H.J. Lu
2018-06-12 22:19 ` [PATCH 02/20] libcpu-rt-c/x86: Add cacheinfo H.J. Lu
2018-06-12 22:20 ` [PATCH 15/20] libcpu-rt-c/x86-64: Add strcat H.J. Lu
2018-06-12 22:20 ` [PATCH 16/20] libcpu-rt-c/x86-64: Add strnlen H.J. Lu
2018-06-12 22:20 ` [PATCH 11/20] libcpu-rt-c/x86-64: Add strchr H.J. Lu
2018-06-12 22:20 ` [PATCH 12/20] libcpu-rt-c/x86-64: Add strcmp H.J. Lu
2018-06-12 22:20 ` [PATCH 06/20] libcpu-rt-c/x86-64: Add memcpy, memmove and mempcpy H.J. Lu
2018-06-12 22:20 ` [PATCH 01/20] Initial empty CPU run-time library for C: libcpu-rt-c H.J. Lu
2018-06-12 23:21 ` Joseph Myers
2018-06-13 11:21 ` H.J. Lu
2018-06-12 22:20 ` [PATCH 20/20] libcpu-rt-c/x86-64: Add strrchr H.J. Lu
2018-06-12 22:20 ` [PATCH 05/20] libcpu-rt-c/x86-64: Add memcmp H.J. Lu
2018-06-12 22:20 ` H.J. Lu [this message]
2018-06-12 22:20 ` [PATCH 18/20] libcpu-rt-c/x86-64: Add strncmp H.J. Lu
2018-06-12 22:20 ` [PATCH 13/20] libcpu-rt-c/x86-64: Add strcpy H.J. Lu
2018-06-12 22:20 ` [PATCH 14/20] libcpu-rt-c/x86-64: Add strlen H.J. Lu
2018-06-12 22:20 ` [PATCH 17/20] libcpu-rt-c/x86-64: Add strncat H.J. Lu
2018-06-12 22:20 ` [PATCH 19/20] libcpu-rt-c/x86-64: Add strncpy H.J. Lu
2018-06-12 22:20 ` [PATCH 10/20] libcpu-rt-c: Don't use IFUNC memcmp in init_cpu_features H.J. Lu
2018-06-13 6:50 ` [PATCH 00/20] RFC: Add the CPU run-time library for C Florian Weimer
2018-06-13 10:14 ` H.J. Lu
2018-06-13 12:03 ` Adhemerval Zanella
2018-06-13 12:31 ` H.J. Lu
2018-06-13 13:25 ` Florian Weimer
2018-06-13 13:41 ` H.J. Lu
2018-06-13 14:20 ` Siddhesh Poyarekar
2018-06-18 13:42 ` Florian Weimer
2018-06-19 8:20 ` Siddhesh Poyarekar
2018-06-18 17:09 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180612221939.19545-10-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).