S390: Refactor ifunc implementations and enable ifunc-test-framework.

On s390 all ifunc resolvers were implemented in multiarch/ifunc-resolve.c.
The resulting single object files has undefined references to all ifunc-functions.
This patch introduces one multiarch/<func>.c file for each of memcpy, memcmp
and memset with the function specific ifunc resolver. The different function
implementations are now implemented in multiarch/<func>-s390x.S
(moved from multiarch/<func>.S).

The new multiarch/ifunc-resolve.h file contains the ifunc-resolver macro
and other helper-macros. They are merged and are now used in common for
32/64bit. Therefore the __<func>_g5/__<func>_z900 functions were renamed to
__<func>_default.

This patch also enables testing the ifunc implementations by implementing
the function __libc_ifunc_impl_list. It uses the helper-macros of ifunc-resolve.h.

ChangeLog:

	* sysdeps/s390/s390-32/multiarch/Makefile (sysdep_routines):
	Remove ifunc-resolve, add memset-s390, memcpy-s390, memcmp-s390.
	* sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Delete File.
	* sysdeps/s390/s390-32/multiarch/memcmp.S: Move to ...
	* sysdeps/s390/s390-32/multiarch/memcmp-s390.S: ... here.
	(memcmp, bcmp): Use __memcmp_default as alias source.
	* sysdeps/s390/s390-32/multiarch/memcmp.c: New File.
	* sysdeps/s390/s390-32/memcmp.S (__memcmp_g5):
	Rename to __memcmp_default.
	* sysdeps/s390/s390-32/multiarch/memcpy.S: Move to ...
	* sysdeps/s390/s390-32/multiarch/memcpy-s390.S: ... here.
	(memcpy): Use __memcpy_default as alias source.
	* sysdeps/s390/s390-32/multiarch/memcpy.c: New File.
	* sysdeps/s390/s390-32/memcpy.S (__memcpy_g5):
	Rename to __memcpy_default.
	* sysdeps/s390/s390-32/multiarch/memset.S: Move to ...
	* sysdeps/s390/s390-32/multiarch/memset-s390.S: ... here.
	(memset): Use __memset_default as alias source.
	* sysdeps/s390/s390-32/multiarch/memset.c: New File.
	* sysdeps/s390/s390-32/memset.S (__memset_g5):
	Rename to __memset_default.
	* sysdeps/s390/s390-64/multiarch/Makefile (sysdep_routines):
	Remove ifunc-resolve, add memset-s390x, memcpy-s390x, memcmp-s390x.
	* sysdeps/s390/s390-64/multiarch/ifunc-resolve.c: Delete File.
	* sysdeps/s390/s390-64/multiarch/memcmp.S: Move to ...
	* sysdeps/s390/s390-64/multiarch/memcmp-s390x.S: ... here.
	(memcmp, bcmp): Use __memcmp_default as alias source.
	* sysdeps/s390/s390-64/multiarch/memcmp.c: New File.
	* sysdeps/s390/s390-64/memcmp.S (__memcmp_z900):
	Rename to __memcmp_default.
	* sysdeps/s390/s390-64/multiarch/memcpy.S: Move to ...
	* sysdeps/s390/s390-64/multiarch/memcpy-s390x.S: ... here.
	(memcpy): Use __memcpy_default as alias source.
	* sysdeps/s390/s390-64/multiarch/memcpy.c: New File.
	* sysdeps/s390/s390-64/memcpy.S (__memcpy_z900):
	Rename to __memcpy_default.
	* sysdeps/s390/s390-64/multiarch/memset.S: Move to ...
	* sysdeps/s390/s390-64/multiarch/memset-s390x.S: ... here.
	(memset): Use __memset_default as alias source.
	* sysdeps/s390/s390-64/multiarch/memset.c: New File.
	* sysdeps/s390/s390-64/memset.S (__memset_z900):
	Rename to __memset_default.
	* sysdeps/s390/multiarch/ifunc-resolve.h: New File.
	* sysdeps/s390/multiarch/ifunc-impl-list.c: New File.

8 files changed, 195 insertions, 199 deletions

diff --git a/sysdeps/s390/s390-64/multiarch/Makefile b/sysdeps/s390/s390-64/multiarch/Makefile
index 9baeecda64..91053b5364 100644
--- a/sysdeps/s390/s390-64/multiarch/Makefile
+++ b/sysdeps/s390/s390-64/multiarch/Makefile
@@ -1,3 +1,4 @@
 ifeq ($(subdir),string)
