From nobody Thu Feb 9 02:37:11 2023 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 4PC1Gw1JMnz3nnnb; Thu, 9 Feb 2023 02:37:12 +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 4PC1Gw0VBGz3HZq; Thu, 9 Feb 2023 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675910232; 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=09DoxjcBtTDVICTD3fLtkw3iwYl2W5q2mDCB953hSmE=; b=CIK7u7A4PNo0O9b7pb204KaG/4jpt9/8ZVA1mrm2wf/9zTEruMMEnSzXwjDBioIt2blK2N bVxA5wVeRlWsAYFj+WX2GzNl/0EYMj8tBjCi3EKtukjUszxCunFf42STU1Gki2NSfPeYys 1ADEX2UuIu7qUoy0QkHUYyWk6ZVurf0vNny00NtXeM83/nq0SlJU7YhMRxJh/a4ozxoOs4 CpBAFH0MId1xnJ2ZB/gtTWye1Phy+Vke0vW3TygTyzxUplc1MYMfznc/hGRy1XVfXrjD63 RK0qznazvWpwJo6JGmneJbk7Y/XaQGk3Xn06xeVs5JUIQ/WrE1SvA/IJ5h8LBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675910232; 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=09DoxjcBtTDVICTD3fLtkw3iwYl2W5q2mDCB953hSmE=; b=Woud34+10xvfPmP0JMnQ5iSTqyp+IvM/AT+23tOppgWmbLFNnfh6yh+Cd9zhS9Sj9AsEwH jAwChCU0dEfPA5spXZQJOrYX6XUsU69Xpsllo/HQcwNXo0ogzYpVtIBm5ISbJSyLuzK93o ASnDac7qpeI8ivAmXS1JlN+ZuckIwQGOgNwstifjgq/ruAj/9MXhBlL26uL/w+Mhwu3UQT 5AQ9i8W7HfiUj0fCv1zfurdoAmo9bGJQHCzNOgAvO9TGsH0JJs5jVqr1c0IhGaUYZxjvmd pR8HNkdj/tQ9+6OGLL5F/jwXu/RDHHHIVnmBlBYys6/IUvrbxsrY1dCTwmBv2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675910232; a=rsa-sha256; cv=none; b=Y75ADTE91+pMby+uio4ggpAnvhu8kc0eb/G/MzK2bTfh0FdTxYsN5GuMFdJqyeX4ac31Yg TfRNygWpA01HYmRWAHtAMO5f+DZB1oBlkuLZwcRnuGzk3WnXIC5MGC/rEmqqTDJPEojWDp o5jHDUVCiL+ze+oDqK4tzYljOwc3HYCRwRpxke76lNyiq8IqAndDD+wJHKo+Yqu2O8wEYU AJoZ32h8bQi8Yzs1cYEkiNLY/cN/do0J8YMMavnlTWYltfQhf55FmavaHnEz6Hem4l8XgE lOljjA/iMBfewqdNXGVaz+fyM7DsLzTmMtNtGy/5zNq2Z9c4DZFEoS7MTU6w+Q== 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 4PC1Gv6VJ0zLXk; Thu, 9 Feb 2023 02:37:11 +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 3192bBjR037644; Thu, 9 Feb 2023 02:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3192bBIB037643; Thu, 9 Feb 2023 02:37:11 GMT (envelope-from git) Date: Thu, 9 Feb 2023 02:37:11 GMT Message-Id: <202302090237.3192bBIB037643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ee8448712065 - main - amd64 ia32 vdso: always define some __vdso_ symbols 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee844871206562c6aaaa14ee4576cb20895adb00 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ee844871206562c6aaaa14ee4576cb20895adb00 commit ee844871206562c6aaaa14ee4576cb20895adb00 Author: Konstantin Belousov AuthorDate: 2023-02-05 21:41:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-09 02:36:40 +0000 amd64 ia32 vdso: always define some __vdso_ symbols ... regardless of the kernel config options. It is reported that llvm16 ld.lld warns about undefined symbols referenced by the VERSION script. Reviewed by: emaste, val_packett.cool Discussed with: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38392 --- 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