diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-11-15 21:44:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-11-15 21:44:36 +0000 |
| commit | f07820b7d13846431bb1c291414b6286cc5f5cbf (patch) | |
| tree | b2f9fe242c04e800da2a4de3ee868fbc5e6351bc | |
| parent | 6ab707ba03605e11677e92db84fb65948c2fe908 (diff) | |
| download | glibc-f07820b7d13846431bb1c291414b6286cc5f5cbf.tar.gz glibc-f07820b7d13846431bb1c291414b6286cc5f5cbf.tar.xz glibc-f07820b7d13846431bb1c291414b6286cc5f5cbf.zip | |
Make SH ucontext always match current kernels.
As discussed in the thread starting at
<https://sourceware.org/ml/libc-alpha/2015-06/msg00657.html>, there
are various problems with the sigcontext / mcontext / ucontext
structures on SH. The soft-float SH4 case in fact does not build at
present, with errors processing
sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.sym with gen-as-const.awk
("error: 'mcontext_t {aka struct <anonymous>}' has no member named
'fpregs'").
Linux 4.8 (commit bbe6c77857c38f4acbdc4fc70399515226d1859a) moved to
always using the same sigcontext structure on SH, with room for
floating-point registers whether or not present on the processor.
This patch makes the glibc header match.
Tested (compilation only) for sh4-linux-gnu hard float, and in
conjunction with other fixes for soft float.
* sysdeps/unix/sysv/linux/sh/sys/ucontext.h [__SH4__ || __SH4A__]:
Make code unconditional.
[!(__SH4__ || __SH4A__)]: Remove conditional code.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/sys/ucontext.h | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 0badc3fed7..c52196e388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-11-15 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/sh/sys/ucontext.h [__SH4__ || __SH4A__]: + Make code unconditional. + [!(__SH4__ || __SH4A__)]: Remove conditional code. + 2016-11-15 Rical Jasan <ricaljasan@pacific.net> * manual/sysinfo.texi (S_APPEND): Delete. diff --git a/sysdeps/unix/sysv/linux/sh/sys/ucontext.h b/sysdeps/unix/sysv/linux/sh/sys/ucontext.h index 2c5fa0431c..4ee0b2872f 100644 --- a/sysdeps/unix/sysv/linux/sh/sys/ucontext.h +++ b/sysdeps/unix/sysv/linux/sh/sys/ucontext.h @@ -76,7 +76,6 @@ enum }; #endif -#if (defined(__SH4__) || defined(__SH4A__)) typedef int freg_t; /* Number of FPU registers. */ @@ -102,20 +101,6 @@ typedef struct unsigned int fpul; unsigned int ownedfp; } mcontext_t; -#else -/* Context to describe whole processor state. */ -typedef struct - { - unsigned int oldmask; - gregset_t gregs; - unsigned int pc; - unsigned int pr; - unsigned int sr; - unsigned int gbr; - unsigned int mach; - unsigned int macl; - } mcontext_t; -#endif /* __SH_FPU_ANY__ */ /* Userlevel context. */ typedef struct ucontext |