-sysdep_routines += ifunc-resolve memset memcpy memcmp
+sysdep_routines += memset memset-s390x memcpy memcpy-s390x \
+		   memcmp memcmp-s390x
 endif
diff --git a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
deleted file mode 100644
index b303304f31..0000000000
--- a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* IFUNC resolver function for CPU specific functions.
-   64 bit S/390 version.
-   Copyright (C) 2012-2015 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 <unistd.h>
-#include <dl-procinfo.h>
-
-#define STFLE_BITS_Z10  34 /* General instructions extension */
-#define STFLE_BITS_Z196 45 /* Distinct operands, pop ... */
-
-#if IS_IN (libc)
-
-#define IFUNC_RESOLVE(FUNC)						\
-  asm (".globl " #FUNC "\n\t"						\
-       ".type  " #FUNC ",@gnu_indirect_function\n\t"			\
-       ".set   " #FUNC ",__resolve_" #FUNC "\n\t"			\
-       ".globl __GI_" #FUNC "\n\t"					\
-       ".set   __GI_" #FUNC "," #FUNC "\n");				\
-									\
-  /* Make the declarations of the optimized functions hidden in order
-     to prevent GOT slots being generated for them. */			\
-  extern void *__##FUNC##_z196 attribute_hidden;			\
-  extern void *__##FUNC##_z10 attribute_hidden;				\
-  extern void *__##FUNC##_z900 attribute_hidden;			\
-									\
-  void *__resolve_##FUNC (unsigned long int dl_hwcap)			\
-  {									\
-    if (dl_hwcap & HWCAP_S390_STFLE)					\
-      {									\
-	/* We want just 1 double word to be returned.  */		\
-	register unsigned long reg0 asm("0") = 0;			\
-	unsigned long stfle_bits;					\
-									\
-	asm volatile(".machine push"        "\n\t"			\
-		     ".machine \"z9-109\""  "\n\t"			\
-		     "stfle %0"             "\n\t"			\
-		     ".machine pop"         "\n"			\
-		     : "=QS" (stfle_bits), "+d" (reg0)			\
-		     : : "cc");						\
-									\
-	if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z196))) != 0)	\
-	  return &__##FUNC##_z196;					\
-	else if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z10))) != 0)	\
-	  return &__##FUNC##_z10;					\
-	else								\
-	  return &__##FUNC##_z900;					\
-      }									\
-    else								\
-      return &__##FUNC##_z900;						\
-  }
-
-IFUNC_RESOLVE(memset)
-IFUNC_RESOLVE(memcmp)
-asm(".weak bcmp ; bcmp = memcmp");
-
-/* In the static lib memcpy is needed before the reloc is resolved.  */
-#ifdef SHARED
-IFUNC_RESOLVE(memcpy)
-#endif
-
-#endif
diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.S b/sysdeps/s390/s390-64/multiarch/memcmp-s390x.S
index 049847d9cf..b475ed4ec5 100644
--- a/sysdeps/s390/s390-64/multiarch/memcmp.S
+++ b/sysdeps/s390/s390-64/multiarch/memcmp-s390x.S
@@ -31,71 +31,71 @@
 
 ENTRY(__memcmp_z196)
 	.machine "z196"
-        ltgr    %r4,%r4
-        je      .L_Z196_4
-        aghi    %r4,-1
-        srlg    %r1,%r4,8
-        ltgr    %r1,%r1
-        jne     .L_Z196_2
+	ltgr    %r4,%r4
+	je      .L_Z196_4
+	aghi    %r4,-1
+	srlg    %r1,%r4,8
+	ltgr    %r1,%r1
+	jne     .L_Z196_2
 .L_Z196_3:
-        exrl    %r4,.L_Z196_14
+	exrl    %r4,.L_Z196_14
 .L_Z196_4:
-        ipm     %r2
-        sllg    %r2,%r2,34
-        srag    %r2,%r2,62
-        br      %r14
+	ipm     %r2
+	sllg    %r2,%r2,34
+	srag    %r2,%r2,62
+	br      %r14
 .L_Z196_17:
-        la      %r3,256(%r3)
-        la      %r2,256(%r2)
-        aghi    %r1,-1
-        je      .L_Z196_3
+	la      %r3,256(%r3)
+	la      %r2,256(%r2)
+	aghi    %r1,-1
+	je      .L_Z196_3
 .L_Z196_2:
