From nobody Thu Feb 16 00:40:31 2023
X-Original-To: dev-commits-src-branches@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 4PHGM34c9bz3rYsM;
Thu, 16 Feb 2023 00:40:31 +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 4PHGM33GFFz432W;
Thu, 16 Feb 2023 00:40:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1676508031;
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=XJtVUp9G/vZIbXoh69s1iy2bt9IliZtZ+Tz+OmrshZM=;
b=LBP2i67UKkQfpVNgFz01qKphZDJSLf0/tDjyRpkd0mVivA1cMSaIuv9irwGkF2KepJVY9L
fud4uTD9kQA3k+2v6HfLsu91z0rfckOWyvSgv5s/vqsmo+zJm8QUv5tO9lBfz2JZ0XxBtv
cDuTnKhS1+fpwrakM2iSwICf3qiQaRuVo51WosezlK+rXylr/9GaxayHqjIHtnFxG22zOd
Gmlb3OKgBIG5BCF86VJPW2nY0VfG3DFYOxzjTpOau/N7aWFR8gIwhDYt0ifoMzcBClj9Oa
KrUBFYg+hczVFbwtWvfTgwCEK04NPuBwCTEn+0yb5q4zMO7ErNLZVW0OxHPkfg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1676508031;
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=XJtVUp9G/vZIbXoh69s1iy2bt9IliZtZ+Tz+OmrshZM=;
b=EZcNY7UD/CWPk49gFEyQBN+36LBYV8XaoTZldMuOBjFrh4dzn32YYuF4CCMMIj0DFfiuum
0w274Zsit9eTgnCqX6zrCq+6m3Pl6GD6qgWStd9bwTKfjZjJ3PmUe0np8ShyWMexNCgC/E
HDimtpo3ddrKMx7EbwUgGqWIje4YMY6qdXj/RGtbdtsvL8SoysxwutG1tkXe5AGccpHcRi
wiV+Z0HED7THsV9S4F5Xul338yF8XObssk9TPnFFIVn9Wcnet+ZQ1Do9b3fzsNdEqMp3pL
qydoSXhPMsC3pXFHNb72NIEyxswDQeSBEwyVjQcP3z6rFNOIfrYomTxiSuabDw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676508031; a=rsa-sha256; cv=none;
b=B3KQwxVfyLV88M1/ocZMnp9TqgWd1lIx1pZ4/UCaeWxP3VR4iPhL3bGZrRbIfnMX5ieR3h
tWkYKHzhiJkMUGSYB9e7R3vWkR0dihv1KcH7mimrMJytMwk+c8TXmgLfhXgrYeYZFXYKwn
yrRyq1kW91xYg7hYyRsKat1/xKNMI14aBKv8YR6NNgu3dRwhEo1FrSX+ocAGvi2OgFiydw
ZSUFf9IeMN8plDI12YEuNZXPOTKiUdm0RUybHd6tsRomQeCWMbPEFpzNT6EWOCQPphY4iB
IDZJ1/VO5mKr5Vh3Xnq94Hk1h5peih20fgw52k1QAD5BzDafo0Y7aUiGSIlp5A==
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 4PHGM32KYMzl1Y;
Thu, 16 Feb 2023 00:40:31 +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 31G0eVa5094026;
Thu, 16 Feb 2023 00:40:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G0eV6Z094025;
Thu, 16 Feb 2023 00:40:31 GMT
(envelope-from git)
Date: Thu, 16 Feb 2023 00:40:31 GMT
Message-Id: <202302160040.31G0eV6Z094025@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: b2accc5e0662 - stable/13 - amd64 ia32 vdso: always define some __vdso_ symbols
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b2accc5e0662b0818623666a3a7f51d05a4c4bdb
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b2accc5e0662b0818623666a3a7f51d05a4c4bdb
commit b2accc5e0662b0818623666a3a7f51d05a4c4bdb
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-02-05 21:41:25 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-02-16 00:40:12 +0000
amd64 ia32 vdso: always define some __vdso_ symbols
(cherry picked from commit ee844871206562c6aaaa14ee4576cb20895adb00)
---
sys/amd64/ia32/ia32_sigtramp.S | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/sys/amd64/ia32/ia32_sigtramp.S b/sys/amd64/ia32/ia32_sigtramp.S
index f7f3fd129cc7..7d873127e848 100644
--- a/sys/amd64/ia32/ia32_sigtramp.S
+++ b/sys/amd64/ia32/ia32_sigtramp.S
@@ -84,10 +84,10 @@ __vdso_ia32_sigcode:
jmp 1b
.cfi_endproc
-#ifdef COMPAT_FREEBSD4
ALIGN_TEXT
.globl __vdso_freebsd4_ia32_sigcode
__vdso_freebsd4_ia32_sigcode:
+#ifdef COMPAT_FREEBSD4
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */
pushl %eax
@@ -97,12 +97,14 @@ __vdso_freebsd4_ia32_sigcode:
/* on stack */
1:
jmp 1b
+#else
+ ud2
#endif
-#ifdef COMPAT_43
ALIGN_TEXT
.globl __vdso_ia32_osigcode
__vdso_ia32_osigcode:
+#ifdef COMPAT_43
calll *IA32_SIGF_HANDLER(%esp)/* call signal handler */
leal IA32_SIGF_SC(%esp),%eax /* get sigcontext */
pushl %eax
@@ -111,6 +113,9 @@ __vdso_ia32_osigcode:
int $0x80 /* enter kernel with args */
1:
jmp 1b
+#else
+ ud2
+#endif
/*
* Our lcall $7,$0 handler remains in user mode (ring 3), since lcalls
@@ -128,7 +133,10 @@ __vdso_ia32_osigcode:
ALIGN_TEXT
.globl __vdso_lcall_tramp
__vdso_lcall_tramp:
+#ifdef COMPAT_43
int $0x80
1: jmp 1b
+#else
+ ud2
#endif
.p2align 1