diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h | 34 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h | 34 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/sysdep.S | 1 |
3 files changed, 41 insertions, 28 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h b/sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h index d59b885f15..9f2d58e2a8 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h @@ -39,29 +39,35 @@ typedef struct /* Type for a general-purpose register. */ typedef unsigned long greg_t; -#define NGREG 16 - -typedef greg_t gregset_t[NGREG]; +/* 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. This is needed for the + elf_prstatus structure. */ +#define NGREG 36 +/* Must match kernels psw_t alignment. */ +typedef greg_t gregset_t[NGREG] __attribute__ ((aligned(8))); typedef union -{ - double d; - float f; -} fpreg_t; + { + double d; + float f; + } fpreg_t; /* Register set for the floating-point registers. */ -typedef struct { - unsigned int fpc; - fpreg_t fprs[16]; -} fpregset_t; +typedef struct + { + unsigned int fpc; + fpreg_t fprs[16]; + } fpregset_t; /* Context to describe whole processor state. */ typedef struct { - __psw_t psw; - gregset_t gregs; + __psw_t psw; + unsigned long gregs[16]; unsigned int aregs[16]; - fpregset_t fpregs; + fpregset_t fpregs; } mcontext_t; /* Userlevel context. */ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h b/sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h index 6ce7c8a1ee..7402199d1f 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h @@ -39,29 +39,35 @@ typedef struct /* Type for a general-purpose register. */ typedef unsigned long greg_t; -#define NGREG 16 - -typedef greg_t gregset_t[NGREG]; +/* 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. This is needed for the + elf_prstatus structure. */ +#define NGREG 27 +/* Must match kernels psw_t alignment. */ +typedef greg_t gregset_t[NGREG] __attribute__ ((aligned(8))); typedef union -{ - double d; - float f; -} fpreg_t; + { + double d; + float f; + } fpreg_t; /* Register set for the floating-point registers. */ -typedef struct { - unsigned int fpc; - fpreg_t fprs[16]; -} fpregset_t; +typedef struct + { + unsigned int fpc; + fpreg_t fprs[16]; + } fpregset_t; /* Context to describe whole processor state. */ typedef struct { - __psw_t psw; - gregset_t gregs; + __psw_t psw; + unsigned long gregs[16]; unsigned int aregs[16]; - fpregset_t fpregs; + fpregset_t fpregs; } mcontext_t; /* Userlevel context. */ diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S index cd7aa81792..3f4b0dd0a2 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.S +++ b/sysdeps/unix/sysv/linux/sh/sysdep.S @@ -21,6 +21,7 @@ /* We define errno here, to be consistent with Linux/i386. */ .section .bss + .align 2 .globl C_SYMBOL_NAME(errno) .type C_SYMBOL_NAME(errno), @object .size C_SYMBOL_NAME(errno), 4 |