-        pfd     1,512(%r3)
-        pfd     1,512(%r2)
-        clc     0(256,%r3),0(%r2)
-        je      .L_Z196_17
-        ipm     %r2
-        sllg    %r2,%r2,34
-        srag    %r2,%r2,62
-        br      %r14
+	pfd     1,512(%r3)
+	pfd     1,512(%r2)
+	clc     0(256,%r3),0(%r2)
+	je      .L_Z196_17
+	ipm     %r2
+	sllg    %r2,%r2,34
+	srag    %r2,%r2,62
+	br      %r14
 .L_Z196_14:
-        clc     0(1,%r3),0(%r2)
+	clc     0(1,%r3),0(%r2)
 END(__memcmp_z196)
 
 ENTRY(__memcmp_z10)
 	.machine "z10"
-        ltgr    %r4,%r4
-        je      .L_Z10_4
-        aghi    %r4,-1
-        srlg    %r1,%r4,8
-        cgijlh  %r1,0,.L_Z10_12
+	ltgr    %r4,%r4
+	je      .L_Z10_4
+	aghi    %r4,-1
+	srlg    %r1,%r4,8
+	cgijlh  %r1,0,.L_Z10_12
 .L_Z10_3:
-        exrl    %r4,.L_Z10_15
+	exrl    %r4,.L_Z10_15
 .L_Z10_4:
-        ipm     %r2
-        sllg    %r2,%r2,34
-        srag    %r2,%r2,62
-        br      %r14
+	ipm     %r2
+	sllg    %r2,%r2,34
+	srag    %r2,%r2,62
+	br      %r14
 .L_Z10_12:
-        pfd     1,512(%r3)
-        pfd     1,512(%r2)
-        clc     0(256,%r3),0(%r2)
-        jne     .L_Z10_4
-        la      %r3,256(%r3)
-        la      %r2,256(%r2)
-        brctg   %r1,.L_Z10_12
-        j       .L_Z10_3
+	pfd     1,512(%r3)
+	pfd     1,512(%r2)
+	clc     0(256,%r3),0(%r2)
+	jne     .L_Z10_4
+	la      %r3,256(%r3)
+	la      %r2,256(%r2)
+	brctg   %r1,.L_Z10_12
+	j       .L_Z10_3
 .L_Z10_15:
-        clc     0(1,%r3),0(%r2)
+	clc     0(1,%r3),0(%r2)
 END(__memcmp_z10)
 
-#endif
+#endif /* IS_IN (libc) */
 
 #include "../memcmp.S"
 
 #if !IS_IN (libc)
 .globl   memcmp
-.set     memcmp,__memcmp_z900
+.set     memcmp,__memcmp_default
 .weak    bcmp
-.set	 bcmp,__memcmp_z900
+.set	 bcmp,__memcmp_default
 #endif
diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.c b/sysdeps/s390/s390-64/multiarch/memcmp.c
new file mode 100644
index 0000000000..a3607e4472
--- /dev/null
+++ b/sysdeps/s390/s390-64/multiarch/memcmp.c
@@ -0,0 +1,24 @@
+/* Multiple versions of memcmp.
+   Copyright (C) 2015 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/>.  */
+
+#if IS_IN (libc)
+# include <ifunc-resolve.h>
+
+s390_libc_ifunc (memcmp)
+asm(".weak bcmp ; bcmp = memcmp");
+#endif
diff --git a/sysdeps/s390/s390-64/multiarch/memcpy.S b/sysdeps/s390/s390-64/multiarch/memcpy-s390x.S
index fc670c7ac4..4b0e6cb917 100644
--- a/sysdeps/s390/s390-64/multiarch/memcpy.S
+++ b/sysdeps/s390/s390-64/multiarch/memcpy-s390x.S
@@ -30,65 +30,65 @@
 #if defined SHARED && IS_IN (libc)
 
 ENTRY(__memcpy_z196)
-        .machine "z196"
-        ltgr    %r4,%r4
-        je      .L_Z196_4
-        aghi    %r4,-1
-        lgr     %r1,%r2
-        srlg    %r5,%r4,8
-        ltgr    %r5,%r5
-        jne     .L_Z196_5
+	.machine "z196"
+	ltgr    %r4,%r4
+	je      .L_Z196_4
+	aghi    %r4,-1
+	lgr     %r1,%r2
+	srlg    %r5,%r4,8
+	ltgr    %r5,%r5
+	jne     .L_Z196_5
 .L_Z196_3:
