From nobody Fri Jan 14 01:44:22 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 75593194D831; Fri, 14 Jan 2022 01:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZkcQ2phdz3MSD; Fri, 14 Jan 2022 01:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642124662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ktY6Z+YcPPWkMqixHowJe22PtlQBOVN3xodR5LVwEA=; b=MCDVgG9JUNt3hpZG1zTS7nP98EVoZiUEGVj6VjLMZdYHBsoznh50mqJqb2XVewF0mgpYQz 0f84MeO5Ri8Z4sNzWnfbW9yKtwCUrB312p4aWZXHAO+lx/m8XN11edmi3LuGx2s2bnrHf5 tyEzpdFU8RrOHDEHQu06YKLLF05hld96PXKvj458Rf/5vQJL/sFK2qrFJDUrOf2/m+ZiT6 NCGCYWkwpQLTgZxiLyI2p6Znfj9SYkWH+xf67hk8CA6RB/O0piQc4jLEf1imPNsRWMH6V8 w8uiaDdPIYSEEIx864VtFpTYkzKSMh9tkSYRnUZo2y1VDtuNgyAtz4vTc7LksA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40716303B; Fri, 14 Jan 2022 01:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20E1iMlf076837; Fri, 14 Jan 2022 01:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20E1iMbD076836; Fri, 14 Jan 2022 01:44:22 GMT (envelope-from git) Date: Fri, 14 Jan 2022 01:44:22 GMT Message-Id: <202201140144.20E1iMbD076836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8c22fe46a50c - main - ia32_signal.h: Drop #ifdef's for old compat structures. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c22fe46a50c691dd20e52db7275cfa46cb8764d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642124662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ktY6Z+YcPPWkMqixHowJe22PtlQBOVN3xodR5LVwEA=; b=bw831mXyyhyZ4e175dd9V3vnYEoAjYDQYmml2pMwVKm6VMtxq8fkefGHlk30G8cwyp1P4q bg2ozuZN3t7S46o70pLpHpPPaC1Ha0IvlGLKaxn6F/C+IEUMgX+TyYq8poeEWolD09NuyM w8VfHI/QJfFvV9hERHrtCVPYJsuWRyglNJt2IQmixRY/G+WVCCbc7r63RVKVuPjhSvMD1x GDVtPR5JGS02tBQL3YAEnX4Nm5qn6NvTIq1O76NuNhb/S5IAkatwJPmMQnzHtTnza/AOuA Y+MAzAq0MNKhZl++N/nRI8NPwkIUqVeW9AKMO7SVE3f7ye3SYsAxFsSVgquifA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642124662; a=rsa-sha256; cv=none; b=Lu/hq39ETl1XRA8Ia+mIRlgAGI7qEysMcgNKFhjg+EUMdxlVRvN3l8d6Su9RsbxS0rsKW4 FyimawYmqlw3PujiXP9PTMbqEyX+ghwxKj429dULZ7x6hJgXAHsncBodtmp5PCDJPbh/cd SLHYe5nB6X/ojMoQMHzxIiEu/CjwBaxzcOm8VOVT9Ypp5t7imYlTY0J1OGq4gpNI7Q5IEu B1+TQzeKHzk/Twi+UDWTwDLF0haN4MqSvYQnYY3J/uNOldE9JyJp1Fh4J8/CMJHMk2WVT6 6adFWEsZhYyJTKuDkYODpkbYcrwbQw1OnYa5m80MlgF1Kpbv2MXHtImsGB/yRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8c22fe46a50c691dd20e52db7275cfa46cb8764d commit 8c22fe46a50c691dd20e52db7275cfa46cb8764d Author: John Baldwin AuthorDate: 2022-01-14 01:43:36 +0000 Commit: John Baldwin 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;