GNU C Library master sources branch master updated. glibc-2.25-419-g2e87c7d

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  2e87c7d1582461044f8cd983fd9be121cf23803f (commit)
      from  8f0a947cf55f3b0c4ebdf06953c57eff67a22fa9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2e87c7d1582461044f8cd983fd9be121cf23803f

commit 2e87c7d1582461044f8cd983fd9be121cf23803f
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Jun 7 09:04:40 2017 -0700

    x86-64: Fold ifunc-sse4_1.h into wcsnlen.c
    
    Since ifunc-sse4_1.h is included only by wcsnlen.c, we can fold it
    into wcsnlen.c.  No code changes in wcsnlen.o.
    
    2017-06-07  H.J. Lu  <hongjiu.lu@intel.com>
    
    	* sysdeps/x86_64/multiarch/ifunc-sse4_1.h: Removed and folded
    	into ...
    	* sysdeps/x86_64/multiarch/wcsnlen.c: Here.  Don't include
    	ifunc-sse4_1.h.

diff --git a/ChangeLog b/ChangeLog
index 4c06d7e..1106110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/multiarch/ifunc-sse4_1.h: Removed and folded
+	into ...
+	* sysdeps/x86_64/multiarch/wcsnlen.c: Here.  Don't include
+	ifunc-sse4_1.h.
+
 2017-06-07  Arjun Shankar  <arjun.is@lostca.se>
 
 	* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal):
diff --git a/sysdeps/x86_64/multiarch/ifunc-sse4_1.h b/sysdeps/x86_64/multiarch/ifunc-sse4_1.h
deleted file mode 100644
index 2b89231..0000000
--- a/sysdeps/x86_64/multiarch/ifunc-sse4_1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Common definition for ifunc selections optimized with SSE2 and SSE4.1.
-   All versions must be listed in ifunc-impl-list.c.
-   Copyright (C) 2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <init-arch.h>
-
-extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden;
-extern __typeof (REDIRECT_NAME) OPTIMIZE (sse4_1) attribute_hidden;
-
-static inline void *
-IFUNC_SELECTOR (void)
-{
-  const struct cpu_features* cpu_features = __get_cpu_features ();
-
-  if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))
-    return OPTIMIZE (sse4_1);
-
-  return OPTIMIZE (sse2);
-}
diff --git a/sysdeps/x86_64/multiarch/wcsnlen.c b/sysdeps/x86_64/multiarch/wcsnlen.c
index 5f74d2c..304f62e 100644
--- a/sysdeps/x86_64/multiarch/wcsnlen.c
+++ b/sysdeps/x86_64/multiarch/wcsnlen.c
@@ -24,7 +24,21 @@
 # undef __wcsnlen
 
 # define SYMBOL_NAME wcsnlen
-# include "ifunc-sse4_1.h"
+# include <init-arch.h>
+
+extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden;
+extern __typeof (REDIRECT_NAME) OPTIMIZE (sse4_1) attribute_hidden;
+
+static inline void *
+IFUNC_SELECTOR (void)
+{
+  const struct cpu_features* cpu_features = __get_cpu_features ();
+
+  if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))
+    return OPTIMIZE (sse4_1);
+
+  return OPTIMIZE (sse2);
+}
 
 libc_ifunc_redirected (__redirect_wcsnlen, __wcsnlen, IFUNC_SELECTOR ());
 weak_alias (__wcsnlen, wcsnlen);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |    7 ++++++
 sysdeps/x86_64/multiarch/ifunc-sse4_1.h |   34 -------------------------------
 sysdeps/x86_64/multiarch/wcsnlen.c      |   16 +++++++++++++-
 3 files changed, 22 insertions(+), 35 deletions(-)
 delete mode 100644 sysdeps/x86_64/multiarch/ifunc-sse4_1.h


hooks/post-receive
-- 
GNU C Library master sources