-        exrl    %r4,.L_Z196_14
+	exrl    %r4,.L_Z196_14
 .L_Z196_4:
-        br      %r14
+	br      %r14
 .L_Z196_5:
-        cgfi    %r5,262144      # Switch to mvcle for copies >64MB
-        jh      __memcpy_mvcle
+	cgfi    %r5,262144      # Switch to mvcle for copies >64MB
+	jh      __memcpy_mvcle
 .L_Z196_2:
-        pfd     1,768(%r3)
-        pfd     2,768(%r1)
-        mvc     0(256,%r1),0(%r3)
-        aghi    %r5,-1
-        la      %r1,256(%r1)
-        la      %r3,256(%r3)
-        jne     .L_Z196_2
-        j       .L_Z196_3
+	pfd     1,768(%r3)
+	pfd     2,768(%r1)
+	mvc     0(256,%r1),0(%r3)
+	aghi    %r5,-1
+	la      %r1,256(%r1)
+	la      %r3,256(%r3)
+	jne     .L_Z196_2
+	j       .L_Z196_3
 .L_Z196_14:
-        mvc     0(1,%r1),0(%r3)
+	mvc     0(1,%r1),0(%r3)
 END(__memcpy_z196)
 
 ENTRY(__memcpy_z10)
 	.machine "z10"
-        cgije   %r4,0,.L_Z10_4
-        aghi    %r4,-1
-        lgr     %r1,%r2
-        srlg    %r5,%r4,8
-        cgijlh  %r5,0,.L_Z10_13
+	cgije   %r4,0,.L_Z10_4
+	aghi    %r4,-1
+	lgr     %r1,%r2
+	srlg    %r5,%r4,8
+	cgijlh  %r5,0,.L_Z10_13
 .L_Z10_3:
-        exrl    %r4,.L_Z10_15
+	exrl    %r4,.L_Z10_15
 .L_Z10_4:
-        br      %r14
+	br      %r14
 .L_Z10_13:
-        cgfi    %r5,65535	# Switch to mvcle for copies >16MB
-        jh      __memcpy_mvcle
+	cgfi    %r5,65535	# Switch to mvcle for copies >16MB
+	jh      __memcpy_mvcle
 .L_Z10_12:
-        pfd     1,768(%r3)
-        pfd     2,768(%r1)
-        mvc     0(256,%r1),0(%r3)
-        la      %r1,256(%r1)
-        la      %r3,256(%r3)
-        brctg   %r5,.L_Z10_12
-        j       .L_Z10_3
+	pfd     1,768(%r3)
+	pfd     2,768(%r1)
+	mvc     0(256,%r1),0(%r3)
+	la      %r1,256(%r1)
+	la      %r3,256(%r3)
+	brctg   %r5,.L_Z10_12
+	j       .L_Z10_3
 .L_Z10_15:
-        mvc     0(1,%r1),0(%r3)
+	mvc     0(1,%r1),0(%r3)
 END(__memcpy_z10)
 
-#endif
+#endif /* SHARED && IS_IN (libc) */
 
 #include "../memcpy.S"
 
 #if !defined SHARED || !IS_IN (libc)
 .globl   memcpy
-.set     memcpy,__memcpy_z900
+.set     memcpy,__memcpy_default
 #endif
diff --git a/sysdeps/s390/s390-64/multiarch/memcpy.c b/sysdeps/s390/s390-64/multiarch/memcpy.c
new file mode 100644
index 0000000000..cf2068c4a0
--- /dev/null
+++ b/sysdeps/s390/s390-64/multiarch/memcpy.c
@@ -0,0 +1,24 @@
+/* Multiple versions of memcpy.
+   Copyright (C) 2015 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/>.  */
+
+/* In the static lib memcpy is needed before the reloc is resolved.  */
+#if defined SHARED && IS_IN (libc)
+# include <ifunc-resolve.h>
+
+s390_libc_ifunc (memcpy)
+#endif
diff --git a/sysdeps/s390/s390-64/multiarch/memset.S b/sysdeps/s390/s390-64/multiarch/memset-s390x.S
index 3ac110a7e0..241c128cda 100644
--- a/sysdeps/s390/s390-64/multiarch/memset.S
+++ b/sysdeps/s390/s390-64/multiarch/memset-s390x.S
@@ -31,58 +31,58 @@
 
 ENTRY(__memset_z196)
 	.machine "z196"
