From 2e87c7d1582461044f8cd983fd9be121cf23803f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 7 Jun 2017 09:04:40 -0700 Subject: [PATCH] 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 * 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. --- 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 diff --git a/ChangeLog b/ChangeLog index 4c06d7ef85..1106110d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-06-07 H.J. Lu + + * 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 * 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 2b89231d63..0000000000 --- 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 - . */ - -#include - -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 5f74d2ce82..304f62eec3 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 + +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); -- 2.43.5