This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 6/7] [PowerPC64] sysdep.h doesn't need to be included in multiarch files
On 25/10/2017 05:36, Alan Modra wrote:
> When the .c/.S file neither uses nor modifies macros defined in
> sysdep.h there is no point to #include it. The same goes for
> math_ldbl_opt.h except that it includes shlib-compat.h, and if
> compat_symbol is redefined we need to include shlib-compat.h first.
>
> * sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S: Don't
> include sysdep.h.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memset-power4.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memset-power6.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memset-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/memset-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S: Likewise.
>
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S: Don't
> include sysdep.h and math_ldbl_opt.h.
>
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S: Don't
> include sysdep.h and math_ldbl_opt.h. Include shlib-compat.h.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S: Likewise.
> * sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S: Likewise.
Looks straightforward.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S
> index 1e6cc51..c0c3adc 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef strong_alias
> #define strong_alias(a, b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S
> index bbea647..535298d 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S
> index c19bb42..ffff330 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S
> index 8e875ce..9ac2771 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S
> index c9d31da..e39dfc0 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
> index d59fbfa..7150c32 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
> index 3f4fbc9..f19f575 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
> @@ -17,8 +17,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S
> index ee00a2c..29a59e9 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c
> index 635624c..195db12 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a, b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
> index 9220383..8cdfc02 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S
> index fa878ab..686aa5a 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
> index 24f2460..33640b4 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
> index 5ec9a33..b842ab0 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
> index 8b621de..c7b3065 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
> index 3feea6e..84ab921 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
> @@ -16,9 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S
> index 33a7e3d..914d0d1 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S
> index b630696..3545e20 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S
> index 18d368a..5437565 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S
> index 7f0eae0..ec231ed 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S
> index aa28309..f59e839 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S
> index b67d58e..2db67b0 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S
> index 03151b3..db84dc0 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef hidden_def
> #define hidden_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S
> index fe2d4f1..f09e811 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
> index f9b1616..887b753 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S
> index b7f5276..69aed9c8 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
> index b92dafb..c8011a4 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
> index b8305ce..6be71aa 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(name, alias)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
> index 1145aff..d301d7d 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(name, alias)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S
> index 8d6190d..5a2a2a6 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(name, alias)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
> index 8e6f9ae..a2b3e38 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef compat_symbol
> #define compat_symbol(a,b,c,d)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S
> index 26d08a2..45de8e3 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
> index a7c7492..e5bcd92 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
> index 44a2b01..9751093 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
> index 81501a1..b8a142e 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
> index 8f3b24c..a6b6314 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S
> index 3d01533..aaf80e5 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a, b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c
> index b2ff032..2bd8054 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a, b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S
> index 53d8cd5..83ed3c2 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S
> index 36e8fd0..a3f3a19 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S
> @@ -16,8 +16,7 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -#include <math_ldbl_opt.h>
> +#include <shlib-compat.h>
>
> #undef weak_alias
> #define weak_alias(a,b)
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S
> index e28de7c..7c64ef5 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S
> index b60242d..f397c43 100644
> --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #undef weak_alias
> #define weak_alias(a,b)
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
> index fedca9c..bf6a8fd 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCHR __memchr_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S b/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S
> index 30f8fe7..10a8420 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCHR __memchr_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
> index e38b2a9..987e7d5 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCMP __memcmp_power4
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
> index a9cc979..ffea13e 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCMP __memcmp_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
> index b783703..41c291a 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCMP __memcmp_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S
> index a942287..795f32c 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCPY __memcpy_a2
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S
> index 39aa30c..448a9d6 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCPY __memcpy_cell
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S
> index 6e7fea3..768d835 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCPY __memcpy_power4
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S
> index 40bcdb1..9a0995f 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCPY __memcpy_power6
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S
> index 222936a..503be8c 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMCPY __memcpy_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
> index 2dc644c..3cac3de 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if defined SHARED && IS_IN (libc)
> # define MEMCPY __memcpy_ppc
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S
> index a9435fa..90816ce 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMMOVE __memmove_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S b/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S
> index 08f1336..d0eb400 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMPCPY __mempcpy_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
> index 052aa73..d35d8b3 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMRCHR __memrchr_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S b/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S
> index 0dcb9e7..469b129 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMRCHR __memrchr_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S b/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
> index 3908e8e..2031e14 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMSET __memset_power4
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S b/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
> index 4ddbd2e..2545ed8 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMSET __memset_power6
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
> index 97f686b..e707762 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMSET __memset_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S b/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S
> index ea30353..45149e1 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define MEMSET __memset_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S b/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
> index d79d728..c7bb422 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define RAWMEMCHR __rawmemchr_power7
>
> #include <sysdeps/powerpc/powerpc64/power7/rawmemchr.S>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S
> index 9353471..3baebfa 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STPCPY __stpcpy_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S b/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S
> index 6e6fa3e..e7ce628 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define USE_AS_STPNCPY
>
> #define STPNCPY __stpncpy_power7
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S b/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S
> index 9c71bb0..f8a0f29 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STPNCPY __stpncpy_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
> index 025c5a9..dc0f68d 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define __strcasecmp __strcasecmp_power7
> #undef weak_alias
> #define weak_alias(name, alias)
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S
> index 9b62476..49cf3ff 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define __strcasecmp __strcasecmp_power8
> #undef weak_alias
> #define weak_alias(name, alias)
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
> index 72121bc..6bad13a 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define __strcasecmp_l __strcasecmp_l_power7
>
> #undef weak_alias
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
> index 2cfb5ae..61025ce 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCASESTR __strcasestr_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S
> index e64c0b7..7505c44 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCHR __strchr_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S
> index bbda7b0..ca01f88 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCHR __strchr_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S
> index 769f9f0..3bef338 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #ifdef SHARED
> # define STRCHR __strchr_ppc
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
> index c8e2872..b934964 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCHRNUL __strchrnul_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S
> index 1cd39fc..e66cdfe 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCHRNUL __strchrnul_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S
> index 82d1b63..7ef0c91 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCMP __strcmp_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S
> index b0d2d37..ee4218c 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if IS_IN (libc)
> #define STRCMP __strcmp_power8
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S
> index 7a8488a..5cfee93 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if IS_IN (libc)
> #define STRCMP __strcmp_power9
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
> index 085e747..e4a63f5 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if defined SHARED && IS_IN (libc)
> # define STRCMP __strcmp_ppc
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S
> index 6c753b5..7c9378d 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRCPY __strcpy_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S
> index 39b4cd8..1320145 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRSPN __strcspn_power8
> #undef libc_hidden_builtin_def
> #define libc_hidden_builtin_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S
> index 333496e..067c298 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRLEN __strlen_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S
> index b4deea5..f7972ff 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRLEN __strlen_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
> index 13231b8..8d6cf52 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if defined SHARED && IS_IN (libc)
> # define STRLEN __strlen_ppc
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S
> index 8a24c34..3b5a8de 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define __strncasecmp __strncasecmp_power8
> #undef weak_alias
> #define weak_alias(name, alias)
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S
> index 01729a3..1385126 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S
> @@ -15,8 +15,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRNCMP __strncmp_power4
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S
> index a069d4b..32a5cfc 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S
> @@ -15,8 +15,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRNCMP __strncmp_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S
> index 49b7adf..5d8eeb4 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S
> @@ -15,8 +15,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if IS_IN (libc)
> #define STRNCMP __strncmp_power8
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S
> index e1a961c..52934cf 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S
> @@ -15,8 +15,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if IS_IN (libc)
> #define STRNCMP __strncmp_power9
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
> index e4b93ae..4d4210f 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
> @@ -15,8 +15,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #if defined SHARED && IS_IN (libc)
> # define STRNCMP __strncmp_ppc
>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S
> index a36e5dd..a65bb89 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRNCPY __strncpy_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S
> index 3edb2c6..3d16363 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRNCPY __strncpy_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
> index 2f0a183..3f6a005 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRNLEN __strnlen_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S
> index ccea15d..9ed0f91 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define __strnlen __strnlen_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S
> index 10bab2e..73602f4 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRRCHR __strrchr_power7
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S
> index 63080f5..51adbb0 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRRCHR __strrchr_power8
>
> #undef libc_hidden_builtin_def
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S
> index f8487f1..89e2e5b 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRSPN __strspn_power8
> #undef libc_hidden_builtin_def
> #define libc_hidden_builtin_def(name)
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S
> index 900d3be..82a0e4c 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S
> @@ -16,8 +16,6 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sysdep.h>
> -
> #define STRSTR __strstr_power7
>
> #undef libc_hidden_builtin_def
>