-        ltgr    %r4,%r4
-        je      .L_Z196_4
-        stc     %r3,0(%r2)
-        lgr     %r1,%r2
-        cghi    %r4,1
-        je      .L_Z196_4
-        aghi    %r4,-2
-        srlg    %r5,%r4,8
-        ltgr    %r5,%r5
-        jne     .L_Z196_1
+	ltgr    %r4,%r4
+	je      .L_Z196_4
+	stc     %r3,0(%r2)
+	lgr     %r1,%r2
+	cghi    %r4,1
+	je      .L_Z196_4
+	aghi    %r4,-2
+	srlg    %r5,%r4,8
+	ltgr    %r5,%r5
+	jne     .L_Z196_1
 .L_Z196_3:
-        exrl    %r4,.L_Z196_17
+	exrl    %r4,.L_Z196_17
 .L_Z196_4:
-        br      %r14
+	br      %r14
 .L_Z196_1:
 	cgfi	%r5,1048576
 	jh	__memset_mvcle	   # Switch to mvcle for >256MB
 .L_Z196_2:
-        pfd     2,1024(%r1)
-        mvc     1(256,%r1),0(%r1)
-        aghi    %r5,-1
-        la      %r1,256(%r1)
-        jne     .L_Z196_2
-        j       .L_Z196_3
+	pfd     2,1024(%r1)
+	mvc     1(256,%r1),0(%r1)
+	aghi    %r5,-1
+	la      %r1,256(%r1)
+	jne     .L_Z196_2
+	j       .L_Z196_3
 .L_Z196_17:
-        mvc     1(1,%r1),0(%r1)
+	mvc     1(1,%r1),0(%r1)
 END(__memset_z196)
 
 ENTRY(__memset_z10)
 	.machine "z10"
-        cgije   %r4,0,.L_Z10_4
-        stc     %r3,0(%r2)
-        lgr     %r1,%r2
-        cgije   %r4,1,.L_Z10_4
-        aghi    %r4,-2
-        srlg    %r5,%r4,8
-        cgijlh  %r5,0,.L_Z10_15
+	cgije   %r4,0,.L_Z10_4
+	stc     %r3,0(%r2)
+	lgr     %r1,%r2
+	cgije   %r4,1,.L_Z10_4
+	aghi    %r4,-2
+	srlg    %r5,%r4,8
+	cgijlh  %r5,0,.L_Z10_15
 .L_Z10_3:
-        exrl    %r4,.L_Z10_18
+	exrl    %r4,.L_Z10_18
 .L_Z10_4:
-        br      %r14
+	br      %r14
 .L_Z10_15:
 	cgfi	%r5,163840          # Switch to mvcle for >40MB
 	jh	__memset_mvcle
 .L_Z10_14:
-        pfd     2,1024(%r1)
-        mvc     1(256,%r1),0(%r1)
-        la      %r1,256(%r1)
-        brctg   %r5,.L_Z10_14
-        j       .L_Z10_3
+	pfd     2,1024(%r1)
+	mvc     1(256,%r1),0(%r1)
+	la      %r1,256(%r1)
+	brctg   %r5,.L_Z10_14
+	j       .L_Z10_3
 .L_Z10_18:
-        mvc     1(1,%r1),0(%r1)
+	mvc     1(1,%r1),0(%r1)
 END(__memset_z10)
 
 ENTRY(__memset_mvcle)
@@ -99,11 +99,11 @@ ENTRY(__memset_mvcle)
 	br	%r14
 END(__memset_mvcle)
 
-#endif
+#endif /* IS_IN (libc) */
 
 #include "../memset.S"
 
 #if !IS_IN (libc)
 .globl   memset
-.set     memset,__memset_z900
+.set     memset,__memset_default
 #endif
diff --git a/sysdeps/s390/s390-64/multiarch/memset.c b/sysdeps/s390/s390-64/multiarch/memset.c
new file mode 100644
index 0000000000..ae0568b63e
--- /dev/null
+++ b/sysdeps/s390/s390-64/multiarch/memset.c
@@ -0,0 +1,23 @@
+/* Multiple versions of memset.
+   Copyright (C) 2015 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/>.  */
+
+#if IS_IN (libc)
+# include <ifunc-resolve.h>
+
+s390_libc_ifunc (memset)
+#endif