git: 8c22fe46a50c - main - ia32_signal.h: Drop #ifdef's for old compat structures.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Jan 2022 01:44:22 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=8c22fe46a50c691dd20e52db7275cfa46cb8764d
commit 8c22fe46a50c691dd20e52db7275cfa46cb8764d
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-14 01:43:36 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-01-14 01:44:15 +0000
ia32_signal.h: Drop #ifdef's for old compat structures.
Requested by: kib
---
sys/compat/ia32/ia32_signal.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sys/compat/ia32/ia32_signal.h b/sys/compat/ia32/ia32_signal.h
index 1ff6d4eafa70..630ac0ff4a2d 100644
--- a/sys/compat/ia32/ia32_signal.h
+++ b/sys/compat/ia32/ia32_signal.h
@@ -88,7 +88,6 @@ struct ia32_ucontext {
uint32_t __spare__[4];
};
-#if defined(COMPAT_FREEBSD4)
struct ia32_freebsd4_mcontext {
uint32_t mc_onstack; /* XXX - sigcontext compat. */
uint32_t mc_gs; /* machine state (struct trapframe) */
@@ -121,9 +120,7 @@ struct ia32_freebsd4_ucontext {
struct sigaltstack32 uc_stack;
uint32_t __spare__[8];
};
-#endif
-#ifdef COMPAT_43
struct ia32_osigcontext {
uint32_t sc_onstack;
uint32_t sc_mask;
@@ -147,13 +144,11 @@ struct ia32_osigcontext {
uint32_t sc_trapno;
uint32_t sc_err;
};
-#endif
/*
* Signal frames, arguments passed to application signal handlers.
*/
-#ifdef COMPAT_FREEBSD4
struct ia32_freebsd4_sigframe {
uint32_t sf_signum;
uint32_t sf_siginfo; /* code or pointer to sf_si */
@@ -163,7 +158,6 @@ struct ia32_freebsd4_sigframe {
struct ia32_freebsd4_ucontext sf_uc; /* = *sf_ucontext */
struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
};
-#endif
struct ia32_sigframe {
uint32_t sf_signum;
@@ -176,7 +170,6 @@ struct ia32_sigframe {
struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
};
-#ifdef COMPAT_43
struct ia32_osiginfo {
struct ia32_osigcontext si_sc;
int si_signo;
@@ -191,7 +184,6 @@ struct ia32_osigframe {
uint32_t sf_ah; /* action/handler pointer */
struct ia32_osiginfo sf_siginfo;
};
-#endif
struct ksiginfo;
struct image_params;