about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/x86_64/multiarch/ifunc-impl-list.c4
-rw-r--r--sysdeps/x86_64/multiarch/ifunc-wmemset.h (renamed from sysdeps/x86_64/multiarch/wmemset.h)0
-rw-r--r--sysdeps/x86_64/multiarch/wmemset.c2
-rw-r--r--sysdeps/x86_64/multiarch/wmemset_chk.c2
5 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 88483ae3aa..bbc21abb6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-06-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/multiarch/ifunc-impl-list.c: Update
+	comments.
+	* sysdeps/x86_64/multiarch/wmemset.c: Include ifunc-wmemset.h
+	instead of wmemset.h.
+	* sysdeps/x86_64/multiarch/wmemset_chk.c: Likewise.
+	* sysdeps/x86_64/multiarch/wmemset.h: Renamed to ...
+	* sysdeps/x86_64/multiarch/ifunc-wmemset.h: This.
+
 2017-06-07  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* stdio-common/printf-parsemb.c (__parse_one_specmb): Initialize
diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c
index ee4243a233..5627183aca 100644
--- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c
+++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c
@@ -315,7 +315,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __wmemcmp_ssse3)
 	      IFUNC_IMPL_ADD (array, i, wmemcmp, 1, __wmemcmp_sse2))
 
-  /* Support sysdeps/x86_64/multiarch/wmemset.S.  */
+  /* Support sysdeps/x86_64/multiarch/wmemset.c.  */
   IFUNC_IMPL (i, name, wmemset,
 	      IFUNC_IMPL_ADD (array, i, wmemset, 1,
 			      __wmemset_sse2_unaligned)
@@ -444,7 +444,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __strncmp_ssse3)
 	      IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_sse2))
 
-  /* Support sysdeps/x86_64/multiarch/wmemset_chk.S.  */
+  /* Support sysdeps/x86_64/multiarch/wmemset_chk.c.  */
   IFUNC_IMPL (i, name, __wmemset_chk,
 	      IFUNC_IMPL_ADD (array, i, __wmemset_chk, 1,
 			      __wmemset_chk_sse2_unaligned)
diff --git a/sysdeps/x86_64/multiarch/wmemset.h b/sysdeps/x86_64/multiarch/ifunc-wmemset.h
index d761985a47..d761985a47 100644
--- a/sysdeps/x86_64/multiarch/wmemset.h
+++ b/sysdeps/x86_64/multiarch/ifunc-wmemset.h
diff --git a/sysdeps/x86_64/multiarch/wmemset.c b/sysdeps/x86_64/multiarch/wmemset.c
index 61626a9e74..dd35be6e49 100644
--- a/sysdeps/x86_64/multiarch/wmemset.c
+++ b/sysdeps/x86_64/multiarch/wmemset.c
@@ -26,7 +26,7 @@
 # undef __wmemset
 
 # define SYMBOL_NAME wmemset
-# include "wmemset.h"
+# include "ifunc-wmemset.h"
 
 libc_ifunc_redirected (__redirect_wmemset, __wmemset, IFUNC_SELECTOR ());
 weak_alias (__wmemset, wmemset)
diff --git a/sysdeps/x86_64/multiarch/wmemset_chk.c b/sysdeps/x86_64/multiarch/wmemset_chk.c
index 2c039a5141..d3ded5595b 100644
--- a/sysdeps/x86_64/multiarch/wmemset_chk.c
+++ b/sysdeps/x86_64/multiarch/wmemset_chk.c
@@ -24,7 +24,7 @@
 # undef __wmemset_chk
 
 # define SYMBOL_NAME wmemset_chk
-# include "wmemset.h"
+# include "ifunc-wmemset.h"
 
 libc_ifunc_redirected (__redirect_wmemset_chk, __wmemset_chk,
 		       IFUNC_SELECTOR ());