From 808befbf9edb079c507de4a2f3427c1cb715fa4b Mon Sep 17 00:00:00 2001 From: Rajalakshmi Srinivasaraghavan Date: Thu, 4 May 2017 12:35:56 +0530 Subject: [PATCH] powerpc: Fix strncat ifunc selection Correct hwcap usage in strncat introduced by commit 249dcdb71b79e4c488a46c9027e0014c0bc27044. Tested on power7 and power8 systems --- ChangeLog | 5 +++++ sysdeps/powerpc/powerpc64/multiarch/strncat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 663324b078..80df538c18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-05-03 Rajalakshmi Srinivasaraghavan + + * sysdeps/powerpc/powerpc64/multiarch/strncat.c: Correct hwcap + variable name. + 2017-05-03 H.J. Lu [BZ #21391] diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat.c b/sysdeps/powerpc/powerpc64/multiarch/strncat.c index ba3fe5cac4..72f283354e 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncat.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncat.c @@ -26,7 +26,7 @@ extern __typeof (strncat) __strncat_power7 attribute_hidden; extern __typeof (strncat) __strncat_power8 attribute_hidden; libc_ifunc (strncat, - (hwcap & PPC_FEATURE2_ARCH_2_07) + (hwcap2 & PPC_FEATURE2_ARCH_2_07) ? __strncat_power8 : (hwcap & PPC_FEATURE_HAS_VSX) ? __strncat_power7 -- 2.34.1