about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/s390/s390-32/bits/setjmp.h6
-rw-r--r--sysdeps/s390/s390-64/bits/setjmp.h4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/bits/sigaction.h3
4 files changed, 9 insertions, 6 deletions
diff --git a/sysdeps/s390/s390-32/bits/setjmp.h b/sysdeps/s390/s390-32/bits/setjmp.h
index 07ca86574a..fa6e03b4be 100644
--- a/sysdeps/s390/s390-32/bits/setjmp.h
+++ b/sysdeps/s390/s390-32/bits/setjmp.h
@@ -36,10 +36,10 @@
 
 typedef struct {
     /* We save registers 6-15.  */
-    long int gregs[10];
+    long int __gregs[10];
 
     /* We save fpu registers 4 and 6.  */
-    long fpregs[4];
+    long __fpregs[4];
 } __jmp_buf[1];
 
 #endif
@@ -47,6 +47,6 @@ typedef struct {
 /* Test if longjmp to JMPBUF would unwind the frame
    containing a local variable at ADDRESS.  */
 #define _JMPBUF_UNWINDS(jmpbuf, address) \
-  ((int) (address) < (jmpbuf)->gregs[__JB_GPR15])
+  ((int) (address) < (jmpbuf)->__gregs[__JB_GPR15])
 
 #endif /* __S390_SETJMP_H__ */
diff --git a/sysdeps/s390/s390-64/bits/setjmp.h b/sysdeps/s390/s390-64/bits/setjmp.h
index 5e77572da3..4cb4d791e8 100644
--- a/sysdeps/s390/s390-64/bits/setjmp.h
+++ b/sysdeps/s390/s390-64/bits/setjmp.h
@@ -36,10 +36,10 @@
 
 typedef struct {
     /* We save registers 6-15.  */
-    long int gregs[10];
+    long int __gregs[10];
 
     /* We save fpu registers 4 and 6.  */
-    long fpregs[8];
+    long __fpregs[8];
 } __jmp_buf[1];
 
 #endif
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S b/sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S
index 35338aabd0..c0652cae83 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S
@@ -51,7 +51,7 @@ ENTRY(__mmap64)
 	svc	SYS_ify(mmap2)		/* Do the system call trap.  */
 
 #ifndef __ASSUME_MMAP2_SYSCALL
-	chi	%r0,-ENOSYS
+	chi	%r2,-ENOSYS
 	je	1f
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/bits/sigaction.h b/sysdeps/unix/sysv/linux/s390/s390-64/bits/sigaction.h
index fbbfd30b9a..43738b2654 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/bits/sigaction.h
@@ -43,6 +43,9 @@ struct sigaction
     /* Special flags.  */
     unsigned long int sa_flags;
 
+    /* Restore handler.  */
+    void (*sa_restorer) (void);
+
     /* Additional set of signals to be blocked.	 */
     __sigset_t sa_mask;
   };