From nobody Sat Aug 19 21:49:00 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 4RSsnm6Ybdz4qFx1; Sat, 19 Aug 2023 21:49:00 +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 4RSsnm5l37z3NyT; Sat, 19 Aug 2023 21:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692481740; 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=BNZTvaSaPyunDZmY15tdil8vizoNfGr3c38YcVzLqLY=; b=u0408COD3np2niKsCogcQA+JaUBYsYklhzWU7X9jOag+WlE2JD8xFigxQd2e3obC34faPt A6DY5OGZqGtE5NrpKDbECSsfIHkwPwX3CGSKHdSwSKiQPB7+BIxKlgInBAqpySavmoRpM1 gnmxp6ssYb0zzuoDlGswLr9S+f0/VAAk9hJoT4ShCeej8IbmDDWqIp4KFEKRoY0JWH68Kr 3xmfjHeTOJ02HfeWQaG48sSbbD12Ue4P5RYCqtLRV8bEIy4Gz74mrD5wiQba9COSTk5+vu sYX+knflgDJnxussBRgV4XlRbhmp+gm06V2OYJAp0r2x8hqVIfJRSUSpOx0vtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692481740; 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=BNZTvaSaPyunDZmY15tdil8vizoNfGr3c38YcVzLqLY=; b=v9RvWnvRcj0aZoLbsmIJjStTijlACgsUcUtNqaJGYbAgw0DWVaozeGGZO7Xe0Z6r4HapE+ baW4wbQNYSUosjPGsdHrCl3knZ4mRASIC3oWEntnMvr5R7leedD3yIyAqZDqT0Kbx/DNPT RwcCjo+L5v8jWIJ2U2c6UMRJeqHbRl8fYN7cPXnI2ug7FojALOJLjXZ5nIpqgeB2AsMfYx /UhaqwaMOiykT5ET/IsQV42xyCm7hIMw4NC23fUKtHHE+EvJi24C26+TT52f8aJ9Jk3oYu Zx2qqrjvL7nQWDbuu48y2HB1U5I6GLsiMvGTph50LYOGM7231jfssX5SWCaAQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692481740; a=rsa-sha256; cv=none; b=KNhw/AOz1zCf6cCssiqB6kxJtQAqzMCpyzrwhKIVw9KMSV1sWMxRJNU8zQzYVH7OPpm1sg tH+sc5ruFRkfAbjJPKC7G3HH2qf7GrKhZOqE3z5Sbu6HMJ1v7nq5XZfyutP4elNRuMXaN7 Qjl4h28r63m3mcIVIc7gYkwaC0aPN0jCXZZkF0BUAnxMFb8KrIoQ0oiS2H67G5CHAHU/9z tbJ2/WaxZXi3NUx3Ofsl2sx8/xoiMtVUZFxeDRsDaDweO8dTcd20X/cngoe4Jihd2vVgfX n/HGBwTPxE9NEA0jq/8svo9L31Y/MJjB3377nTK4pUpfywzOy99+k8f2obwQtw== 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 4RSsnm4nk8z8G; Sat, 19 Aug 2023 21:49:00 +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 37JLn0PO067543; Sat, 19 Aug 2023 21:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JLn0eV067540; Sat, 19 Aug 2023 21:49:00 GMT (envelope-from git) Date: Sat, 19 Aug 2023 21:49:00 GMT Message-Id: <202308192149.37JLn0eV067540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a129642ced9e - main - 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/main X-Git-Reftype: branch X-Git-Commit: a129642ced9e6ceacf98c7663bc1178eb32a78be Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a129642ced9e6ceacf98c7663bc1178eb32a78be commit a129642ced9e6ceacf98c7663bc1178eb32a78be Author: Dmitry Chagin AuthorDate: 2023-08-19 21:48:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-19 21:48:36 +0000 linux(4): Fix linker warning about undefined vdso symbols Pointed out by: bz MFC after: 3 days --- 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));