From nobody Tue Aug 22 09:19:01 2023 X-Original-To: dev-commits-src-all@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 4RVP1158LDz4qd3H; Tue, 22 Aug 2023 09:19:01 +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 4RVP114T17z4t3w; Tue, 22 Aug 2023 09:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692695941; 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=62oHkMQzxkgXIB6hJAHw5yq34VD2CUCRS187ZurNbgs=; b=vBvuOk5/fSd08wRkPe1fSfvrkUywYB3ziYKwCajuJAA+OJnroVj7xJheA/AeeoBSd3QhNo KWSaDyPnlMuy/eAW8wsYoUTmQFWzsRVw5lbzS8gNLQnUKjrzjLK5LmG1ywbfs14vVEH3Oi K2IFNA9PZXbdypx6I1ESUKRHcUnzLm38U0vqp6X446lO9ALygWhGVkAdGmonH/Eu+lHn4Q VhM2bseUYfCJFs/SjsuF0MVF++tv53EcPvxsJu6n1btpb/EgcBz3HMERVESQ2oC/8LpAUY WYbXl7qlAPxUu7coNQwziRVgvRQTBT0F88abXgBStUPhpp+t4iI+KdhEIgcskA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692695941; 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=62oHkMQzxkgXIB6hJAHw5yq34VD2CUCRS187ZurNbgs=; b=KyKjCWx7Ts5JWkLuqF41DYGkgmPpadpWnljU6tINilBijO7U59o8BQ+BcA8wt3Y5NcG0zg G/81VIlPRXEm2tW99JIhtfOtVShZvgy9eLTB5DNcfDDT3/1XXKEV5TUTdxFHTpZCzCW9UF +8tMMOOBUupnayWGS0drRdWI4YD3nUz1ZiP4Vpe9mdXlTQFrhRrHenSyUuqQdPFLiJArDG /sHM+9B+TJvtHgyMqGtci3LL1CY881plziRN19Ph/sa1Q5OP8kBUIQQlre5sS2xTeih35L c+jk6f45YAvwnJhaKdl7dro0cqayE2X+BJ87TBp1TILiPcssL+UhGl2hTKYQ7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692695941; a=rsa-sha256; cv=none; b=mX2XbQ5fY4KqX7fpwak2/EJes1SN/nzNh2AUYOwgdQBP/SEI4mouh36UJAVApuRrImx9v+ cxTv2aVk9m2dCOS1hXMAiABeXFqUB/YQomIj0T0PDkWDxAscYYicHldjlOaPOMJHCpJEj4 iIXnRrUX+rC1GgeRQDXLvjW4Pg9kl1ry/DrKS1ag0U8XLkGT1hat9Cr0XVp+CmoQ2OYOuK GnpiiuJA4897FFnghVF3EH8IR+TIBC94igmIu/6GJCQ/tLi07een24GCWozEzqP03SxEF4 JWx6E4EyqhlvvTzzhfPzg/M2nQLieqIhbPT/dgfBtXbNSidI8+V604DRQr15Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RVP113WRYzxj1; Tue, 22 Aug 2023 09:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M9J1gX007455; Tue, 22 Aug 2023 09:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M9J1lm007452; Tue, 22 Aug 2023 09:19:01 GMT (envelope-from git) Date: Tue, 22 Aug 2023 09:19:01 GMT Message-Id: <202308220919.37M9J1lm007452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: cb1883b03223 - stable/13 - linux(4): Fix linker warning about undefined vdso symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb1883b032233bb6e382efa9475d54502592b33d Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1883b032233bb6e382efa9475d54502592b33d commit cb1883b032233bb6e382efa9475d54502592b33d Author: Dmitry Chagin AuthorDate: 2023-08-19 21:48:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-22 09:18:48 +0000 linux(4): Fix linker warning about undefined vdso symbols Pointed out by: bz MFC after: 3 days (cherry picked from commit a129642ced9e6ceacf98c7663bc1178eb32a78be) --- sys/compat/linux/linux_vdso_gtod.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_vdso_gtod.inc b/sys/compat/linux/linux_vdso_gtod.inc index 05f19c67022a..e508f821725d 100644 --- a/sys/compat/linux/linux_vdso_gtod.inc +++ b/sys/compat/linux/linux_vdso_gtod.inc @@ -26,6 +26,14 @@ * SUCH DAMAGE. */ +#if defined(__aarch64__) +#define __VDSO_PREFIX __kernel +#else +#define __VDSO_PREFIX __vdso +#endif + +#define __vdsoN(x) __CONCAT(__CONCAT(__VDSO_PREFIX,_),x) + static int fls(int mask) { @@ -295,7 +303,7 @@ freebsd_clock_gettime(clockid_t clock_id, struct timespec *ts) * */ int -__vdso_clock_gettime(clockid_t clock_id, struct l_timespec *lts) +__vdsoN(clock_gettime)(clockid_t clock_id, struct l_timespec *lts) { struct timespec ts; clockid_t which; @@ -312,7 +320,7 @@ __vdso_clock_gettime(clockid_t clock_id, struct l_timespec *lts) } int -__vdso_gettimeofday(l_timeval *ltv, struct timezone *tz) +__vdsoN(gettimeofday)(l_timeval *ltv, struct timezone *tz) { struct timeval tv; int error; @@ -324,7 +332,7 @@ __vdso_gettimeofday(l_timeval *ltv, struct timezone *tz) } int -__vdso_clock_getres(clockid_t clock_id, struct l_timespec *lts) +__vdsoN(clock_getres)(clockid_t clock_id, struct l_timespec *lts) { return (__vdso_clock_getres_fallback(clock_id, lts));