S/390: Add support for STT_GNU_IFUNC symbols.

Add support for STT_GNU_IFUNC symbols and the new R_390_IRELATIVE
relocation.  Provide optimized version of memcpy, memset, and memcmp
for z10 and z196.

5 files changed, 387 insertions, 0 deletions

diff --git a/sysdeps/s390/s390-32/multiarch/Makefile b/sysdeps/s390/s390-32/multiarch/Makefile
new file mode 100644
index 0000000000..5b0cd49c72
--- /dev/null
+++ b/sysdeps/s390/s390-32/multiarch/Makefile
@@ -0,0 +1,9 @@
+ASFLAGS-.o += -Wa,-mzarch
+ASFLAGS-.os += -Wa,-mzarch
+ASFLAGS-.op += -Wa,-mzarch
+ASFLAGS-.og += -Wa,-mzarch
+ASFLAGS-.ob += -Wa,-mzarch
+ASFLAGS-.oS += -Wa,-mzarch
+ifeq ($(subdir),string)
+sysdep_routines += ifunc-resolve memset memcpy memcmp
+endif
diff --git a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
new file mode 100644
index 0000000000..fd6e367065
--- /dev/null
+++ b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
@@ -0,0 +1,69 @@
+/* IFUNC resolver function for CPU specific functions.
+   32 bit S/390 version.
+   Copyright (C) 2012 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 ... */
+
+#ifndef NOT_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");				\
+									\
+  extern void *FUNC##_z10;						\
+  extern void *FUNC##_z196;						\
+  extern void *FUNC##_g5;						\
+									\
+  void *resolve_##FUNC (unsigned long int dl_hwcap)			\
+  {									\
+    if ((dl_hwcap & HWCAP_S390_STFLE)					\
+	&& (dl_hwcap & HWCAP_S390_HIGH_GPRS)) /* Implies zarch */	\
+      {									\
+	/* We want just 1 double word to be returned.  */		\
+	register unsigned long reg0 asm("0") = 0;			\
+	unsigned long long stfle_bits;					\
+									\
+	asm volatile(".insn s,0xb2b00000,%0" "\n\t"  /* stfle */	\
+		     : "=QS" (stfle_bits), "+d" (reg0)			\
+		     : : "cc");						\
+									\
+	if ((stfle_bits & (1ULL << (63 - STFLE_BITS_Z196))) != 0)	\
+	  return &FUNC##_z196;						\
+	else if ((stfle_bits & (1ULL << (63 - STFLE_BITS_Z10))) != 0)	\
+	  return &FUNC##_z10;						\
+      }									\
+    return &FUNC##_g5;							\
+  }
+
+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-32/multiarch/memcmp.S b/sysdeps/s390/s390-32/multiarch/memcmp.S
new file mode 100644
index 0000000000..cd8ea86b0c
--- /dev/null
+++ b/sysdeps/s390/s390-32/multiarch/memcmp.S
@@ -0,0 +1,102 @@
+/* CPU specific memcmp implementations.  32 bit S/390 version.
+   Copyright (C) 2012 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 "sysdep.h"
+#include "asm-syntax.h"
+
+/* INPUT PARAMETERS
+     %r2 = address of first memory area
+     %r3 = address of second memory area
+     %r4 = number of bytes to compare.  */
+
+       .text
+
+#ifndef NOT_IN_libc
+
+ENTRY(memcmp_z196)
+	.machine "z196"
+        ltr     %r4,%r4
+        je      .L_Z196_4
+        ahi     %r4,-1
+        srlk    %r1,%r4,8
+        ltr     %r1,%r1
+        jne     .L_Z196_2
+.L_Z196_3:
+        exrl    %r4,.L_Z196_14
+.L_Z196_4:
+        ipm     %r2
+        sll     %r2,2
+        sra     %r2,30
+        br      %r14
+.L_Z196_17:
+        la      %r3,256(%r3)
+        la      %r2,256(%r2)
+        ahi     %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
+        sll     %r2,2
+        sra     %r2,30
+        br      %r14
+.L_Z196_14:
+        clc     0(1,%r3),0(%r2)
+END(memcmp_z196)
+
+ENTRY(memcmp_z10)
+	.machine "z10"
+        ltr     %r4,%r4
+        je      .L_Z10_4
+        ahi     %r4,-1
+        lr      %r1,%r4
+        srl     %r1,8
+        cijlh   %r1,0,.L_Z10_12
+.L_Z10_3:
+        exrl    %r4,.L_Z10_15
+.L_Z10_4:
+        ipm     %r2
+        sll     %r2,2
+        sra     %r2,30
+        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)
+        brct    %r1,.L_Z10_12
+        j       .L_Z10_3
+.L_Z10_15:
+        clc     0(1,%r3),0(%r2)
+END(memcmp_z10)
+
+#endif
+
+#include "../memcmp.S"
+
+#ifdef NOT_IN_libc
+.globl   memcmp
+.set     memcmp,memcmp_g5
+.weak    bcmp
+.set	 bcmp,memcmp_g5
+#endif
diff --git a/sysdeps/s390/s390-32/multiarch/memcpy.S b/sysdeps/s390/s390-32/multiarch/memcpy.S
new file mode 100644
index 0000000000..40f4acfbb6
--- /dev/null
+++ b/sysdeps/s390/s390-32/multiarch/memcpy.S
@@ -0,0 +1,96 @@
+/* CPU specific memcpy implementations.  32 bit S/390 version.
+   Copyright (C) 2012 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 "sysdep.h"
+#include "asm-syntax.h"
+
+/* INPUT PARAMETERS
+     %r2 = target operands address
+     %r3 = source operands address
+     %r4 = number of bytes to copy.  */
+
+       .text
+
+#if defined SHARED && !defined NOT_IN_libc
+
+ENTRY(memcpy_z196)
+	.machine "z196"
+        llgfr   %r4,%r4
+        ltgr    %r4,%r4
+        je      .L_Z196_4
+        aghi    %r4,-1
+        lr      %r1,%r2
+        srlg    %r5,%r4,8
+        ltgr    %r5,%r5
+        jne     .L_Z196_5
+.L_Z196_3:
+        exrl    %r4,.L_Z196_14
+.L_Z196_4:
+        br      %r14
+.L_Z196_5:
+        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
+.L_Z196_14:
+        mvc     0(1,%r1),0(%r3)
+END(memcpy_z196)
+
+ENTRY(memcpy_z10)
+	.machine "z10"
+        llgfr   %r4,%r4
+        cgije   %r4,0,.L_Z10_4
+        aghi    %r4,-1
+        lr      %r1,%r2
+        srlg    %r5,%r4,8
+        cgijlh  %r5,0,.L_Z10_13
+.L_Z10_3:
+        exrl    %r4,.L_Z10_15
+.L_Z10_4:
+        br      %r14
+.L_Z10_13:
+        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
+.L_Z10_15:
+        mvc     0(1,%r1),0(%r3)
+END(memcpy_z10)
+
+#endif
+
+#include "../memcpy.S"
+
+#if !defined SHARED || defined NOT_IN_libc
+.globl   memcpy
+.set     memcpy,memcpy_g5
+#endif
diff --git a/sysdeps/s390/s390-32/multiarch/memset.S b/sysdeps/s390/s390-32/multiarch/memset.S
new file mode 100644
index 0000000000..5ce7b4de83
--- /dev/null
+++ b/sysdeps/s390/s390-32/multiarch/memset.S
@@ -0,0 +1,111 @@
+/* Set a block of memory to some byte value.  32 bit S/390 version.
+   Copyright (C) 2012 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 "sysdep.h"
+#include "asm-syntax.h"
+
+/* INPUT PARAMETERS
+     %r2 = address of memory area
+     %r3 = byte to fill memory with
+     %r4 = number of bytes to fill.  */
+
+       .text
+
+#ifndef NOT_IN_libc
+
+ENTRY(memset_z196)
+	.machine "z196"
+        llgfr   %r4,%r4
+        ltgr    %r4,%r4
+        je      .L_Z196_4
+        stc     %r3,0(%r2)
+        lr      %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
+.L_Z196_4:
+        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
+.L_Z196_17:
+        mvc     1(1,%r1),0(%r1)
+END(memset_z196)
+
+ENTRY(memset_z10)
+	.machine "z10"
+        llgfr   %r4,%r4
+        cgije   %r4,0,.L_Z10_4
+        stc     %r3,0(%r2)
+        lr      %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
+.L_Z10_4:
+        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
+.L_Z10_18:
+        mvc     1(1,%r1),0(%r1)
+END(memset_z10)
+
+ENTRY(memset_mvcle)
+	ahi	%r4,2               # take back the change done by the caller
+	lr      %r0,%r2             # save source address
+	lr      %r1,%r3             # move pad byte to R1
+	lr      %r3,%r4
+	sr      %r4,%r4             # no source for MVCLE, only a pad byte
+	sr      %r5,%r5
+.L0:    mvcle   %r2,%r4,0(%r1)      # thats it, MVCLE is your friend
+	jo      .L0
+	lr      %r2,%r0             # return value is source address
+.L1:
+	br      %r14
+END(memset_mvcle)
+
+#endif
+
+#include "../memset.S"
+
+#ifdef NOT_IN_libc
+.globl   memset
+.set     memset,memset_g5
+#endif