3 files changed, 41 insertions, 73 deletions

diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index a54784a977..637bffaafe 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -65,14 +65,18 @@
 #define F_SETFD		2	/* Set file descriptor flags.  */
 #define F_GETFL		3	/* Get file status flags.  */
 #define F_SETFL		4	/* Set file status flags.  */
+#ifndef __USE_FILE_OFFSET64
 #define F_GETLK		5	/* Get record locking info.  */
 #define F_SETLK		6	/* Set record locking info (non-blocking).  */
 #define F_SETLKW	7	/* Set record locking info (blocking).  */
-
-/* XXX missing */
-#define F_GETLK64	5	/* Get record locking info.  */
-#define F_SETLK64	6	/* Set record locking info (non-blocking).  */
-#define F_SETLKW64	7	/* Set record locking info (blocking).  */
+#else
+# define F_GETLK        F_GETLK64  /* Get record locking info.  */
+# define F_SETLK        F_SETLK64  /* Set record locking info (non-blocking).*/
+# define F_SETLKW       F_SETLKW64 /* Set record locking info (blocking).  */
+#endif
+#define F_GETLK64       12      /* Get record locking info.  */
+#define F_SETLK64       13      /* Set record locking info (non-blocking).  */
+#define F_SETLKW64      14      /* Set record locking info (blocking).  */
 
 #if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
diff --git a/sysdeps/unix/sysv/linux/s390/sys/procfs.h b/sysdeps/unix/sysv/linux/s390/sys/procfs.h
index ee00621489..8b60338cdb 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/procfs.h
@@ -32,31 +32,15 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/user.h>
+#include <sys/ucontext.h>
 
 __BEGIN_DECLS
 
-/* Type for a general-purpose register.  */
-typedef unsigned long elf_greg_t;
-
-/* And the whole bunch of them.  We should have used `struct s390_regs',
-   but to avoid name space pollution and since the tradition says that
-   the register set is an array, we make elf_gregset_t a simple array
-   that has the same size as s390_regs. */
-#define ELF_NGREG 35
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef union
-{
-  double  d;
-  float   f;
-} elf_fpreg_t;
-
-/* Register set for the floating-point registers.  */
-typedef struct {
-  unsigned int fpc;
-  elf_fpreg_t fprs[NUM_FPRS];
-} elf_fpregset_t;
-
+typedef greg_t elf_greg_t;
+#define ELF_NGREG NGREG
+typedef gregset_t elf_gregset_t;
+typedef fpreg_t   elf_fpreg_t;
+typedef fpregset_t elf_fpregset_t;
 
 /* Signal info.  */
 struct elf_siginfo
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
index 4723ce1810..b9ec8069b0 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
@@ -19,7 +19,9 @@
 
 #ifndef _SYS_UCONTEXT_H
 #define _SYS_UCONTEXT_H	1
-
+/* Forward definition to avoid parse errors */
+struct ucontext;
+typedef struct ucontext ucontext_t;
 #include <features.h>
 #include <signal.h>
 
@@ -28,62 +30,39 @@
 #include <bits/sigcontext.h>
 
 
-/* Type for general register.  */
-typedef int greg_t;
+/* Type for a general-purpose register.  */
+typedef unsigned long greg_t;
 
-/* Number of general registers.  */
-#define NGREG	16
+/* And the whole bunch of them.  We should have used `struct s390_regs',
+   but to avoid name space pollution and since the tradition says that
+   the register set is an array, we make gregset_t a simple array
+   that has the same size as s390_regs. */
+#define NGREG 36
+#define NUM_FPRS 16
+typedef greg_t gregset_t[NGREG];
 
-/* Number of each register is the `gregset_t' array.  */
-enum
+typedef union
 {
-  GPR0 = 0,
-#define GPR0 GPR0
-  GPR1,
-#define GPR1 GPR1
-  GPR2,
-#define GPR2 GPR2
-  GPR3,
-#define GPR3 GPR3
-  GPR4,
-#define GPR4 GPR4
-  GPR5,
-#define GPR5 GPR5
-  GPR6,
-#define GPR6 GPR6
-  GPR7,
-#define GPR7 GPR7
-  GPR8,
-#define GPR8 GPR8
-  GPR9,
-#define GPR9 GPR9
-  GPRA,
-#define GPRA GPRA
-  GPRB,
-#define GPRB GPRB
-  GPRC,
-#define GPRC GPRC
-  GPRD,
-#define GPRD GPRD
-  GPRE,
-#define GPRE GPRE
-  GPRF
-#define GPRF GPRF
-};
+  double  d;
+  float   f;
+} fpreg_t;
 
-/* Structure to describe FPU registers.  */
-typedef long long fpreg_t;
+/* Register set for the floating-point registers.  */
+typedef struct {
+  unsigned int fpc;
+  fpreg_t fprs[NUM_FPRS];
+} fpregset_t;
 
 /* Context to describe whole processor state.  */
 typedef struct
   {
     int version;
-    greg_t gregs[NGREG];
-    fpreg_t fpregs[16];
+    gregset_t    gregs;
+    fpregset_t   fpregs;
   } mcontext_t;
 
 /* Userlevel context.  */
-typedef struct ucontext
+struct ucontext
   {
     unsigned long int uc_flags;
     struct ucontext *uc_links;
@@ -91,6 +70,7 @@ typedef struct ucontext
     stack_t uc_stack;
     mcontext_t uc_mcontext;
     long int uc_filler[170];
-  } ucontext_t;
+  };
+
 
 #endif /* sys/ucontext.h */