Update.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* shlib-versions: Add rule for Linux on 64 bit S/390.
	* sysdeps/s390/s390-64/pt-machine.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c: New file.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/s390/pt-machine.h: Move to...
	* sysdeps/s390/s390-32/pt-machine.h: ...here.
	Add defines for FLOATING_STACK and ARCH_STACK_MAX_SIZE.

3 files changed, 398 insertions, 0 deletions

diff --git a/linuxthreads/sysdeps/s390/s390-64/pt-machine.h b/linuxthreads/sysdeps/s390/s390-64/pt-machine.h
new file mode 100644
index 0000000..f205c12
--- /dev/null
+++ b/linuxthreads/sysdeps/s390/s390-64/pt-machine.h
@@ -0,0 +1,107 @@
+/* Machine-dependent pthreads configuration and inline functions.
+   64 bit S/390 version.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+   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 Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef PT_EI
+# define PT_EI extern inline
+#endif
+
+/* Spinlock implementation; required.  */
+PT_EI long int
+testandset (int *spinlock)
+{
+  int ret;
+
+  __asm__ __volatile__(
+       "    la    1,%1\n"
+       "    lhi   0,1\n"
+       "    l     %0,%1\n"
+       "0:  cs    %0,0,0(1)\n"
+       "    jl    0b"
+       : "=&d" (ret), "+m" (*spinlock)
+       : : "0", "1", "cc");
+
+  return ret;
+}
+
+
+/* Get some notion of the current stack.  Need not be exactly the top
+   of the stack, just something somewhere in the current frame.  */
+#define CURRENT_STACK_FRAME  stack_pointer
+register char * stack_pointer __asm__ ("15");
+
+/* Return the thread descriptor for the current thread.
+   64 bit S/390 uses access register 0 and 1 as "thread register".  */
+#define THREAD_SELF  ({                                                       \
+  register pthread_descr __self;                                              \
+  __asm__ ("   ear  %0,%%a0\n"                                                \
+           "   sllg %0,%0,32\n"                                               \
+           "   ear  %0,%%a1\n"                                                \
+           : "=d" (__self) );                                                 \
+  __self;                                                                     \
+})
+
+/* Initialize the thread-unique value.  */
+#define INIT_THREAD_SELF(descr, nr)  ({                                       \
+  __asm__ ("   sar  %%a1,%0\n"                                                \
+           "   srlg 0,%0,32\n"                                                \
+           "   sar  %%a0,0\n"                                                 \
+           : : "d" (descr) : "0" );                                           \
+})
+
+/* Access to data in the thread descriptor is easy.  */
+#define THREAD_GETMEM(descr, member) THREAD_SELF->member
+#define THREAD_GETMEM_NC(descr, member) THREAD_SELF->member
+#define THREAD_SETMEM(descr, member, value) THREAD_SELF->member = (value)
+#define THREAD_SETMEM_NC(descr, member, value) THREAD_SELF->member = (value)
+
+/* We want the OS to assign stack addresses.  */
+#define FLOATING_STACKS 1
+
+/* Maximum size of the stack if the rlimit is unlimited.  */
+#define ARCH_STACK_MAX_SIZE     8*1024*1024
+
+/* Compare-and-swap for semaphores. */
+
+#define HAS_COMPARE_AND_SWAP
+
+PT_EI int
+__compare_and_swap(long int *p, long int oldval, long int newval)
+{
+        int retval;
+
+        __asm__ __volatile__(
+                "  lgr  0,%2\n"
+                "  csg  0,%3,%1\n"
+                "  ipm  %0\n"
+                "  srl  %0,28\n"
+                "0:"
+                : "=&d" (retval), "+m" (*p)
+                : "d" (oldval) , "d" (newval)
+                : "cc", "0");
+        return retval == 0;
+}
+
+
+
+/* Get some notion of the current stack.  Need not be exactly the top
+   of the stack, just something somewhere in the current frame.  */
+#define CURRENT_STACK_FRAME  stack_pointer
+register char * stack_pointer __asm__ ("%r15");
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
new file mode 100644
index 0000000..8fccbcd
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
@@ -0,0 +1,154 @@
+/* Special .init and .fini section support for S/390.
+   Copyright (C) 2000, 2001 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 Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   In addition to the permissions in the GNU Library General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file with other
+   programs, and to distribute those programs without any restriction
+   coming from the use of this file.  (The Library General Public
+   License restrictions do apply in other respects; for example, they
+   cover modification of the file, and distribution when not linked
+   into another program.)
+
+   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 Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* This file is compiled into assembly code which is then munged by a sed
+   script into two files: crti.s and crtn.s.
+
+   * crti.s puts a function prologue at the beginning of the
+   .init and .fini sections and defines global symbols for
+   those addresses, so they can be called as functions.
+
+   * crtn.s puts the corresponding function epilogues
+   in the .init and .fini sections. */
+
+__asm__ ("
+
+#include \"defs.h\"
+
+/*@HEADER_ENDS*/
+
+/*@TESTS_BEGIN*/
+
+/*@TESTS_END*/
+
+/*@_init_PROLOG_BEGINS*/
+
+	.section .init
+#NO_APP
+	.align 4
+.globl _init
+	.type	 _init,@function
+_init:
+#	leaf function           0
+#	automatics              0
+#	outgoing args           0
+#	need frame pointer      0
+#	call alloca             0
+#	has varargs             0
+#	incoming args (stack)   0
+#	function length         36
+	STM	6,15,24(15)
+	BRAS	13,.LTN1_0
+.LT1_0:
+.LC13:
+	.long	__pthread_initialize_minimal@PLT-.LT1_0
+.LC14:
+	.long	__gmon_start__@GOT
+.LC15:
+	.long	_GLOBAL_OFFSET_TABLE_-.LT1_0
+.LTN1_0:
+	LR	1,15
+	AHI	15,-96
+	ST	1,0(15)
+	L	12,.LC15-.LT1_0(13)
+	AR	12,13
+	L     1,.LC13-.LT1_0(13)
+	LA    1,0(1,13)
+	BASR  14,1
+	L     1,.LC14-.LT1_0(13)
+	L     1,0(1,12)
+	LTR   1,1
+	JE    .L22
+	BASR  14,1
+.L22:
+#APP
+	.align 4,0x07
+	END_INIT
+
+/*@_init_PROLOG_ENDS*/
+
+/*@_init_EPILOG_BEGINS*/
+	.align 4
+	.section .init
+#NO_APP
+	.align 4
+	L	4,152(15)
+	LM	6,15,120(15)
+	BR	4
+#APP
+	END_INIT
+
+/*@_init_EPILOG_ENDS*/
+
+/*@_fini_PROLOG_BEGINS*/
+	.section .fini
+#NO_APP
+	.align 4
+.globl _fini
+	.type	 _fini,@function
+_fini:
+#	leaf function           0
+#	automatics              0
+#	outgoing args           0
+#	need frame pointer      0
+#	call alloca             0
+#	has varargs             0
+#	incoming args (stack)   0
+#	function length         30
+	STM	6,15,24(15)
+	BRAS	13,.LTN2_0
+.LT2_0:
+.LC17:
+	.long	_GLOBAL_OFFSET_TABLE_-.LT2_0
+.LTN2_0:
+	LR	1,15
+	AHI	15,-96
+	ST	1,0(15)
+	L	12,.LC17-.LT2_0(13)
+	AR	12,13
+#APP
+	.align 4,0x07
+	END_FINI
+
+/*@_fini_PROLOG_ENDS*/
+
+/*@_fini_EPILOG_BEGINS*/
+	.align 4
+	.section .fini
+#NO_APP
+	.align 4
+	L	4,152(15)
+	LM	6,15,120(15)
+	BR	4
+#APP
+	END_FINI
+
+/*@_fini_EPILOG_ENDS*/
+
+/*@TRAILER_BEGINS*/
+");
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
new file mode 100644
index 0000000..446a3ed
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
@@ -0,0 +1,137 @@
+/* Special .init and .fini section support for 64 bit S/390.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+   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 Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   In addition to the permissions in the GNU Library General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file with other
+   programs, and to distribute those programs without any restriction
+   coming from the use of this file.  (The Library General Public
+   License restrictions do apply in other respects; for example, they
+   cover modification of the file, and distribution when not linked
+   into another program.)
+
+   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 Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* This file is compiled into assembly code which is then munged by a sed
+   script into two files: crti.s and crtn.s.
+
+   * crti.s puts a function prologue at the beginning of the
+   .init and .fini sections and defines global symbols for
+   those addresses, so they can be called as functions.
+
+   * crtn.s puts the corresponding function epilogues
+   in the .init and .fini sections. */
+
+__asm__ ("
+
+#include \"defs.h\"
+
+/*@HEADER_ENDS*/
+
+/*@TESTS_BEGIN*/
+
+/*@TESTS_END*/
+
+/*@_init_PROLOG_BEGINS*/
+
+	.section .init
+#NO_APP
+	.align 4
+.globl _init
+	.type	 _init,@function
+_init:
+#	leaf function           0
+#	automatics              0
+#	outgoing args           0
+#	need frame pointer      0
+#	call alloca             0
+#	has varargs             0
+#	incoming args (stack)   0
+#	function length         36
+	STMG	6,15,48(15)
+	LGR	1,15
+	AGHI	15,-160
+	STG	1,0(15)
+	LARL	12,_GLOBAL_OFFSET_TABLE_
+	BRASL	14,__pthread_initialize_minimal@PLT
+	LARL	1,__gmon_start__@GOTENT
+	LG	1,0(1)
+	LTGR	1,1
+	JE	.L22
+	BASR	14,1
+.L22:
+#APP
+	.align 4,0x07
+	END_INIT
+
+/*@_init_PROLOG_ENDS*/
+
+/*@_init_EPILOG_BEGINS*/
+	.align 4
+	.section .init
+#NO_APP
+	.align 4
+	LG	4,272(15)
+	LMG	6,15,208(15)
+	BR	4
+#APP
+	END_INIT
+
+/*@_init_EPILOG_ENDS*/
+
+/*@_fini_PROLOG_BEGINS*/
+	.section .fini
+#NO_APP
+	.align 4
+.globl _fini
+	.type	 _fini,@function
+_fini:
+#	leaf function           0
+#	automatics              0
+#	outgoing args           0
+#	need frame pointer      0
+#	call alloca             0
+#	has varargs             0
+#	incoming args (stack)   0
+#	function length         30
+	STMG	6,15,48(15)
+	LGR	1,15
+	AGHI	15,-160
+	STG	1,0(15)
+	LARL	12,_GLOBAL_OFFSET_TABLE_
+#APP
+	.align 4,0x07
+	END_FINI
+
+/*@_fini_PROLOG_ENDS*/
+
+/*@_fini_EPILOG_BEGINS*/
+	.align 4
+	.section .fini
+#NO_APP
+	.align 4
+	LG	4,272(15)
+	LMG	6,15,208(15)
+	BR	4
+#APP
+	END_FINI
+
+/*@_fini_EPILOG_ENDS*/
+
+/*@TRAILER_BEGINS*/
+");