From nobody Sun Jul 23 11:45:29 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 4R81gt4hk3z4p7M3; Sun, 23 Jul 2023 11:45:30 +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 4R81gt2j2Tz4D2J; Sun, 23 Jul 2023 11:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690112730; 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=HU0Om8ZCyfmW6bO4c4rTAVk1EpLpAGfYa88Y+ScCKRE=; b=fAAd8ONdBCX0D3OhwE7PAuZl0Sg1d9wD5RXhcQWEFpCet+JA9/0B6Yu6S/DUwIyPZeXV2G DokTko0gJ3Iekg4Vcd3zec0eGSzvYFODPEQcE23wwnn5kGewHcL1xGHOvHk0+HWJHRgv8G jcd2KjM5s88wIQ9eKlcc5QxLXnP7lbapk+gtyuMjx3lPZcM+XD7KdW1h9WTSNQ4DmPRd7a 0zG9JzY2wgTXOaDYO40yQ9LzFEIFe7oMNg16gsvdHH74wcg8h/ASmnRmkm/d38bCkKnFYm m5HiMblMATRFffNNJTizsn8caeJVqHwMbAqymDeR68hryXLYXGZu8y/IwxFf6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690112730; 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=HU0Om8ZCyfmW6bO4c4rTAVk1EpLpAGfYa88Y+ScCKRE=; b=OdBBaqFojaDUZaV2+bistzwFCfx8/3E2izvqK+jJghPwq+gx5vr58PAiZ88dqbj2267LKD kbtoPkID4dD1ZajvY5/iP9J5aVGpOuLtVWUVkiJIuDijb5THYRymOX39vTi52mxuH0BlHR Dwtu+hl+wU74uDU0txAdVZXFmWjoeBBaMcOlqBQayvFlzrJkavBNRA2YZCa0ClSBqwBhQY Y4669lDyTBbFWjSzDwN0wAV2VID16D4LoDyrG9QECvclXY06gKz1T4cWp6LIekyvYZoFiA Er61gLeWiZXqVAYz4M9axoBVyQByK4ZS6BqKS6cWyQ+GJXvMhIogUjvLNaBIQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690112730; a=rsa-sha256; cv=none; b=cG3kLb7XalC/lB5LPPSIspm4ucMlHYp2cAeCFLQFQSO48pqX2HyXaL/LHCXdPy0+X8/ne5 nkn7Ngpvc9ueyU9qLYj+tNPCodMK+2jFAIEXksvUZi9iEljK4DOYzm2TzXK0pfNVnJzLyy UXSDGepwGHC4TW3PqelXDvJuCJI60iBFahf1KqsvUvAzaJwJyQSifcS6qZvtSKlV7/9GZv g8aUmrAK/BnMxDvMdqlF+PZp/PGVkR1IzFNN8e7ywYM0U54dBZzzqUJakPePETkDBOvINN 795pPx6tKI5cP2Z7Zu5yA/MGnxvskuDV5d688oCPtedXtIzH1NMMJkr9OkUb3w== 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 4R81gt09BhzbTN; Sun, 23 Jul 2023 11:45:30 +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 36NBjTvX096132; Sun, 23 Jul 2023 11:45:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NBjTHK096131; Sun, 23 Jul 2023 11:45:29 GMT (envelope-from git) Date: Sun, 23 Jul 2023 11:45:29 GMT Message-Id: <202307231145.36NBjTHK096131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b1be52209c42 - stable/13 - libthr: trigger library initialization on rwlock calls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: b1be52209c4237140d0755e1d7d3263ffc3543d2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b1be52209c4237140d0755e1d7d3263ffc3543d2 commit b1be52209c4237140d0755e1d7d3263ffc3543d2 Author: Konstantin Belousov AuthorDate: 2023-07-13 15:56:11 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-23 11:44:24 +0000 libthr: trigger library initialization on rwlock calls (cherry picked from commit ad056b5d35d9957b1bd023abeb6461601449b725) --- lib/libthr/thread/thr_rwlock.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index ab10431b9d41..a61eb35cbd31 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -163,6 +163,7 @@ int _thr_rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) { + _thr_check_init(); *rwlock = NULL; return (rwlock_init(rwlock, attr)); } @@ -231,6 +232,7 @@ rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) int _Tthr_rwlock_rdlock(pthread_rwlock_t *rwlock) { + _thr_check_init(); return (rwlock_rdlock_common(rwlock, NULL)); } @@ -238,21 +240,24 @@ int _pthread_rwlock_timedrdlock(pthread_rwlock_t * __restrict rwlock, const struct timespec * __restrict abstime) { + _thr_check_init(); return (rwlock_rdlock_common(rwlock, abstime)); } int _Tthr_rwlock_tryrdlock(pthread_rwlock_t *rwlock) { - struct pthread *curthread = _get_curthread(); + struct pthread *curthread; pthread_rwlock_t prwlock; int flags; int ret; + _thr_check_init(); ret = check_and_init_rwlock(rwlock, &prwlock); if (ret != 0) return (ret); + curthread = _get_curthread(); if (curthread->rdlock_count) { /* * To avoid having to track all the rdlocks held by @@ -280,14 +285,16 @@ _Tthr_rwlock_tryrdlock(pthread_rwlock_t *rwlock) int _Tthr_rwlock_trywrlock(pthread_rwlock_t *rwlock) { - struct pthread *curthread = _get_curthread(); + struct pthread *curthread; pthread_rwlock_t prwlock; int ret; + _thr_check_init(); ret = check_and_init_rwlock(rwlock, &prwlock); if (ret != 0) return (ret); + curthread = _get_curthread(); ret = _thr_rwlock_trywrlock(&prwlock->lock); if (ret == 0) prwlock->owner = TID(curthread); @@ -343,6 +350,7 @@ rwlock_wrlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) int _Tthr_rwlock_wrlock(pthread_rwlock_t *rwlock) { + _thr_check_init(); return (rwlock_wrlock_common(rwlock, NULL)); } @@ -350,6 +358,7 @@ int _pthread_rwlock_timedwrlock(pthread_rwlock_t * __restrict rwlock, const struct timespec * __restrict abstime) { + _thr_check_init(); return (rwlock_wrlock_common(rwlock, abstime)); } From nobody Sun Jul 23 11:45: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 4R81gv3BFqz4p7MD; Sun, 23 Jul 2023 11:45: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 4R81gv200zz4D4c; Sun, 23 Jul 2023 11:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690112731; 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=ufNu2ZdXp6+/JbctXAumYNfsHvGvmqLiGB9cDARrpcI=; b=QJbD8cSIkZQJMDN8wTMUK0yGuatkacnKgBRCkefIu5Yi220QMVK9qgviLMx+1+NBU6pEIe 1xClC+L3KcrfVF3ScZbqkJYCw85IEUYIPxI2Qe8pRRQ6y193i6mcUbM7JKC1k5V15aB10S XMpRsRwIvG77NzFO3sl1yCL/jFynhe/h36+qjvkOFeVLFvu88eihAFr5FZTV15CvPryRqv V5P5O8Y/Q6nqx9DGItI3NYQbDviJxHsfovZgt5MQcl7s+DWRj+dKOFRTbr/Dyri2MHZQa4 uHkMBdNiomr0G64Wa12L9bHed/gXQaQ1tUs+3zgVR+DKDHWJ6C8qLNQexRfE3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690112731; 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=ufNu2ZdXp6+/JbctXAumYNfsHvGvmqLiGB9cDARrpcI=; b=FCk2WRnULaIVH1Y3zEuKt4i9UqNzyX/IVPgHNNMk9xmbyiC0TsLIFNqBPanyb34DCa8Hm/ 7FE7+LyMWcJ8oRFoWJxJhMI9NG6I529JLeaMwdPCY2nCRVdRWghNrb9wuNL9oCQkLZkJfC keXsYOD6rmEH9kyTjzyT4xN3UjYwq7PH57b03cfxTF4rIlfNFVnD+fgk5mcdFlPUVzVZHN lOO9KMAnPN2jlh/O4kkjecBCoauFEmZwXcSFq8wG/9cQiyCBHMa1UhKpjBtMBu+LPwl2t2 nefbm6xPLTITctB+3guugZS1hCC5X5gn3gzb/7PRrQnFi04KUaTKBQKrGLVPHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690112731; a=rsa-sha256; cv=none; b=of/D45C8+P8nG+5SEzVY+sB4uwMHkGUKt/DaZePofbMOHZJhL0y/CDaAB874xMad5eaZra yQBdOqnTH7XuxWfJQk3w609DJVDow0yADomEjvc3CqfRczGZ4pPYvMV2O2VG0qAvxOs9tO nVWE9VlmCMd4L/MdATMDuVwM/5I4r2A6OUt5LrPkoBlxY1MxPOpR7RsUAhL5PNAcZL8wv9 vcuDtKtOrCBSoathw/4JkpuXt6eDGnbnGJMJJVFUa3hvhPp1Frfh6Im9TGjJ8oc3E6Ab1W IzpXB4W29YKU7Nq7B5DQCv4uBglpfUXAr5hcuE/7og2kAm31klXNe1+Net+Pdw== 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 4R81gv0p6TzZyX; Sun, 23 Jul 2023 11:45:31 +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 36NBjVfH096155; Sun, 23 Jul 2023 11:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NBjVrw096154; Sun, 23 Jul 2023 11:45:31 GMT (envelope-from git) Date: Sun, 23 Jul 2023 11:45:31 GMT Message-Id: <202307231145.36NBjVrw096154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b14d94c27ce2 - stable/13 - libm: correctly test for for NaN and Infinity in sinpi(), cospi(), and tanpi() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: b14d94c27ce2d5ca47193d99db51f516e74c2f74 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b14d94c27ce2d5ca47193d99db51f516e74c2f74 commit b14d94c27ce2d5ca47193d99db51f516e74c2f74 Author: Steve Kargl AuthorDate: 2023-07-17 05:19:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-23 11:44:24 +0000 libm: correctly test for for NaN and Infinity in sinpi(), cospi(), and tanpi() PR: 272539 (cherry picked from commit be4c7f273508994638b68d2fae742be37d3cb117) --- lib/msun/src/s_cospi.c | 3 ++- lib/msun/src/s_sinpi.c | 3 ++- lib/msun/src/s_tanpi.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/msun/src/s_cospi.c b/lib/msun/src/s_cospi.c index 860219efd3e4..2e2f92733a86 100644 --- a/lib/msun/src/s_cospi.c +++ b/lib/msun/src/s_cospi.c @@ -138,7 +138,8 @@ cospi(double x) return (j0 & 1 ? -c : c); } - if (ix >= 0x7f800000) + /* x = +-inf or nan. */ + if (ix >= 0x7ff00000) return (vzero / vzero); /* diff --git a/lib/msun/src/s_sinpi.c b/lib/msun/src/s_sinpi.c index 858459a5fcb4..bc3759e567a3 100644 --- a/lib/msun/src/s_sinpi.c +++ b/lib/msun/src/s_sinpi.c @@ -155,7 +155,8 @@ sinpi(double x) return ((hx & 0x80000000) ? -s : s); } - if (ix >= 0x7f800000) + /* x = +-inf or nan. */ + if (ix >= 0x7ff00000) return (vzero / vzero); /* diff --git a/lib/msun/src/s_tanpi.c b/lib/msun/src/s_tanpi.c index 01d4c74367fd..f911d56156b3 100644 --- a/lib/msun/src/s_tanpi.c +++ b/lib/msun/src/s_tanpi.c @@ -163,7 +163,7 @@ tanpi(double x) } /* x = +-inf or nan. */ - if (ix >= 0x7f800000) + if (ix >= 0x7ff00000) return (vzero / vzero); /* From nobody Sun Jul 23 18:26:46 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 4R8BZt3XBpz4p5yw; Sun, 23 Jul 2023 18:26:46 +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 4R8BZt34mcz3Qsr; Sun, 23 Jul 2023 18:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136806; 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=bbFH/1FWYH3SC/7QwIqAHudoXOQfL1wV/NA6STtC2zE=; b=MjDW3iySPIb5tkmaw7W4w8n6AnfqJznu/PZfSs5uAozj89rWLtb4GcNPr+zHf6nP6H5GP5 YMScBD0ZV8JnbDSybIdjG9JXBVIfWz2/fURrMTj+jj2Z4aQIp14KsYXJPdeIFNNPVIhdd/ pIF2OhWKItEKDCYf7wO3bEu7zvfYrqjLv5Mpy9w3PHToLgWz/aK2aPemD1gyLtb0SY/d64 FZsnV4a/CkSG6ddEnDtVkh/Alfpw3G9FCY5yw31AIBkuvTCAkkhsFjqVSjJK4mJlpgFQOU /CFCy2ZLXSmJ1SF/FWCKjiwO6XtuJy5ADAJtWXYcDhKXofGiO1nyIxfB8QKWMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136806; 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=bbFH/1FWYH3SC/7QwIqAHudoXOQfL1wV/NA6STtC2zE=; b=D70xZ+ZGI15wFl1okBHerZ6r2hfyQyGZ4HPhmSSXWmwwE/0Vyh4bcT8j4zH3wuNkXdn+GD /j+mF1yzWTCjGc916XcuahTfG5k56/7CYMSCK+JFHvUiWrNWWj+v4EU7yc/51QmMIQE0bO /oLdqpfvqoCVkilN3aosemk2WVxJ1ygOCfxIOTsWIqQuYh4JIJLas3QrLAELC/cnVezXQN wH23M7AnJ5sdT43JKSa1uJFtY2Ul1CRiKMdWLdIl+ueVI0KLXAuFGqHMiokX6QQLuYEUVI hfQcLwYPNZzD5XxD4ImsjbG/fVLwPwoNvkV0dv3q917lTZTDGc/OABWxTafJ9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136806; a=rsa-sha256; cv=none; b=JcLKvn1GRsg60eWQN6Ea7eiwU096Cg0AAf58BLzdTB3g1Jue6+uXTfNedng25BdZf5UryJ ZeL/kDCdm3ewNpPBLTt8DJ2lvQwOA+XKTZUguf+ZNVVN8JuQAs1k/eNuI/EHnIk6ybN6Lm ghPqJjc78NhGKFElOgOjQkIuxCN+XjC4QZpil3oljVDAowcYFOOXxv+s6KV3JVpmUVdOln CkheArixrm3u78bWBy4FLzQlUcwP8sKsipRGYyhSVD5GgktYsYOF+ht62EFe2CAV/txX5c bD5bfw5t/J2t5szrwlPQG/XninEngK0MGQPnSLedRqgjWFdKlgmzWUoz+sgGVA== 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 4R8BZt27g2zmkp; Sun, 23 Jul 2023 18:26:46 +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 36NIQkvE058579; Sun, 23 Jul 2023 18:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIQknl058578; Sun, 23 Jul 2023 18:26:46 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:26:46 GMT Message-Id: <202307231826.36NIQknl058578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 814cfa6ad43c - stable/13 - libarchive: make single bit bitfields unsigned to avoid clang 16 warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 814cfa6ad43c73de9b8030f241f516dad3f669ef Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=814cfa6ad43c73de9b8030f241f516dad3f669ef commit 814cfa6ad43c73de9b8030f241f516dad3f669ef Author: Dimitry Andric AuthorDate: 2023-04-17 16:20:56 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:06 +0000 libarchive: make single bit bitfields unsigned to avoid clang 16 warning Clang 16 introduced a warning about single bit bitfields in structs, which is triggered by various declarations in libarchive: contrib/libarchive/libarchive/archive_write_set_format_7zip.c:1541:13: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] file->dir = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:5127:15: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->dir = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:5213:14: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->dir = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:5214:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->virtual = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7149:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->virtual = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7435:32: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.detect_magic = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7495:25: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.making = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7496:26: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.allzero = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7702:28: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.allzero = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7871:25: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] zisofs->header_passed = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7894:24: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] zisofs->initialized = 1; ^ ~ Signed one-bit bitfields can only have values -1 and 0, but the intent here is to use the fields as booleans, so make them unsigned. This has also been sent upstream. MFC after: 3 days (cherry picked from commit 67ecab6f50ff29e9bda340be1e9d2acc963c9a2b) --- .../libarchive/libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_iso9660.c | 14 +++++++------- .../libarchive/libarchive/archive_write_set_format_xar.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_7zip.c b/contrib/libarchive/libarchive/archive_write_set_format_7zip.c index d5ca9a665654..f4b34685d3d0 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_7zip.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_7zip.c @@ -165,7 +165,7 @@ struct file { mode_t mode; uint32_t crc32; - signed int dir:1; + unsigned int dir:1; }; struct _7zip { diff --git a/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c b/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c index 58b7216a8071..b3e41d4ab997 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c @@ -289,12 +289,12 @@ struct isoent { struct extr_rec *current; } extr_rec_list; - signed int virtual:1; + unsigned int virtual:1; /* If set to one, this file type is a directory. * A convenience flag to be used as * "archive_entry_filetype(isoent->file->entry) == AE_IFDIR". */ - signed int dir:1; + unsigned int dir:1; }; struct hardlink { @@ -755,9 +755,9 @@ struct iso9660 { /* Used for making zisofs. */ struct { - signed int detect_magic:1; - signed int making:1; - signed int allzero:1; + unsigned int detect_magic:1; + unsigned int making:1; + unsigned int allzero:1; unsigned char magic_buffer[64]; int magic_cnt; @@ -7802,8 +7802,8 @@ struct zisofs_extract { uint64_t pz_uncompressed_size; size_t uncompressed_buffer_size; - signed int initialized:1; - signed int header_passed:1; + unsigned int initialized:1; + unsigned int header_passed:1; uint32_t pz_offset; unsigned char *block_pointers; diff --git a/contrib/libarchive/libarchive/archive_write_set_format_xar.c b/contrib/libarchive/libarchive/archive_write_set_format_xar.c index d885f5c256d3..9d5e5dd41cbb 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_xar.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_xar.c @@ -212,8 +212,8 @@ struct file { struct heap_data data; struct archive_string script; - signed int virtual:1; - signed int dir:1; + unsigned int virtual:1; + unsigned int dir:1; }; struct hardlink { From nobody Sun Jul 23 18:26:47 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 4R8Bb873pMz4p5wt; Sun, 23 Jul 2023 18:27: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 4R8Bb86mXqz3RBL; Sun, 23 Jul 2023 18:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136820; 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=wP2CoPG5ObeW7PRs+KpR9Lc9l4ObAcKbJD/Ymh+YGAk=; b=v4GcuZRimjtldwkhyT7XpILMq+0/GhnQwt/e6V5VsfOiR9QBHq+bmJlqQslJUdPD9PlvAr rRCEJ6AHgApUsAQkJu92oglP3yB1Z3wWj2a9i9/plhpMEMWmUt3qnRnRYIUifpM0oBDWDk dUj6JgTPSzzky8wKZJtif3zxWfDojAsvXGhS3p3AhhDD813y7naOu7vaxK7vOppK2DQmGG Dhkn7vbaA/DGop7IHfzKWZnfpuhVzpsUMtQgbHg3uf2AgOKNYcwahCWBSFkFS8KQxGL2a7 uFRfnwBpsJ2aKYpV53GtoEgnR+RXR6qDQkSfM7t7qlLixxcp9OauouOEgcRs+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136820; 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=wP2CoPG5ObeW7PRs+KpR9Lc9l4ObAcKbJD/Ymh+YGAk=; b=kidJ+NMfr/UUPPyfvuFGveXq7n7prMlVZZpTqbMtyMsJUtEZN3ZS1mmi/5sRDyQcuI2irO 9fZZzMuQMuyxy7dCZfOiyCk4LusWZE1IdFv1NrWX5tgnWR9lXT3XK1SpHl0w1wtMBFafhZ 8wx82cotTkOv9Qp8Z7BxW99aWiq/6YFTIruT/BlZ3BqGKeyE267LHe8yxrFFZuBA+UwL+1 UFZSfxtf0dbQRQhhKwLtURQUqPmocyEvk+O0syzwhx1sO63BmGseQdWMUP9+msGMOqlSc6 68dn86suOC8/zYZ5ipg26vVZvsvkKvD9opeMVx2sKK570Q56KeSKfux0mnHsXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136820; a=rsa-sha256; cv=none; b=vhtAqWaWhAlGv2uucV55sWYfuYX4YfrhOOHYXJ2zoTaavDaCOFh781JniaXRE2OzBNEG7H o3MoIJrsNyRwM1Fzhyb6VgCUfo+JnzWBcD7sM7OtxsMeh9cXH5S1jwkWNglQk1Z3JakQ6N th90S++AGMRPK5WfU8KN1B/QSnAiyxR1f250+4i8IRMr8rXGReWPcJwAzNPuV1ElP4Mega a3EyzcnbFgULI0JX1rEUF0uRH5vVbLCUrgWQDJJjV4Z8ctoWhoaWd1+3z5gMp0u8OF5fcM rFqhmvCBiQW/BsBvfEtzG3JvD20Siv+ZkvqB490HY+qTtfJ6q+IWDTdzXNuO6A== 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 4R8Bb85rFKzmKn; Sun, 23 Jul 2023 18:27: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 36NIR0sV058625; Sun, 23 Jul 2023 18:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIQlrU058600; Sun, 23 Jul 2023 18:26:47 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:26:47 GMT Message-Id: <202307231826.36NIQlrU058600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 320d4fb58b6b - stable/13 - Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 320d4fb58b6b1c6a0c7ffeab3d4672d1479d5e17 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=320d4fb58b6b1c6a0c7ffeab3d4672d1479d5e17 commit 320d4fb58b6b1c6a0c7ffeab3d4672d1479d5e17 Author: Dimitry Andric AuthorDate: 2023-04-14 21:41:27 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:08 +0000 Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16-init-18548-gb0daacf58f41. PR: 271047 MFC after: 1 month (cherry picked from commit bdd1243df58e60e85101c09001d9812a789b6bc4) --- ObsoleteFiles.inc | 329 + contrib/llvm-project/FREEBSD-Xlist | 52 +- .../clang/include/clang-c/CXDiagnostic.h | 379 + .../llvm-project/clang/include/clang-c/CXFile.h | 83 + .../clang/include/clang-c/CXSourceLocation.h | 286 + .../clang/include/clang-c/Documentation.h | 64 + contrib/llvm-project/clang/include/clang-c/Index.h | 812 +- .../clang/include/clang/APINotes/Types.h | 107 +- .../clang/include/clang/ARCMigrate/ARCMTActions.h | 2 +- .../llvm-project/clang/include/clang/AST/APValue.h | 2 +- .../clang/include/clang/AST/ASTConcept.h | 13 + .../clang/include/clang/AST/ASTConsumer.h | 2 +- .../clang/include/clang/AST/ASTContext.h | 144 +- .../clang/include/clang/AST/ASTDumper.h | 1 + .../clang/include/clang/AST/ASTImporter.h | 14 +- .../include/clang/AST/ASTImporterSharedState.h | 5 +- .../clang/include/clang/AST/ASTNodeTraverser.h | 33 +- .../include/clang/AST/ASTStructuralEquivalence.h | 4 +- .../clang/include/clang/AST/ASTTypeTraits.h | 15 +- .../clang/include/clang/AST/ASTUnresolvedSet.h | 7 +- .../clang/include/clang/AST/AbstractBasicReader.h | 15 +- .../clang/include/clang/AST/AbstractBasicWriter.h | 17 +- .../llvm-project/clang/include/clang/AST/Attr.h | 35 +- .../clang/include/clang/AST/CanonicalType.h | 3 +- .../clang/include/clang/AST/CharUnits.h | 9 +- .../clang/include/clang/AST/CommentSema.h | 2 +- .../clang/include/clang/AST/ComparisonCategories.h | 4 +- .../clang/include/clang/AST/ComputeDependence.h | 2 + .../llvm-project/clang/include/clang/AST/Decl.h | 192 +- .../clang/include/clang/AST/DeclBase.h | 37 +- .../llvm-project/clang/include/clang/AST/DeclCXX.h | 84 +- .../clang/include/clang/AST/DeclFriend.h | 10 +- .../clang/include/clang/AST/DeclObjC.h | 68 +- .../clang/include/clang/AST/DeclOpenMP.h | 12 +- .../clang/include/clang/AST/DeclTemplate.h | 150 +- .../clang/include/clang/AST/DeclarationName.h | 2 +- .../llvm-project/clang/include/clang/AST/Expr.h | 47 +- .../llvm-project/clang/include/clang/AST/ExprCXX.h | 359 +- .../clang/include/clang/AST/ExprConcepts.h | 125 +- .../clang/include/clang/AST/ExprObjC.h | 17 +- .../clang/include/clang/AST/ExprOpenMP.h | 4 +- .../clang/include/clang/AST/ExternalASTMerger.h | 2 +- .../clang/include/clang/AST/ExternalASTSource.h | 4 +- .../clang/include/clang/AST/FormatString.h | 19 +- .../clang/include/clang/AST/JSONNodeDumper.h | 7 +- .../clang/include/clang/AST/LambdaCapture.h | 8 +- .../llvm-project/clang/include/clang/AST/Mangle.h | 20 +- .../llvm-project/clang/include/clang/AST/NSAPI.h | 16 +- .../clang/include/clang/AST/ODRDiagsEmitter.h | 203 + .../llvm-project/clang/include/clang/AST/ODRHash.h | 14 +- .../clang/include/clang/AST/OpenMPClause.h | 1221 +- .../clang/include/clang/AST/ParentMapContext.h | 2 +- .../clang/include/clang/AST/PrettyPrinter.h | 6 +- .../clang/include/clang/AST/PropertiesBase.td | 63 +- .../clang/include/clang/AST/RecursiveASTVisitor.h | 106 +- .../llvm-project/clang/include/clang/AST/Stmt.h | 30 +- .../clang/include/clang/AST/StmtOpenMP.h | 76 +- .../clang/include/clang/AST/TemplateBase.h | 46 +- .../clang/include/clang/AST/TemplateName.h | 102 +- .../clang/include/clang/AST/TextNodeDumper.h | 4 + .../llvm-project/clang/include/clang/AST/Type.h | 419 +- .../llvm-project/clang/include/clang/AST/TypeLoc.h | 81 +- .../clang/include/clang/AST/TypeProperties.td | 66 +- .../include/clang/ASTMatchers/ASTMatchFinder.h | 9 +- .../clang/include/clang/ASTMatchers/ASTMatchers.h | 59 +- .../clang/ASTMatchers/ASTMatchersInternal.h | 92 +- .../include/clang/ASTMatchers/Dynamic/Parser.h | 16 +- .../include/clang/ASTMatchers/Dynamic/Registry.h | 6 +- .../clang/ASTMatchers/Dynamic/VariantValue.h | 12 +- .../clang/Analysis/Analyses/PostOrderCFGView.h | 10 +- .../clang/Analysis/Analyses/ThreadSafetyCommon.h | 13 +- .../clang/Analysis/Analyses/ThreadSafetyTIL.h | 20 +- .../clang/Analysis/Analyses/ThreadSafetyTraverse.h | 5 +- .../clang/Analysis/Analyses/ThreadSafetyUtil.h | 4 +- .../clang/Analysis/Analyses/UnsafeBufferUsage.h | 48 + .../Analysis/Analyses/UnsafeBufferUsageGadgets.def | 35 + .../clang/include/clang/Analysis/AnyCall.h | 17 +- .../clang/include/clang/Analysis/BodyFarm.h | 4 +- .../clang/include/clang/Analysis/CFG.h | 29 +- .../clang/include/clang/Analysis/CloneDetection.h | 2 +- .../include/clang/Analysis/ConstructionContext.h | 2 +- .../clang/Analysis/FlowSensitive/CFGMatchSwitch.h | 98 + .../Analysis/FlowSensitive/ControlFlowContext.h | 20 +- .../Analysis/FlowSensitive/DataflowAnalysis.h | 138 +- .../FlowSensitive/DataflowAnalysisContext.h | 86 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 143 +- .../clang/Analysis/FlowSensitive/DataflowLattice.h | 2 + .../clang/Analysis/FlowSensitive/DataflowValues.h | 2 +- .../clang/Analysis/FlowSensitive/DebugSupport.h | 8 +- .../clang/Analysis/FlowSensitive/MatchSwitch.h | 90 +- .../FlowSensitive/Models/ChromiumCheckModel.h | 2 +- .../Models/UncheckedOptionalAccessModel.h | 35 +- .../clang/Analysis/FlowSensitive/NoopAnalysis.h | 4 +- .../include/clang/Analysis/FlowSensitive/Solver.h | 8 +- .../clang/Analysis/FlowSensitive/StorageLocation.h | 3 + .../clang/Analysis/FlowSensitive/Transfer.h | 10 +- .../FlowSensitive/TypeErasedDataflowAnalysis.h | 79 +- .../include/clang/Analysis/FlowSensitive/Value.h | 29 +- .../include/clang/Analysis/MacroExpansionContext.h | 12 +- .../clang/include/clang/Analysis/PathDiagnostic.h | 6 +- .../clang/include/clang/Analysis/ProgramPoint.h | 13 +- .../include/clang/Analysis/RetainSummaryManager.h | 18 +- .../clang/include/clang/Basic/AddressSpaces.h | 3 + .../llvm-project/clang/include/clang/Basic/Attr.td | 234 +- .../clang/include/clang/Basic/AttrDocs.td | 232 +- .../clang/include/clang/Basic/BuiltinHeaders.def | 43 + .../clang/include/clang/Basic/Builtins.def | 1118 +- .../clang/include/clang/Basic/Builtins.h | 42 +- .../clang/include/clang/Basic/BuiltinsAArch64.def | 324 +- .../clang/Basic/BuiltinsAArch64NeonSVEBridge.def | 72 +- .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 46 +- .../clang/include/clang/Basic/BuiltinsARM.def | 222 +- .../clang/include/clang/Basic/BuiltinsHexagon.def | 16 +- .../include/clang/Basic/BuiltinsHexagonDep.def | 37 + .../clang/Basic/BuiltinsHexagonMapCustomDep.def | 4 + .../include/clang/Basic/BuiltinsLoongArch.def | 61 + .../clang/include/clang/Basic/BuiltinsNVPTX.def | 24 +- .../clang/include/clang/Basic/BuiltinsPPC.def | 10 +- .../clang/include/clang/Basic/BuiltinsRISCV.def | 67 +- .../clang/include/clang/Basic/BuiltinsSVE.def | 1 + .../clang/include/clang/Basic/BuiltinsVE.def | 2 +- .../include/clang/Basic/BuiltinsWebAssembly.def | 21 +- .../clang/include/clang/Basic/BuiltinsX86.def | 169 +- .../clang/include/clang/Basic/BuiltinsX86_64.def | 34 +- .../clang/include/clang/Basic/CLWarnings.h | 4 +- .../clang/include/clang/Basic/CodeGenOptions.def | 30 +- .../clang/include/clang/Basic/CodeGenOptions.h | 35 +- .../llvm-project/clang/include/clang/Basic/Cuda.h | 8 +- .../include/clang/Basic/CustomizableOptional.h | 280 + .../clang/include/clang/Basic/DarwinSDKInfo.h | 39 +- .../clang/include/clang/Basic/DeclNodes.td | 4 +- .../clang/include/clang/Basic/Diagnostic.h | 27 +- .../clang/include/clang/Basic/Diagnostic.td | 4 +- .../include/clang/Basic/DiagnosticASTKinds.td | 414 +- .../include/clang/Basic/DiagnosticCommonKinds.td | 37 +- .../include/clang/Basic/DiagnosticDriverKinds.td | 70 +- .../clang/include/clang/Basic/DiagnosticError.h | 5 +- .../include/clang/Basic/DiagnosticFrontendKinds.td | 29 +- .../clang/include/clang/Basic/DiagnosticGroups.td | 53 +- .../clang/include/clang/Basic/DiagnosticIDs.h | 5 +- .../include/clang/Basic/DiagnosticLexKinds.td | 17 +- .../clang/include/clang/Basic/DiagnosticOptions.h | 6 +- .../include/clang/Basic/DiagnosticParseKinds.td | 74 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 350 +- .../clang/Basic/DiagnosticSerializationKinds.td | 292 - .../clang/include/clang/Basic/DirectoryEntry.h | 75 +- .../clang/include/clang/Basic/FPOptions.def | 1 + .../clang/include/clang/Basic/Features.def | 1 + .../clang/include/clang/Basic/FileEntry.h | 106 +- .../clang/include/clang/Basic/FileManager.h | 18 +- .../include/clang/Basic/FileSystemStatCache.h | 3 +- .../clang/include/clang/Basic/HLSLRuntime.h | 66 + .../clang/include/clang/Basic/HeaderInclude.h | 73 + .../clang/include/clang/Basic/IdentifierTable.h | 9 +- .../clang/include/clang/Basic/JsonSupport.h | 12 +- .../llvm-project/clang/include/clang/Basic/LLVM.h | 6 +- .../clang/include/clang/Basic/LangOptions.def | 17 +- .../clang/include/clang/Basic/LangOptions.h | 44 +- .../clang/include/clang/Basic/LangStandards.def | 2 +- .../clang/include/clang/Basic/Module.h | 38 +- .../clang/include/clang/Basic/OpenCLExtensions.def | 6 - .../clang/include/clang/Basic/OpenMPKinds.def | 39 + .../clang/include/clang/Basic/OpenMPKinds.h | 53 +- .../clang/include/clang/Basic/OperatorKinds.def | 4 +- .../clang/include/clang/Basic/PartialDiagnostic.h | 4 +- .../clang/include/clang/Basic/ProfileList.h | 25 +- .../clang/include/clang/Basic/Sanitizers.def | 3 + .../llvm-project/clang/include/clang/Basic/Sarif.h | 85 +- .../clang/include/clang/Basic/SourceLocation.h | 6 + .../clang/include/clang/Basic/SourceManager.h | 143 +- .../clang/include/clang/Basic/Specifiers.h | 57 +- .../clang/include/clang/Basic/StmtNodes.td | 2 + .../clang/include/clang/Basic/SyncScope.h | 4 +- .../clang/include/clang/Basic/TargetBuiltins.h | 11 + .../clang/include/clang/Basic/TargetID.h | 21 +- .../clang/include/clang/Basic/TargetInfo.h | 134 +- .../clang/include/clang/Basic/TargetOptions.h | 3 + .../clang/include/clang/Basic/TokenKinds.def | 71 +- .../include/clang/Basic/TransformTypeTraits.def | 29 + .../clang/include/clang/Basic/TypeTraits.h | 4 + .../clang/include/clang/Basic/arm_fp16.td | 2 +- .../clang/include/clang/Basic/arm_neon.td | 97 +- .../clang/include/clang/Basic/arm_neon_incl.td | 1 + .../clang/include/clang/Basic/arm_sve.td | 172 +- .../clang/include/clang/Basic/riscv_vector.td | 973 +- .../clang/include/clang/CodeGen/CGFunctionInfo.h | 4 +- .../include/clang/CrossTU/CrossTranslationUnit.h | 10 +- .../clang/include/clang/Driver/Action.h | 43 +- .../clang/include/clang/Driver/Compilation.h | 9 +- .../clang/include/clang/Driver/Distro.h | 3 +- .../clang/include/clang/Driver/Driver.h | 53 +- .../llvm-project/clang/include/clang/Driver/Job.h | 25 +- .../clang/include/clang/Driver/OffloadBundler.h | 89 + .../clang/include/clang/Driver/Options.td | 567 +- .../clang/include/clang/Driver/SanitizerArgs.h | 3 +- .../clang/include/clang/Driver/ToolChain.h | 50 +- .../clang/include/clang/Driver/Types.def | 6 +- .../clang/include/clang/Driver/Types.h | 3 + .../clang/include/clang/ExtractAPI/API.h | 429 +- .../include/clang/ExtractAPI/APIIgnoresList.h | 74 + .../include/clang/ExtractAPI/AvailabilityInfo.h | 57 +- .../clang/ExtractAPI/DeclarationFragments.h | 16 +- .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 88 + .../include/clang/ExtractAPI/FrontendActions.h | 4 + .../ExtractAPI/Serialization/SerializerBase.h | 11 +- .../Serialization/SymbolGraphSerializer.h | 57 +- .../clang/include/clang/Format/Format.h | 2368 +- .../clang/include/clang/Frontend/ASTUnit.h | 11 +- .../include/clang/Frontend/CommandLineSourceLoc.h | 9 +- .../include/clang/Frontend/CompilerInstance.h | 6 +- .../include/clang/Frontend/CompilerInvocation.h | 21 +- .../clang/Frontend/DependencyOutputOptions.h | 10 +- .../clang/include/clang/Frontend/FrontendActions.h | 13 - .../clang/include/clang/Frontend/FrontendOptions.h | 24 +- .../clang/include/clang/Frontend/SARIFDiagnostic.h | 74 + .../clang/Frontend/SARIFDiagnosticPrinter.h | 76 + .../SerializablePathCollection.h | 1 - .../clang/Lex/DependencyDirectivesScanner.h | 5 +- .../clang/include/clang/Lex/DirectoryLookup.h | 17 +- .../clang/include/clang/Lex/HeaderMap.h | 21 +- .../clang/include/clang/Lex/HeaderSearch.h | 33 +- .../llvm-project/clang/include/clang/Lex/Lexer.h | 14 +- .../clang/include/clang/Lex/MacroInfo.h | 9 +- .../clang/include/clang/Lex/ModuleLoader.h | 5 + .../clang/include/clang/Lex/ModuleMap.h | 47 +- .../clang/include/clang/Lex/PPCallbacks.h | 38 +- .../clang/include/clang/Lex/PreprocessingRecord.h | 17 +- .../clang/include/clang/Lex/Preprocessor.h | 95 +- .../clang/include/clang/Lex/PreprocessorOptions.h | 6 +- .../llvm-project/clang/include/clang/Lex/Token.h | 9 + .../clang/include/clang/Parse/Parser.h | 246 +- .../include/clang/Parse/RAIIObjectsForParser.h | 13 + .../include/clang/Sema/CodeCompleteConsumer.h | 34 +- .../clang/include/clang/Sema/DeclSpec.h | 65 +- .../clang/include/clang/Sema/DelayedDiagnostic.h | 4 +- .../include/clang/Sema/HLSLExternalSemaSource.h | 16 +- .../clang/include/clang/Sema/Initialization.h | 12 +- .../llvm-project/clang/include/clang/Sema/Lookup.h | 4 +- .../clang/Sema/MultiplexExternalSemaSource.h | 17 +- .../clang/include/clang/Sema/Overload.h | 42 +- .../clang/include/clang/Sema/ParsedAttr.h | 29 +- .../include/clang/Sema/RISCVIntrinsicManager.h | 1 - .../llvm-project/clang/include/clang/Sema/Scope.h | 23 +- .../clang/include/clang/Sema/ScopeInfo.h | 34 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 965 +- .../clang/include/clang/Sema/SemaConcept.h | 8 +- .../clang/include/clang/Sema/SemaInternal.h | 4 +- .../clang/include/clang/Sema/SemaLambda.h | 5 +- .../clang/include/clang/Sema/Template.h | 95 +- .../clang/include/clang/Sema/TemplateDeduction.h | 38 +- .../include/clang/Serialization/ASTBitCodes.h | 26 +- .../clang/include/clang/Serialization/ASTReader.h | 103 +- .../include/clang/Serialization/ASTRecordReader.h | 2 +- .../clang/include/clang/Serialization/ASTWriter.h | 49 +- .../clang/Serialization/InMemoryModuleCache.h | 1 - .../clang/include/clang/Serialization/ModuleFile.h | 20 +- .../include/clang/Serialization/ModuleManager.h | 5 +- .../clang/Serialization/SourceLocationEncoding.h | 2 +- .../clang/StaticAnalyzer/Checkers/Checkers.td | 6 +- .../clang/StaticAnalyzer/Checkers/LocalCheckers.h | 27 - .../clang/StaticAnalyzer/Checkers/SValExplainer.h | 21 +- .../include/clang/StaticAnalyzer/Checkers/Taint.h | 36 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.def | 5 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.h | 5 +- .../StaticAnalyzer/Core/BugReporter/BugReporter.h | 22 +- .../Core/BugReporter/BugReporterVisitors.h | 11 +- .../clang/StaticAnalyzer/Core/CheckerManager.h | 2 +- .../Core/PathSensitive/BasicValueFactory.h | 12 +- .../Core/PathSensitive/CallDescription.h | 27 +- .../StaticAnalyzer/Core/PathSensitive/CallEvent.h | 33 +- .../Core/PathSensitive/CheckerContext.h | 19 +- .../Core/PathSensitive/CheckerHelpers.h | 11 +- .../Core/PathSensitive/ConstraintManager.h | 8 +- .../StaticAnalyzer/Core/PathSensitive/CoreEngine.h | 8 +- .../Core/PathSensitive/DynamicType.h | 1 - .../Core/PathSensitive/ExplodedGraph.h | 4 +- .../StaticAnalyzer/Core/PathSensitive/ExprEngine.h | 86 +- .../Core/PathSensitive/FunctionSummary.h | 7 +- .../StaticAnalyzer/Core/PathSensitive/MemRegion.h | 16 +- .../Core/PathSensitive/ProgramState.h | 76 +- .../Core/PathSensitive/SMTConstraintManager.h | 11 +- .../StaticAnalyzer/Core/PathSensitive/SMTConv.h | 4 +- .../Core/PathSensitive/SValBuilder.h | 12 +- .../StaticAnalyzer/Core/PathSensitive/SVals.h | 11 +- .../StaticAnalyzer/Core/PathSensitive/Store.h | 15 +- .../Core/PathSensitive/SymbolManager.h | 18 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 170 +- .../clang/include/clang/Testing/TestAST.h | 5 + .../clang/include/clang/Tooling/ASTDiff/ASTDiff.h | 5 +- .../clang/include/clang/Tooling/AllTUsExecution.h | 3 +- .../clang/include/clang/Tooling/Core/Replacement.h | 17 +- .../DependencyScanningFilesystem.h | 21 +- .../DependencyScanning/DependencyScanningService.h | 15 +- .../DependencyScanning/DependencyScanningTool.h | 95 +- .../DependencyScanning/DependencyScanningWorker.h | 52 +- .../DependencyScanning/ModuleDepCollector.h | 115 +- .../clang/Tooling/Inclusions/HeaderAnalysis.h | 46 + .../clang/Tooling/Inclusions/HeaderIncludes.h | 37 +- .../clang/Tooling/Inclusions/StandardLibrary.h | 14 +- .../clang/Tooling/Refactoring/ASTSelection.h | 11 +- .../clang/Tooling/Refactoring/Extract/Extract.h | 12 +- .../Tooling/Refactoring/RefactoringActionRule.h | 1 - .../Refactoring/RefactoringActionRulesInternal.h | 12 +- .../Tooling/Refactoring/RefactoringOptionVisitor.h | 6 +- .../clang/Tooling/Refactoring/RefactoringOptions.h | 5 +- .../Tooling/Refactoring/Rename/SymbolOccurrences.h | 2 +- .../include/clang/Tooling/StandaloneExecution.h | 3 +- .../clang/include/clang/Tooling/Syntax/Tokens.h | 9 +- .../clang/include/clang/Tooling/Syntax/Tree.h | 2 +- .../clang/include/clang/Tooling/Tooling.h | 2 +- .../clang/Tooling/Transformer/RewriteRule.h | 9 +- .../include/clang/Tooling/Transformer/SourceCode.h | 52 +- .../clang/Tooling/Transformer/SourceCodeBuilders.h | 19 +- .../clang/Tooling/Transformer/Transformer.h | 43 +- .../clang/include/clang/module.modulemap | 5 +- .../clang/lib/APINotes/APINotesYAMLCompiler.cpp | 76 +- .../clang/lib/ARCMigrate/ARCMTActions.cpp | 4 +- .../llvm-project/clang/lib/ARCMigrate/Internals.h | 6 +- .../llvm-project/clang/lib/ARCMigrate/ObjCMT.cpp | 18 +- .../clang/lib/ARCMigrate/TransGCAttrs.cpp | 4 +- .../lib/ARCMigrate/TransRetainReleaseDealloc.cpp | 2 +- .../clang/lib/ARCMigrate/TransformActions.cpp | 2 +- contrib/llvm-project/clang/lib/AST/APValue.cpp | 10 +- contrib/llvm-project/clang/lib/AST/ASTConcept.cpp | 72 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 1683 +- .../llvm-project/clang/lib/AST/ASTDiagnostic.cpp | 39 +- contrib/llvm-project/clang/lib/AST/ASTDumper.cpp | 55 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 496 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 159 +- .../llvm-project/clang/lib/AST/AttrDocTable.cpp | 2 +- contrib/llvm-project/clang/lib/AST/AttrImpl.cpp | 41 +- .../llvm-project/clang/lib/AST/CXXInheritance.cpp | 1 - contrib/llvm-project/clang/lib/AST/Comment.cpp | 6 +- .../clang/lib/AST/CommentCommandTraits.cpp | 8 +- .../llvm-project/clang/lib/AST/CommentLexer.cpp | 2 +- .../llvm-project/clang/lib/AST/CommentParser.cpp | 31 +- contrib/llvm-project/clang/lib/AST/CommentSema.cpp | 6 +- .../clang/lib/AST/ComparisonCategories.cpp | 5 +- .../clang/lib/AST/ComputeDependence.cpp | 20 +- contrib/llvm-project/clang/lib/AST/Decl.cpp | 258 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 47 +- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 188 +- contrib/llvm-project/clang/lib/AST/DeclObjC.cpp | 100 +- contrib/llvm-project/clang/lib/AST/DeclOpenMP.cpp | 2 +- contrib/llvm-project/clang/lib/AST/DeclPrinter.cpp | 35 +- .../llvm-project/clang/lib/AST/DeclTemplate.cpp | 191 +- .../llvm-project/clang/lib/AST/DeclarationName.cpp | 12 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 101 +- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 148 +- .../clang/lib/AST/ExprClassification.cpp | 10 +- .../llvm-project/clang/lib/AST/ExprConcepts.cpp | 77 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 688 +- .../clang/lib/AST/ExternalASTSource.cpp | 6 +- .../llvm-project/clang/lib/AST/FormatString.cpp | 134 +- .../llvm-project/clang/lib/AST/Interp/Boolean.h | 27 +- .../clang/lib/AST/Interp/ByteCodeEmitter.cpp | 135 +- .../clang/lib/AST/Interp/ByteCodeEmitter.h | 4 +- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 1138 +- .../clang/lib/AST/Interp/ByteCodeExprGen.h | 171 +- .../clang/lib/AST/Interp/ByteCodeGenError.h | 12 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 203 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.h | 16 +- .../llvm-project/clang/lib/AST/Interp/Context.cpp | 39 +- .../llvm-project/clang/lib/AST/Interp/Context.h | 6 +- .../clang/lib/AST/Interp/Descriptor.cpp | 93 +- .../llvm-project/clang/lib/AST/Interp/Descriptor.h | 92 +- .../llvm-project/clang/lib/AST/Interp/Disasm.cpp | 28 +- .../clang/lib/AST/Interp/EvalEmitter.cpp | 29 +- .../clang/lib/AST/Interp/EvalEmitter.h | 12 +- .../llvm-project/clang/lib/AST/Interp/Function.cpp | 15 +- .../llvm-project/clang/lib/AST/Interp/Function.h | 74 +- .../llvm-project/clang/lib/AST/Interp/Integral.h | 126 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 93 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 547 +- .../clang/lib/AST/Interp/InterpBlock.h | 53 +- .../clang/lib/AST/Interp/InterpFrame.cpp | 90 +- .../clang/lib/AST/Interp/InterpFrame.h | 42 +- .../clang/lib/AST/Interp/InterpStack.cpp | 2 +- .../clang/lib/AST/Interp/InterpStack.h | 67 +- .../clang/lib/AST/Interp/InterpState.h | 3 +- .../llvm-project/clang/lib/AST/Interp/Opcodes.td | 118 +- .../llvm-project/clang/lib/AST/Interp/Pointer.cpp | 26 +- .../llvm-project/clang/lib/AST/Interp/Pointer.h | 49 +- .../llvm-project/clang/lib/AST/Interp/PrimType.cpp | 4 +- .../llvm-project/clang/lib/AST/Interp/PrimType.h | 14 +- .../llvm-project/clang/lib/AST/Interp/Program.cpp | 123 +- .../llvm-project/clang/lib/AST/Interp/Program.h | 54 +- contrib/llvm-project/clang/lib/AST/Interp/Record.h | 22 +- .../llvm-project/clang/lib/AST/Interp/Source.cpp | 4 +- contrib/llvm-project/clang/lib/AST/Interp/Source.h | 16 +- contrib/llvm-project/clang/lib/AST/Interp/State.h | 5 + .../llvm-project/clang/lib/AST/ItaniumCXXABI.cpp | 17 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 101 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 40 +- contrib/llvm-project/clang/lib/AST/Linkage.h | 8 +- contrib/llvm-project/clang/lib/AST/Mangle.cpp | 8 +- .../llvm-project/clang/lib/AST/MicrosoftCXXABI.cpp | 4 +- .../llvm-project/clang/lib/AST/MicrosoftMangle.cpp | 51 +- contrib/llvm-project/clang/lib/AST/NSAPI.cpp | 25 +- .../clang/lib/AST/NestedNameSpecifier.cpp | 4 +- .../llvm-project/clang/lib/AST/ODRDiagsEmitter.cpp | 2206 + contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 186 +- contrib/llvm-project/clang/lib/AST/OSLog.cpp | 11 +- .../llvm-project/clang/lib/AST/OpenMPClause.cpp | 109 +- contrib/llvm-project/clang/lib/AST/ParentMap.cpp | 4 +- .../clang/lib/AST/ParentMapContext.cpp | 23 +- .../clang/lib/AST/PrintfFormatString.cpp | 37 +- .../llvm-project/clang/lib/AST/QualTypeNames.cpp | 23 +- .../clang/lib/AST/RecordLayoutBuilder.cpp | 69 +- .../clang/lib/AST/ScanfFormatString.cpp | 8 +- contrib/llvm-project/clang/lib/AST/Stmt.cpp | 11 +- contrib/llvm-project/clang/lib/AST/StmtOpenMP.cpp | 21 +- contrib/llvm-project/clang/lib/AST/StmtPrinter.cpp | 24 +- contrib/llvm-project/clang/lib/AST/StmtProfile.cpp | 28 +- .../llvm-project/clang/lib/AST/TemplateBase.cpp | 32 +- .../llvm-project/clang/lib/AST/TemplateName.cpp | 65 +- .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 36 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 276 +- contrib/llvm-project/clang/lib/AST/TypeLoc.cpp | 40 +- contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 294 +- .../llvm-project/clang/lib/AST/VTableBuilder.cpp | 5 +- .../clang/lib/ASTMatchers/ASTMatchFinder.cpp | 14 +- .../clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 17 +- .../clang/lib/ASTMatchers/Dynamic/Marshallers.cpp | 61 +- .../clang/lib/ASTMatchers/Dynamic/Marshallers.h | 74 +- .../clang/lib/ASTMatchers/Dynamic/Parser.cpp | 23 +- .../clang/lib/ASTMatchers/Dynamic/Registry.cpp | 14 +- .../clang/lib/ASTMatchers/Dynamic/VariantValue.cpp | 33 +- .../clang/lib/Analysis/AnalysisDeclContext.cpp | 9 +- .../llvm-project/clang/lib/Analysis/BodyFarm.cpp | 13 +- contrib/llvm-project/clang/lib/Analysis/CFG.cpp | 210 +- .../llvm-project/clang/lib/Analysis/CFGStmtMap.cpp | 3 +- .../clang/lib/Analysis/CalledOnceCheck.cpp | 60 +- .../llvm-project/clang/lib/Analysis/Consumed.cpp | 6 +- .../Analysis/FlowSensitive/ControlFlowContext.cpp | 8 +- .../FlowSensitive/DataflowAnalysisContext.cpp | 58 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 472 +- .../lib/Analysis/FlowSensitive/DebugSupport.cpp | 35 +- .../FlowSensitive/Models/ChromiumCheckModel.cpp | 6 +- .../Models/UncheckedOptionalAccessModel.cpp | 367 +- .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 288 +- .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 340 +- .../clang/lib/Analysis/FlowSensitive/Value.cpp | 56 + .../FlowSensitive/WatchedLiteralsSolver.cpp | 5 + .../llvm-project/clang/lib/Analysis/IssueHash.cpp | 5 +- .../clang/lib/Analysis/LiveVariables.cpp | 3 +- .../clang/lib/Analysis/MacroExpansionContext.cpp | 15 +- .../clang/lib/Analysis/PathDiagnostic.cpp | 72 +- .../clang/lib/Analysis/ReachableCode.cpp | 17 +- .../clang/lib/Analysis/RetainSummaryManager.cpp | 39 +- .../clang/lib/Analysis/ThreadSafety.cpp | 231 +- .../clang/lib/Analysis/ThreadSafetyCommon.cpp | 48 +- .../clang/lib/Analysis/UninitializedValues.cpp | 23 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 695 + .../llvm-project/clang/lib/Basic/Attributes.cpp | 1 - .../clang/lib/Basic/BuiltinTargetFeatures.h | 2 +- contrib/llvm-project/clang/lib/Basic/Builtins.cpp | 95 +- .../llvm-project/clang/lib/Basic/CLWarnings.cpp | 3 +- contrib/llvm-project/clang/lib/Basic/Cuda.cpp | 153 +- .../llvm-project/clang/lib/Basic/DarwinSDKInfo.cpp | 40 +- .../llvm-project/clang/lib/Basic/DiagnosticIDs.cpp | 17 +- .../clang/lib/Basic/DiagnosticOptions.cpp | 2 +- .../llvm-project/clang/lib/Basic/FileManager.cpp | 40 +- .../clang/lib/Basic/IdentifierTable.cpp | 217 +- .../llvm-project/clang/lib/Basic/LangStandards.cpp | 14 +- contrib/llvm-project/clang/lib/Basic/Module.cpp | 28 +- .../llvm-project/clang/lib/Basic/OpenMPKinds.cpp | 96 +- .../llvm-project/clang/lib/Basic/ProfileList.cpp | 58 +- .../clang/lib/Basic/SanitizerSpecialCaseList.cpp | 2 +- .../llvm-project/clang/lib/Basic/Sanitizers.cpp | 2 +- contrib/llvm-project/clang/lib/Basic/Sarif.cpp | 65 +- .../clang/lib/Basic/SourceLocation.cpp | 8 +- .../llvm-project/clang/lib/Basic/SourceManager.cpp | 373 +- contrib/llvm-project/clang/lib/Basic/Stack.cpp | 1 - contrib/llvm-project/clang/lib/Basic/TargetID.cpp | 42 +- .../llvm-project/clang/lib/Basic/TargetInfo.cpp | 94 +- contrib/llvm-project/clang/lib/Basic/Targets.cpp | 22 +- .../clang/lib/Basic/Targets/AArch64.cpp | 668 +- .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 107 +- .../clang/lib/Basic/Targets/AMDGPU.cpp | 99 +- .../llvm-project/clang/lib/Basic/Targets/AMDGPU.h | 28 +- contrib/llvm-project/clang/lib/Basic/Targets/ARC.h | 8 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 57 +- contrib/llvm-project/clang/lib/Basic/Targets/ARM.h | 6 +- .../llvm-project/clang/lib/Basic/Targets/AVR.cpp | 746 +- contrib/llvm-project/clang/lib/Basic/Targets/AVR.h | 14 +- .../llvm-project/clang/lib/Basic/Targets/BPF.cpp | 8 +- contrib/llvm-project/clang/lib/Basic/Targets/BPF.h | 7 +- .../llvm-project/clang/lib/Basic/Targets/CSKY.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/DirectX.h | 15 +- .../clang/lib/Basic/Targets/Hexagon.cpp | 32 +- .../llvm-project/clang/lib/Basic/Targets/Hexagon.h | 1 - .../llvm-project/clang/lib/Basic/Targets/Lanai.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/Lanai.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Le64.h | 6 +- .../clang/lib/Basic/Targets/LoongArch.cpp | 217 + .../clang/lib/Basic/Targets/LoongArch.h | 136 + .../llvm-project/clang/lib/Basic/Targets/M68k.cpp | 17 +- .../llvm-project/clang/lib/Basic/Targets/M68k.h | 3 +- .../clang/lib/Basic/Targets/MSP430.cpp | 2 +- .../llvm-project/clang/lib/Basic/Targets/MSP430.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Mips.cpp | 24 +- .../llvm-project/clang/lib/Basic/Targets/Mips.h | 7 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.cpp | 53 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.h | 19 +- .../clang/lib/Basic/Targets/OSTargets.cpp | 132 +- .../clang/lib/Basic/Targets/OSTargets.h | 60 +- .../llvm-project/clang/lib/Basic/Targets/PNaCl.cpp | 6 +- .../llvm-project/clang/lib/Basic/Targets/PNaCl.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 17 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 5 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 110 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 22 +- .../llvm-project/clang/lib/Basic/Targets/SPIR.h | 19 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.h | 2 +- .../clang/lib/Basic/Targets/SystemZ.cpp | 16 +- .../llvm-project/clang/lib/Basic/Targets/SystemZ.h | 24 +- contrib/llvm-project/clang/lib/Basic/Targets/TCE.h | 11 +- .../llvm-project/clang/lib/Basic/Targets/VE.cpp | 13 +- contrib/llvm-project/clang/lib/Basic/Targets/VE.h | 5 +- .../clang/lib/Basic/Targets/WebAssembly.cpp | 26 +- .../clang/lib/Basic/Targets/WebAssembly.h | 5 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 151 +- contrib/llvm-project/clang/lib/Basic/Targets/X86.h | 30 +- .../llvm-project/clang/lib/Basic/Targets/XCore.cpp | 10 +- .../llvm-project/clang/lib/Basic/Targets/XCore.h | 5 +- .../llvm-project/clang/lib/Basic/TypeTraits.cpp | 14 + contrib/llvm-project/clang/lib/CodeGen/ABIInfo.h | 46 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 249 +- .../llvm-project/clang/lib/CodeGen/CGAtomic.cpp | 40 +- .../llvm-project/clang/lib/CodeGen/CGBlocks.cpp | 22 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 1789 +- .../llvm-project/clang/lib/CodeGen/CGCUDANV.cpp | 71 +- .../llvm-project/clang/lib/CodeGen/CGCUDARuntime.h | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGCXXABI.h | 12 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 251 +- contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 94 +- .../llvm-project/clang/lib/CodeGen/CGCleanup.cpp | 10 +- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 20 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 381 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.h | 29 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 14 +- .../llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp | 89 +- .../llvm-project/clang/lib/CodeGen/CGException.cpp | 17 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 195 +- .../llvm-project/clang/lib/CodeGen/CGExprAgg.cpp | 108 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 2 +- .../clang/lib/CodeGen/CGExprComplex.cpp | 257 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 60 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 316 +- .../clang/lib/CodeGen/CGGPUBuiltin.cpp | 2 +- .../clang/lib/CodeGen/CGHLSLRuntime.cpp | 413 +- .../llvm-project/clang/lib/CodeGen/CGHLSLRuntime.h | 67 + .../llvm-project/clang/lib/CodeGen/CGLoopInfo.cpp | 17 +- contrib/llvm-project/clang/lib/CodeGen/CGObjC.cpp | 172 +- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 17 +- .../llvm-project/clang/lib/CodeGen/CGObjCMac.cpp | 56 +- .../clang/lib/CodeGen/CGObjCRuntime.cpp | 28 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 1695 +- .../clang/lib/CodeGen/CGOpenMPRuntime.h | 319 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 431 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.h | 31 +- .../clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 57 +- .../clang/lib/CodeGen/CGStmtOpenMP.cpp | 244 +- contrib/llvm-project/clang/lib/CodeGen/CGVTT.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 58 +- contrib/llvm-project/clang/lib/CodeGen/CGVTables.h | 7 + .../clang/lib/CodeGen/CodeGenAction.cpp | 41 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 185 +- .../clang/lib/CodeGen/CodeGenFunction.h | 64 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 498 +- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 54 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.h | 7 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 2 +- .../clang/lib/CodeGen/CodeGenTypeCache.h | 3 + .../clang/lib/CodeGen/CodeGenTypes.cpp | 28 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 3 +- .../clang/lib/CodeGen/ConstantEmitter.h | 3 + .../clang/lib/CodeGen/ConstantInitBuilder.cpp | 11 +- .../clang/lib/CodeGen/CoverageMappingGen.cpp | 84 +- .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 201 +- .../clang/lib/CodeGen/MacroPPCallbacks.cpp | 4 +- .../clang/lib/CodeGen/MacroPPCallbacks.h | 2 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 89 +- .../clang/lib/CodeGen/ModuleBuilder.cpp | 1 + .../CodeGen/ObjectFilePCHContainerOperations.cpp | 4 +- .../llvm-project/clang/lib/CodeGen/PatternInit.cpp | 4 +- .../clang/lib/CodeGen/SanitizerMetadata.cpp | 2 +- .../clang/lib/CodeGen/SwiftCallingConv.cpp | 36 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 1036 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 13 + .../clang/lib/CodeGen/VarBypassDetector.cpp | 2 +- .../clang/lib/CrossTU/CrossTranslationUnit.cpp | 14 +- .../lib/DirectoryWatcher/DirectoryScanner.cpp | 5 +- .../clang/lib/DirectoryWatcher/DirectoryScanner.h | 5 +- .../linux/DirectoryWatcher-linux.cpp | 5 +- .../DirectoryWatcher/mac/DirectoryWatcher-mac.cpp | 2 +- contrib/llvm-project/clang/lib/Driver/Action.cpp | 37 +- .../llvm-project/clang/lib/Driver/Compilation.cpp | 13 +- contrib/llvm-project/clang/lib/Driver/Distro.cpp | 1 + contrib/llvm-project/clang/lib/Driver/Driver.cpp | 1199 +- .../clang/lib/Driver/DriverOptions.cpp | 39 +- contrib/llvm-project/clang/lib/Driver/Job.cpp | 31 +- .../clang/lib/Driver/OffloadBundler.cpp | 1283 + .../clang/lib/Driver/SanitizerArgs.cpp | 129 +- .../llvm-project/clang/lib/Driver/ToolChain.cpp | 111 +- .../clang/lib/Driver/ToolChains/AIX.cpp | 100 + .../llvm-project/clang/lib/Driver/ToolChains/AIX.h | 4 + .../clang/lib/Driver/ToolChains/AMDGPU.cpp | 229 +- .../clang/lib/Driver/ToolChains/AMDGPU.h | 18 +- .../clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 281 +- .../clang/lib/Driver/ToolChains/AMDGPUOpenMP.h | 49 +- .../clang/lib/Driver/ToolChains/AVR.cpp | 81 +- .../llvm-project/clang/lib/Driver/ToolChains/AVR.h | 4 +- .../clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 79 +- .../clang/lib/Driver/ToolChains/Arch/ARM.cpp | 26 +- .../clang/lib/Driver/ToolChains/Arch/CSKY.cpp | 15 +- .../clang/lib/Driver/ToolChains/Arch/CSKY.h | 6 +- .../clang/lib/Driver/ToolChains/Arch/LoongArch.cpp | 115 + .../clang/lib/Driver/ToolChains/Arch/LoongArch.h | 31 + .../clang/lib/Driver/ToolChains/Arch/Mips.cpp | 4 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 62 +- .../clang/lib/Driver/ToolChains/Arch/PPC.h | 3 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 63 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.h | 2 + .../clang/lib/Driver/ToolChains/Arch/Sparc.cpp | 53 +- .../clang/lib/Driver/ToolChains/Arch/VE.cpp | 1 - .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 6 +- .../clang/lib/Driver/ToolChains/BareMetal.cpp | 64 +- .../clang/lib/Driver/ToolChains/BareMetal.h | 23 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 942 +- .../clang/lib/Driver/ToolChains/Clang.h | 15 +- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 617 +- .../clang/lib/Driver/ToolChains/CommonArgs.h | 26 +- .../clang/lib/Driver/ToolChains/CrossWindows.cpp | 5 +- .../clang/lib/Driver/ToolChains/CrossWindows.h | 3 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 359 +- .../clang/lib/Driver/ToolChains/Cuda.h | 129 +- .../clang/lib/Driver/ToolChains/Darwin.cpp | 363 +- .../clang/lib/Driver/ToolChains/Darwin.h | 22 +- .../clang/lib/Driver/ToolChains/Flang.cpp | 202 +- .../clang/lib/Driver/ToolChains/Flang.h | 23 +- .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 40 +- .../clang/lib/Driver/ToolChains/FreeBSD.h | 6 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 6 +- .../clang/lib/Driver/ToolChains/Fuchsia.h | 5 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 96 +- .../llvm-project/clang/lib/Driver/ToolChains/Gnu.h | 9 +- .../clang/lib/Driver/ToolChains/HIPAMD.cpp | 27 +- .../clang/lib/Driver/ToolChains/HIPAMD.h | 2 +- .../clang/lib/Driver/ToolChains/HIPSPV.cpp | 6 +- .../clang/lib/Driver/ToolChains/HIPSPV.h | 2 +- .../clang/lib/Driver/ToolChains/HLSL.cpp | 45 +- .../clang/lib/Driver/ToolChains/HLSL.h | 3 +- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 27 +- .../clang/lib/Driver/ToolChains/Hexagon.h | 4 +- .../clang/lib/Driver/ToolChains/Linux.cpp | 67 +- .../clang/lib/Driver/ToolChains/Linux.h | 2 + .../clang/lib/Driver/ToolChains/MSP430.cpp | 2 +- .../clang/lib/Driver/ToolChains/MSVC.cpp | 15 +- .../clang/lib/Driver/ToolChains/MSVC.h | 5 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 157 +- .../clang/lib/Driver/ToolChains/MinGW.h | 10 +- .../clang/lib/Driver/ToolChains/Myriad.cpp | 2 +- .../clang/lib/Driver/ToolChains/NetBSD.cpp | 35 + .../clang/lib/Driver/ToolChains/NetBSD.h | 8 +- .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 15 +- .../clang/lib/Driver/ToolChains/OpenBSD.h | 3 +- .../clang/lib/Driver/ToolChains/PPCLinux.cpp | 22 +- .../clang/lib/Driver/ToolChains/PPCLinux.h | 2 + .../clang/lib/Driver/ToolChains/PS4CPU.cpp | 43 + .../clang/lib/Driver/ToolChains/ROCm.h | 12 +- .../clang/lib/Driver/ToolChains/Solaris.cpp | 2 + .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 4 +- contrib/llvm-project/clang/lib/Driver/Types.cpp | 129 +- contrib/llvm-project/clang/lib/Driver/XRayArgs.cpp | 3 +- .../clang/lib/Edit/RewriteObjCFoundationAPI.cpp | 19 +- contrib/llvm-project/clang/lib/ExtractAPI/API.cpp | 225 +- .../clang/lib/ExtractAPI/APIIgnoresList.cpp | 53 + .../clang/lib/ExtractAPI/AvailabilityInfo.cpp | 50 + .../clang/lib/ExtractAPI/DeclarationFragments.cpp | 34 +- .../clang/lib/ExtractAPI/ExtractAPIConsumer.cpp | 612 +- .../clang/lib/ExtractAPI/ExtractAPIVisitor.cpp | 560 + .../Serialization/SymbolGraphSerializer.cpp | 379 +- .../ExtractAPI/TypedefUnderlyingTypeResolver.cpp | 7 +- .../lib/ExtractAPI/TypedefUnderlyingTypeResolver.h | 2 + .../clang/lib/Format/BreakableToken.cpp | 8 +- .../clang/lib/Format/ContinuationIndenter.cpp | 95 +- .../clang/lib/Format/ContinuationIndenter.h | 9 +- .../clang/lib/Format/DefinitionBlockSeparator.cpp | 6 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 1294 +- .../llvm-project/clang/lib/Format/FormatToken.cpp | 3 +- .../llvm-project/clang/lib/Format/FormatToken.h | 92 +- .../clang/lib/Format/FormatTokenLexer.cpp | 184 +- .../clang/lib/Format/FormatTokenLexer.h | 7 + .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 199 + .../lib/Format/IntegerLiteralSeparatorFixer.h | 38 + .../clang/lib/Format/MacroCallReconstructor.cpp | 23 +- .../clang/lib/Format/QualifierAlignmentFixer.cpp | 4 +- .../clang/lib/Format/TokenAnalyzer.cpp | 6 +- .../llvm-project/clang/lib/Format/TokenAnalyzer.h | 3 +- .../clang/lib/Format/TokenAnnotator.cpp | 430 +- .../llvm-project/clang/lib/Format/TokenAnnotator.h | 15 + .../clang/lib/Format/UnwrappedLineFormatter.cpp | 50 +- .../clang/lib/Format/UnwrappedLineFormatter.h | 2 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 598 +- .../clang/lib/Format/UnwrappedLineParser.h | 30 +- .../clang/lib/Format/UsingDeclarationsSorter.cpp | 57 +- .../clang/lib/Format/WhitespaceManager.cpp | 57 +- .../clang/lib/Format/WhitespaceManager.h | 2 +- .../llvm-project/clang/lib/Frontend/ASTUnit.cpp | 49 +- .../clang/lib/Frontend/ChainedIncludesSource.cpp | 39 +- .../clang/lib/Frontend/CompilerInstance.cpp | 98 +- .../clang/lib/Frontend/CompilerInvocation.cpp | 311 +- .../clang/lib/Frontend/DependencyFile.cpp | 30 +- .../clang/lib/Frontend/DependencyGraph.cpp | 16 +- .../clang/lib/Frontend/DiagnosticRenderer.cpp | 5 +- .../clang/lib/Frontend/FrontendAction.cpp | 57 +- .../clang/lib/Frontend/FrontendActions.cpp | 104 +- .../clang/lib/Frontend/FrontendOptions.cpp | 1 + .../clang/lib/Frontend/HeaderIncludeGen.cpp | 137 +- .../clang/lib/Frontend/InitPreprocessor.cpp | 64 +- .../lib/Frontend/ModuleDependencyCollector.cpp | 15 +- .../clang/lib/Frontend/PrecompiledPreamble.cpp | 4 +- .../clang/lib/Frontend/PrintPreprocessedOutput.cpp | 16 +- .../lib/Frontend/Rewrite/InclusionRewriter.cpp | 48 +- .../lib/Frontend/Rewrite/RewriteModernObjC.cpp | 10 +- .../clang/lib/Frontend/SARIFDiagnostic.cpp | 225 + .../clang/lib/Frontend/SARIFDiagnosticPrinter.cpp | 83 + .../lib/Frontend/SerializedDiagnosticReader.cpp | 8 +- .../clang/lib/Frontend/TextDiagnostic.cpp | 11 +- .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 2 +- .../lib/FrontendTool/ExecuteCompilerInvocation.cpp | 2 - .../lib/Headers/__clang_cuda_texture_intrinsics.h | 2 + .../lib/Headers/__clang_hip_libdevice_declares.h | 5 + .../clang/lib/Headers/__clang_hip_math.h | 23 +- .../lib/Headers/__clang_hip_runtime_wrapper.h | 1 + .../clang/lib/Headers/__clang_hip_stdlib.h | 43 + contrib/llvm-project/clang/lib/Headers/altivec.h | 28 +- .../llvm-project/clang/lib/Headers/amxfp16intrin.h | 58 + contrib/llvm-project/clang/lib/Headers/amxintrin.h | 32 + contrib/llvm-project/clang/lib/Headers/arm_acle.h | 151 +- .../clang/lib/Headers/arm_neon_sve_bridge.h | 2 - .../clang/lib/Headers/avx512bf16intrin.h | 33 +- .../llvm-project/clang/lib/Headers/avx512fintrin.h | 4 +- .../clang/lib/Headers/avx512fp16intrin.h | 15 +- .../clang/lib/Headers/avx512ifmavlintrin.h | 40 +- .../clang/lib/Headers/avx512vlbf16intrin.h | 69 +- .../clang/lib/Headers/avx512vlbwintrin.h | 352 + .../clang/lib/Headers/avx512vlfp16intrin.h | 3 + .../llvm-project/clang/lib/Headers/avxifmaintrin.h | 177 + contrib/llvm-project/clang/lib/Headers/avxintrin.h | 14 +- .../clang/lib/Headers/avxneconvertintrin.h | 484 + .../clang/lib/Headers/avxvnniint8intrin.h | 471 + .../clang/lib/Headers/cmpccxaddintrin.h | 70 + contrib/llvm-project/clang/lib/Headers/cpuid.h | 12 +- .../clang/lib/Headers/cuda_wrappers/cmath | 90 + contrib/llvm-project/clang/lib/Headers/emmintrin.h | 12 +- contrib/llvm-project/clang/lib/Headers/float.h | 27 +- .../llvm-project/clang/lib/Headers/gfniintrin.h | 12 +- .../clang/lib/Headers/hlsl/hlsl_basic_types.h | 3 + .../clang/lib/Headers/hlsl/hlsl_intrinsics.h | 208 + contrib/llvm-project/clang/lib/Headers/immintrin.h | 48 +- .../llvm-project/clang/lib/Headers/larchintrin.h | 234 + contrib/llvm-project/clang/lib/Headers/limits.h | 5 +- .../llvm-project/clang/lib/Headers/opencl-c-base.h | 19 + contrib/llvm-project/clang/lib/Headers/opencl-c.h | 320 +- .../clang/lib/Headers/openmp_wrappers/stdlib.h | 29 + .../clang/lib/Headers/ppc_wrappers/emmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/mm_malloc.h | 2 +- .../clang/lib/Headers/ppc_wrappers/mmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/pmmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/smmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/tmmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/xmmintrin.h | 4 +- .../llvm-project/clang/lib/Headers/prfchiintrin.h | 61 + .../llvm-project/clang/lib/Headers/raointintrin.h | 203 + contrib/llvm-project/clang/lib/Headers/smmintrin.h | 2 +- contrib/llvm-project/clang/lib/Headers/stdarg.h | 30 +- contrib/llvm-project/clang/lib/Headers/stdatomic.h | 9 +- contrib/llvm-project/clang/lib/Headers/stdbool.h | 4 +- contrib/llvm-project/clang/lib/Headers/stddef.h | 9 +- contrib/llvm-project/clang/lib/Headers/stdint.h | 198 +- .../llvm-project/clang/lib/Headers/stdnoreturn.h | 2 +- contrib/llvm-project/clang/lib/Headers/unwind.h | 3 +- contrib/llvm-project/clang/lib/Headers/velintrin.h | 2 +- .../llvm-project/clang/lib/Headers/x86gprintrin.h | 26 +- contrib/llvm-project/clang/lib/Headers/xmmintrin.h | 3 +- .../clang/lib/Index/FileIndexRecord.cpp | 12 +- contrib/llvm-project/clang/lib/Index/IndexBody.cpp | 2 +- .../llvm-project/clang/lib/Index/IndexingContext.h | 14 +- .../llvm-project/clang/lib/Index/USRGeneration.cpp | 148 +- .../clang/lib/Interpreter/IncrementalExecutor.cpp | 6 + .../clang/lib/Interpreter/IncrementalExecutor.h | 1 + .../clang/lib/Interpreter/IncrementalParser.cpp | 18 +- .../clang/lib/Interpreter/Interpreter.cpp | 26 +- .../clang/lib/Lex/DependencyDirectivesScanner.cpp | 94 +- contrib/llvm-project/clang/lib/Lex/HeaderMap.cpp | 21 +- .../llvm-project/clang/lib/Lex/HeaderSearch.cpp | 220 +- .../clang/lib/Lex/InitHeaderSearch.cpp | 146 +- contrib/llvm-project/clang/lib/Lex/Lexer.cpp | 283 +- .../llvm-project/clang/lib/Lex/LiteralSupport.cpp | 36 +- contrib/llvm-project/clang/lib/Lex/MacroArgs.cpp | 6 +- contrib/llvm-project/clang/lib/Lex/MacroInfo.cpp | 12 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 192 +- contrib/llvm-project/clang/lib/Lex/PPCallbacks.cpp | 5 +- .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 119 +- .../llvm-project/clang/lib/Lex/PPExpressions.cpp | 2 +- .../llvm-project/clang/lib/Lex/PPLexerChange.cpp | 7 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 89 +- contrib/llvm-project/clang/lib/Lex/Pragma.cpp | 33 +- .../clang/lib/Lex/PreprocessingRecord.cpp | 23 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 98 +- .../clang/lib/Lex/TokenConcatenation.cpp | 2 +- contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp | 114 +- .../llvm-project/clang/lib/Lex/UnicodeCharSets.h | 305 +- contrib/llvm-project/clang/lib/Parse/ParseAST.cpp | 14 +- .../clang/lib/Parse/ParseCXXInlineMethods.cpp | 13 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 414 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 253 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 166 +- .../llvm-project/clang/lib/Parse/ParseExprCXX.cpp | 198 +- contrib/llvm-project/clang/lib/Parse/ParseHLSL.cpp | 168 +- contrib/llvm-project/clang/lib/Parse/ParseInit.cpp | 4 +- contrib/llvm-project/clang/lib/Parse/ParseObjc.cpp | 91 +- .../llvm-project/clang/lib/Parse/ParseOpenMP.cpp | 491 +- .../llvm-project/clang/lib/Parse/ParsePragma.cpp | 108 +- contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp | 134 +- .../llvm-project/clang/lib/Parse/ParseTemplate.cpp | 55 +- .../clang/lib/Parse/ParseTentative.cpp | 183 +- contrib/llvm-project/clang/lib/Parse/Parser.cpp | 161 +- .../llvm-project/clang/lib/Rewrite/HTMLRewrite.cpp | 4 +- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 108 +- .../clang/lib/Sema/CodeCompleteConsumer.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/DeclSpec.cpp | 25 +- .../clang/lib/Sema/HLSLExternalSemaSource.cpp | 425 +- .../clang/lib/Sema/IdentifierResolver.cpp | 8 +- .../clang/lib/Sema/JumpDiagnostics.cpp | 2 +- .../clang/lib/Sema/MultiplexExternalSemaSource.cpp | 24 +- .../llvm-project/clang/lib/Sema/OpenCLBuiltins.td | 1 + contrib/llvm-project/clang/lib/Sema/ParsedAttr.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/Scope.cpp | 9 +- contrib/llvm-project/clang/lib/Sema/ScopeInfo.cpp | 9 +- contrib/llvm-project/clang/lib/Sema/Sema.cpp | 135 +- contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp | 2 + contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 24 +- .../clang/lib/Sema/SemaAvailability.cpp | 31 +- contrib/llvm-project/clang/lib/Sema/SemaCUDA.cpp | 18 +- .../clang/lib/Sema/SemaCXXScopeSpec.cpp | 7 +- contrib/llvm-project/clang/lib/Sema/SemaCast.cpp | 86 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 938 +- .../clang/lib/Sema/SemaCodeComplete.cpp | 161 +- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 692 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 244 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 1145 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 454 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 804 +- .../llvm-project/clang/lib/Sema/SemaDeclObjC.cpp | 108 +- .../clang/lib/Sema/SemaExceptionSpec.cpp | 5 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 1126 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 399 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 29 +- .../llvm-project/clang/lib/Sema/SemaExprObjC.cpp | 114 +- .../llvm-project/clang/lib/Sema/SemaFixItUtils.cpp | 6 +- contrib/llvm-project/clang/lib/Sema/SemaHLSL.cpp | 34 + contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 394 +- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 222 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 111 +- contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 115 +- .../clang/lib/Sema/SemaObjCProperty.cpp | 19 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 916 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 601 +- .../clang/lib/Sema/SemaPseudoObject.cpp | 10 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 106 +- contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 166 +- .../llvm-project/clang/lib/Sema/SemaStmtAsm.cpp | 31 +- .../llvm-project/clang/lib/Sema/SemaStmtAttr.cpp | 51 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 1253 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 1170 +- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 1000 +- .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 406 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 286 +- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 704 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 729 +- .../llvm-project/clang/lib/Sema/TypeLocBuilder.cpp | 29 +- .../llvm-project/clang/lib/Sema/TypeLocBuilder.h | 12 +- .../llvm-project/clang/lib/Sema/UsedDeclVisitor.h | 17 + .../clang/lib/Serialization/ASTCommon.cpp | 7 +- .../clang/lib/Serialization/ASTReader.cpp | 2217 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 386 +- .../clang/lib/Serialization/ASTReaderStmt.cpp | 88 +- .../clang/lib/Serialization/ASTWriter.cpp | 500 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 181 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 63 +- .../clang/lib/Serialization/ModuleManager.cpp | 21 +- .../Checkers/AnalyzerStatsChecker.cpp | 5 +- .../Checkers/ArrayBoundCheckerV2.cpp | 9 +- .../Checkers/BasicObjCFoundationChecks.cpp | 46 +- .../Checkers/BlockInCriticalSectionChecker.cpp | 22 +- .../Checkers/BoolAssignmentChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/CStringChecker.cpp | 211 +- .../StaticAnalyzer/Checkers/CastValueChecker.cpp | 4 +- .../StaticAnalyzer/Checkers/CheckObjCDealloc.cpp | 7 +- .../lib/StaticAnalyzer/Checkers/ChrootChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/ContainerModeling.cpp | 28 +- .../StaticAnalyzer/Checkers/DeadStoresChecker.cpp | 35 +- .../Checkers/DebugContainerModeling.cpp | 4 +- .../Checkers/DebugIteratorModeling.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp | 3 +- .../Checkers/DynamicTypePropagation.cpp | 5 +- .../Checkers/EnumCastOutOfRangeChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/ErrnoChecker.cpp | 11 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.cpp | 76 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.h | 62 +- .../StaticAnalyzer/Checkers/ErrnoTesterChecker.cpp | 13 +- .../Checkers/ExprInspectionChecker.cpp | 72 +- .../Checkers/FuchsiaHandleChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/GTestChecker.cpp | 3 +- .../Checkers/GenericTaintChecker.cpp | 315 +- .../Checkers/IvarInvalidationChecker.cpp | 3 +- .../Checkers/LocalizationChecker.cpp | 5 +- .../lib/StaticAnalyzer/Checkers/MIGChecker.cpp | 5 +- .../Checkers/MacOSKeychainAPIChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/MallocChecker.cpp | 270 +- .../Checkers/MallocOverflowSecurityChecker.cpp | 38 +- .../Checkers/MismatchedIteratorChecker.cpp | 6 +- .../Checkers/MmapWriteExecChecker.cpp | 2 +- .../lib/StaticAnalyzer/Checkers/MoveChecker.cpp | 12 +- .../lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp | 5 +- .../Checkers/NoReturnFunctionChecker.cpp | 8 +- .../Checkers/NonNullParamChecker.cpp | 4 +- .../Checkers/NonnullGlobalConstantsChecker.cpp | 21 +- .../StaticAnalyzer/Checkers/NullabilityChecker.cpp | 136 +- .../Checkers/NumberObjectConversionChecker.cpp | 21 +- .../Checkers/ObjCContainersASTChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/PthreadLockChecker.cpp | 76 +- .../RetainCountChecker/RetainCountChecker.cpp | 17 +- .../RetainCountChecker/RetainCountDiagnostics.cpp | 38 +- .../StaticAnalyzer/Checkers/ReturnValueChecker.cpp | 14 +- .../Checkers/SimpleStreamChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/SmartPtrModeling.cpp | 14 +- .../Checkers/StackAddrEscapeChecker.cpp | 16 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 635 +- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 241 +- .../clang/lib/StaticAnalyzer/Checkers/Taint.cpp | 3 +- .../Checkers/TestAfterDivZeroChecker.cpp | 5 +- .../StaticAnalyzer/Checkers/UndefBranchChecker.cpp | 3 +- .../Checkers/UndefCapturedBlockVarChecker.cpp | 5 +- .../Checkers/UndefinedAssignmentChecker.cpp | 2 +- .../Checkers/UndefinedNewArraySizeChecker.cpp | 80 + .../UninitializedObject/UninitializedPointee.cpp | 17 +- .../lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp | 6 +- .../Checkers/UnreachableCodeChecker.cpp | 7 +- .../lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/ValistChecker.cpp | 41 +- .../lib/StaticAnalyzer/Checkers/VforkChecker.cpp | 5 +- .../StaticAnalyzer/Checkers/WebKit/ASTUtils.cpp | 5 +- .../Checkers/WebKit/NoUncountedMembersChecker.cpp | 9 +- .../Checkers/WebKit/PtrTypesSemantics.cpp | 49 +- .../Checkers/WebKit/PtrTypesSemantics.h | 21 +- .../WebKit/RefCntblBaseVirtualDtorChecker.cpp | 4 +- .../Checkers/WebKit/UncountedCallArgsChecker.cpp | 3 +- .../WebKit/UncountedLambdaCapturesChecker.cpp | 13 +- .../Checkers/WebKit/UncountedLocalVarsChecker.cpp | 3 +- *** 1032738 LINES SKIPPED *** From nobody Sun Jul 23 18:27:01 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 4R8BbB4BSDz4p6BP; Sun, 23 Jul 2023 18:27:02 +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 4R8BbB3Gt1z3RJp; Sun, 23 Jul 2023 18:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136822; 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=NKpURGIuAXxMROmHZVjpgQIUAcrJsFMdF6QT2b1oZ9c=; b=sFyioUC2tAGLKGPik+dmF7XJPpbdV/34lXUkmn2MySsAUCjCHGY/7graZbOvFrAuV+IPPM OUN8BGg8b4/XnGt3SMnAtawOomxxgPfnTfetLhqe664GEFtCHGbgEwoNlkCAnIU829AuX/ M39vmiPy/KBJq9s0gO0tzzn16S2K9WGpCblpqqdhoF0XMGAvPijBNcNNFu5v/pIn4CJY6A 0tKBVJBQ7ip4t9pjIZUP5iUHb6OcfLitAkuR2hO6NjQRdYKPqzAC5QXqGYBlU4YXBmEcuK VTLBJ9Ao1crKTt8uec5rREPqes2ujmQtNOV6W9Y/tr7S7sj1FaoRpNlxYrHLsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136822; 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=NKpURGIuAXxMROmHZVjpgQIUAcrJsFMdF6QT2b1oZ9c=; b=Ajhbnid5ndnXmuAUYo8Ir7IcPsclbVv9WpL494OBqvDDeHPrSapkn8khwYz2u5QoxFhV25 BLq2b5G47cc/0PN2jjGk6TdX1tMJ6fR4XTEy80PELU9t0fgBIgn87iv7nBq6S+Qy0wQMvJ tGeP4UBbzin8x75YPasZdYyp30UminAYTWja2dNgY7XtfX9PdtJYvZSFC3Up/nKunqLrbW CBtWdwXNFJTXvMMM+lN3rZzSvW7IFUcQsI4nAEibMHC3FSDBiwB5O5gyjI9Y/7mtlG24u9 8HY1G6tnXeGBFTZva6UaW5r032Sdjo+ZaAeDCeaplnd+YFIeRhiwDoUGovqalg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136822; a=rsa-sha256; cv=none; b=O6kT1xXzK51GNRvHnwlGluHXWy9kYfb/Yfk6OfB7+0ROE7zA888RaUfTwccC1oO3DuZ/uZ WQAsB+bSDvEqRD+Yw3PWYfax6ss9l6yaJ3S4Lvd7blHHYpVDST5TUhDxzypIjdV1zrArCe rYboiAewU6NWnH2l6RmgbLr231bSZnhCxQWbP+Av9TIkYVOTJ7ZG3Bq1/S7z+QqslY3lx6 H0IVLIJzLnsbHdjQAOifVsKK8dh/6HmQSVYJ8yiEzeaQe9IHPpXrhAQOTHn9KItvjs69GN mSMWAAmMwM1XaBizcpbQL8vTOw1ozY4Z6fojbIea80u258KIxfI64b5s2D9Duw== 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 4R8BbB2HcjzmKp; Sun, 23 Jul 2023 18:27:02 +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 36NIR2cj058644; Sun, 23 Jul 2023 18:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR1w8058643; Sun, 23 Jul 2023 18:27:01 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:01 GMT Message-Id: <202307231827.36NIR1w8058643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 49071a9c083d - stable/13 - Merge llvm-project release/16.x llvmorg-16.0.1-0-gcd89023f7979 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 49071a9c083dd7841f8cdf5a1f7023a945262e2d Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=49071a9c083dd7841f8cdf5a1f7023a945262e2d commit 49071a9c083dd7841f8cdf5a1f7023a945262e2d Author: Dimitry Andric AuthorDate: 2023-04-17 17:14:23 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:08 +0000 Merge llvm-project release/16.x llvmorg-16.0.1-0-gcd89023f7979 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.1-0-gcd89023f7979 (aka 16.0.1 release). PR: 271047 MFC after: 1 month (cherry picked from commit 1ac55f4cb0001fed92329746c730aa9a947c09a5) --- contrib/llvm-project/clang/include/clang-c/Index.h | 2 +- .../include/clang/Basic/DiagnosticParseKinds.td | 7 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 5 +- .../clang/include/clang/Basic/arm_sve.td | 41 +- .../clang/include/clang/Basic/riscv_vector.td | 102 +- .../clang/include/clang/Driver/Options.td | 2 + .../clang/include/clang/Format/Format.h | 39 +- .../clang/include/clang/Lex/Preprocessor.h | 184 +- .../clang/include/clang/Sema/DeclSpec.h | 10 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 38 +- .../clang/include/clang/Sema/SemaInternal.h | 4 +- .../StaticAnalyzer/Core/PathSensitive/SMTConv.h | 4 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 46 +- .../DependencyScanning/DependencyScanningService.h | 6 +- .../DependencyScanning/DependencyScanningTool.h | 27 +- .../DependencyScanning/DependencyScanningWorker.h | 6 +- .../DependencyScanning/ModuleDepCollector.h | 29 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 2 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 12 +- .../clang/lib/Basic/Targets/AArch64.cpp | 6 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 3 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 8 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 8 +- contrib/llvm-project/clang/lib/CodeGen/CGCXXABI.h | 5 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 4 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 11 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 21 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 98 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 4 +- .../clang/lib/Driver/SanitizerArgs.cpp | 4 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 93 +- .../clang/lib/Driver/ToolChains/Arch/PPC.h | 2 + .../clang/lib/Driver/ToolChains/Clang.cpp | 11 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 15 +- .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 71 +- .../clang/lib/Driver/ToolChains/FreeBSD.h | 14 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 2 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 10 + contrib/llvm-project/clang/lib/Format/Format.cpp | 8 +- .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 56 +- .../lib/Format/IntegerLiteralSeparatorFixer.h | 3 +- .../clang/lib/Format/QualifierAlignmentFixer.cpp | 5 +- .../clang/lib/Format/TokenAnnotator.cpp | 3 + .../clang/lib/Format/UnwrappedLineParser.cpp | 31 +- .../clang/lib/Frontend/CompilerInstance.cpp | 9 +- contrib/llvm-project/clang/lib/Headers/immintrin.h | 4 +- contrib/llvm-project/clang/lib/Headers/smmintrin.h | 2 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 37 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 44 +- contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp | 12 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 11 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 5 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 8 - contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 17 - .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 27 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 34 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 3 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 10 +- contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 13 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 5 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 11 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 7 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 234 ++- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 6 - .../llvm-project/clang/lib/Sema/TreeTransform.h | 3 +- .../Checkers/ReturnPointerRangeChecker.cpp | 4 + .../clang/lib/StaticAnalyzer/Core/BugReporter.cpp | 2 +- .../StaticAnalyzer/Core/RangeConstraintManager.cpp | 13 +- .../clang/lib/StaticAnalyzer/Core/RegionStore.cpp | 8 +- .../clang/lib/Support/RISCVVIntrinsicUtils.cpp | 90 +- .../DependencyScanning/DependencyScanningTool.cpp | 150 +- .../DependencyScanningWorker.cpp | 4 +- .../DependencyScanning/ModuleDepCollector.cpp | 33 +- .../clang/utils/TableGen/RISCVVEmitter.cpp | 5 +- .../compiler-rt/lib/builtins/cpu_model.c | 3 + .../sanitizer_common/sanitizer_linux_libcdep.cpp | 1 + .../sanitizer_common/sanitizer_symbolizer_win.cpp | 2 - .../include/__algorithm/ranges_binary_search.h | 4 +- .../llvm-project/libcxx/include/__algorithm/sort.h | 578 ++---- contrib/llvm-project/libcxx/include/__config | 38 +- .../libcxx/include/__expected/expected.h | 7 +- .../libcxx/include/__format/concepts.h | 5 +- .../libcxx/include/__format/format_functions.h | 8 +- .../include/__format/formatter_floating_point.h | 3 +- .../libcxx/include/__functional/function.h | 38 +- .../libcxx/include/__functional/hash.h | 4 + .../libcxx/include/__memory/construct_at.h | 10 + .../libcxx/include/__memory/shared_ptr.h | 218 ++- .../include/__memory/uninitialized_algorithms.h | 34 +- .../__memory_resource/polymorphic_allocator.h | 2 +- .../libcxx/include/__ranges/elements_view.h | 118 +- .../libcxx/include/__ranges/filter_view.h | 50 +- .../libcxx/include/__ranges/iota_view.h | 432 ++--- .../libcxx/include/__ranges/istream_view.h | 26 +- .../libcxx/include/__ranges/join_view.h | 96 +- .../libcxx/include/__ranges/split_view.h | 52 +- .../libcxx/include/__ranges/take_while_view.h | 30 +- .../libcxx/include/__ranges/transform_view.h | 127 +- .../libcxx/include/__type_traits/add_pointer.h | 4 +- .../libcxx/include/__type_traits/remove_pointer.h | 4 +- .../libcxx/include/__utility/exception_guard.h | 47 +- contrib/llvm-project/libcxx/include/any | 10 +- .../libcxx/include/module.modulemap.in | 16 +- .../llvm-project/libcxx/include/source_location | 6 +- contrib/llvm-project/libcxx/include/version | 4 +- .../libunwind/include/libunwind.modulemap | 3 + contrib/llvm-project/libunwind/include/unwind.h | 4 +- .../libunwind/src/DwarfInstructions.hpp | 3 +- .../libunwind/src/UnwindRegistersRestore.S | 18 + .../libunwind/src/UnwindRegistersSave.S | 11 + contrib/llvm-project/lld/COFF/MinGW.cpp | 3 + contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 6 +- contrib/llvm-project/lld/ELF/ICF.cpp | 10 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 10 +- contrib/llvm-project/lld/ELF/SymbolTable.cpp | 4 +- contrib/llvm-project/lld/docs/ReleaseNotes.rst | 17 + .../Plugins/Language/CPlusPlus/Coroutines.cpp | 164 +- .../source/Plugins/Language/CPlusPlus/Coroutines.h | 7 +- .../Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 143 +- .../NativeRegisterContextFreeBSD_mips64.cpp | 4 +- .../NativeRegisterContextFreeBSD_powerpc.cpp | 4 +- .../llvm/include/llvm/Analysis/ScalarEvolution.h | 11 +- .../llvm/DebugInfo/LogicalView/Core/LVElement.h | 1 - .../llvm/DebugInfo/LogicalView/Core/LVStringPool.h | 7 - .../llvm/DebugInfo/LogicalView/Core/LVSupport.h | 4 + .../llvm/include/llvm/Debuginfod/Debuginfod.h | 6 +- .../llvm/include/llvm/IR/IntrinsicsAArch64.td | 31 + .../llvm/ProfileData/Coverage/CoverageMapping.h | 16 +- .../ProfileData/Coverage/CoverageMappingReader.h | 3 +- .../llvm/include/llvm/Support/ExitCodes.h | 6 +- .../llvm/include/llvm/Support/RISCVISAInfo.h | 6 + .../llvm/include/llvm/Support/Signals.h | 11 +- .../include/llvm/TargetParser/RISCVTargetParser.h | 5 + .../llvm/include/llvm/TargetParser/Triple.h | 8 + .../llvm/include/llvm/Transforms/IPO/OpenMPOpt.h | 12 + .../llvm/lib/Analysis/LazyValueInfo.cpp | 13 +- .../llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 + .../llvm-project/llvm/lib/CodeGen/IfConversion.cpp | 9 + .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 13 +- .../llvm/lib/CodeGen/TargetLoweringBase.cpp | 4 +- .../lib/DebugInfo/LogicalView/Core/LVSupport.cpp | 6 + .../llvm/lib/DebugInfo/Symbolize/Symbolize.cpp | 27 +- .../llvm/lib/Debuginfod/Debuginfod.cpp | 19 +- .../lib/ExecutionEngine/JITLink/ELF_aarch64.cpp | 1 + .../llvm/lib/ExecutionEngine/Orc/Layer.cpp | 4 + contrib/llvm-project/llvm/lib/IR/AutoUpgrade.cpp | 35 + contrib/llvm-project/llvm/lib/IR/Verifier.cpp | 6 - .../llvm-project/llvm/lib/Object/ELFObjectFile.cpp | 7 +- .../llvm/lib/Passes/PassBuilderPipelines.cpp | 14 +- .../llvm-project/llvm/lib/Passes/PassRegistry.def | 1 + .../lib/ProfileData/Coverage/CoverageMapping.cpp | 110 +- .../ProfileData/Coverage/CoverageMappingReader.cpp | 19 +- .../lib/Support/BLAKE3/blake3_avx2_x86-64_unix.S | 2 + .../BLAKE3/blake3_avx2_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_avx2_x86-64_windows_msvc.asm | 12 +- .../lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S | 2 + .../BLAKE3/blake3_avx512_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_avx512_x86-64_windows_msvc.asm | 36 +- .../llvm/lib/Support/BLAKE3/blake3_impl.h | 10 +- .../lib/Support/BLAKE3/blake3_sse2_x86-64_unix.S | 2 + .../BLAKE3/blake3_sse2_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_sse2_x86-64_windows_msvc.asm | 36 +- .../lib/Support/BLAKE3/blake3_sse41_x86-64_unix.S | 2 + .../BLAKE3/blake3_sse41_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_sse41_x86-64_windows_msvc.asm | 36 +- .../llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h | 41 + contrib/llvm-project/llvm/lib/Support/Parallel.cpp | 8 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 63 + .../llvm-project/llvm/lib/Support/Windows/Path.inc | 2 - .../llvm/lib/Support/Windows/Signals.inc | 23 +- contrib/llvm-project/llvm/lib/Support/Z3Solver.cpp | 2 +- .../llvm-project/llvm/lib/Support/raw_ostream.cpp | 12 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 14 +- .../llvm/lib/Target/AArch64/SVEInstrFormats.td | 52 +- .../llvm/lib/Target/ARM/ARMFrameLowering.cpp | 28 + .../llvm-project/llvm/lib/Target/BPF/BTFDebug.cpp | 46 +- .../llvm-project/llvm/lib/Target/BPF/BTFDebug.h | 3 + .../Target/Hexagon/AsmParser/HexagonAsmParser.cpp | 2 +- .../llvm/lib/Target/PowerPC/PPCTargetMachine.cpp | 3 +- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 10 + .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 22 + .../llvm/lib/Target/RISCV/RISCVISelLowering.h | 4 + .../llvm/lib/Target/RISCV/RISCVSExtWRemoval.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVSubtarget.cpp | 3 + .../llvm/lib/Target/RISCV/RISCVSubtarget.h | 2 + .../Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp | 2 + .../llvm/lib/Target/Sparc/SparcInstrInfo.cpp | 121 +- .../llvm/lib/Target/Sparc/SparcInstrInfo.h | 9 + .../llvm/lib/Target/Sparc/SparcInstrInfo.td | 9 +- .../llvm/lib/Target/Sparc/SparcTargetMachine.cpp | 7 + contrib/llvm-project/llvm/lib/Target/X86/X86.td | 3 +- .../llvm/lib/Target/X86/X86CallingConv.td | 4 +- .../llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 5 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 101 +- .../llvm/lib/Target/X86/X86ISelLowering.h | 6 + .../llvm/lib/Target/X86/X86InstrCompiler.td | 6 +- .../llvm/lib/Target/X86/X86InstrFPStack.td | 15 + .../llvm/lib/Target/X86/X86InstrSSE.td | 17 + .../llvm/lib/Target/X86/X86PfmCounters.td | 15 +- .../llvm/lib/Target/X86/X86ScheduleZnver4.td | 1957 ++++++++++++++++++++ .../llvm/lib/TargetParser/ARMTargetParser.cpp | 2 +- .../llvm/lib/TargetParser/RISCVTargetParser.cpp | 6 + .../llvm/lib/Transforms/IPO/Attributor.cpp | 22 +- .../lib/Transforms/IPO/AttributorAttributes.cpp | 32 +- .../llvm/lib/Transforms/IPO/OpenMPOpt.cpp | 79 +- .../Transforms/InstCombine/InstCombineCompares.cpp | 16 +- .../llvm/lib/Transforms/Utils/Local.cpp | 3 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 15 +- .../llvm/tools/llvm-cov/CodeCoverage.cpp | 32 +- .../llvm/tools/llvm-objdump/ObjdumpOpts.td | 4 +- .../llvm/tools/llvm-objdump/llvm-objdump.cpp | 4 +- .../llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp | 8 +- contrib/llvm-project/openmp/runtime/src/kmp_os.h | 2 +- .../openmp/runtime/src/kmp_runtime.cpp | 6 +- .../openmp/runtime/src/kmp_safe_c_api.h | 2 + .../llvm-project/openmp/runtime/src/kmp_str.cpp | 8 +- .../llvm-project/openmp/runtime/src/z_Linux_asm.S | 5 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 9 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- usr.bin/clang/llvm-cov/Makefile | 1 + 227 files changed, 5335 insertions(+), 2401 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang-c/Index.h b/contrib/llvm-project/clang/include/clang-c/Index.h index fd758ddde085..a3e54285f89f 100644 --- a/contrib/llvm-project/clang/include/clang-c/Index.h +++ b/contrib/llvm-project/clang/include/clang-c/Index.h @@ -34,7 +34,7 @@ * compatible, thus CINDEX_VERSION_MAJOR is expected to remain stable. */ #define CINDEX_VERSION_MAJOR 0 -#define CINDEX_VERSION_MINOR 62 +#define CINDEX_VERSION_MINOR 63 #define CINDEX_VERSION_ENCODE(major, minor) (((major)*10000) + ((minor)*1)) diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticParseKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticParseKinds.td index c367a34b762b..e99beb3a7636 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticParseKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticParseKinds.td @@ -1052,7 +1052,7 @@ def err_lambda_template_parameter_list_empty : Error< // C++2b static lambdas def err_static_lambda: ExtWarn< "static lambdas are a C++2b extension">, InGroup; -def warn_cxx20_compat_static_lambda: ExtWarn< +def warn_cxx20_compat_static_lambda : Warning< "static lambdas are incompatible with C++ standards before C++2b">, InGroup, DefaultIgnore; def err_static_mutable_lambda : Error< @@ -1607,11 +1607,6 @@ def err_import_in_wrong_fragment : Error< def err_export_empty : Error<"export declaration cannot be empty">; } -def ext_offsetof_member_designator : Extension< - "using %select{a member access expression|an array subscript expression}0 " - "within '%select{__builtin_offsetof|offsetof}1' is a Clang extension">, - InGroup; - let CategoryName = "Generics Issue" in { def err_objc_expected_type_parameter : Error< diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td index de56e3e1566b..bfe582d8252f 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -9138,8 +9138,9 @@ def err_operator_overload_static : Error< def err_operator_overload_default_arg : Error< "parameter of overloaded %0 cannot have a default argument">; -def ext_subscript_overload : ExtWarn< - "overloaded %0 with %select{no|a defaulted|more than one}1 parameter is a C++2b extension">, InGroup, DefaultIgnore; +def ext_subscript_overload : Warning< + "overloaded %0 with %select{no|a defaulted|more than one}1 parameter is a " + "C++2b extension">, InGroup, DefaultIgnore; def error_subscript_overload : Error< "overloaded %0 cannot have %select{no|a defaulted|more than one}1 parameter before C++2b">; diff --git a/contrib/llvm-project/clang/include/clang/Basic/arm_sve.td b/contrib/llvm-project/clang/include/clang/Basic/arm_sve.td index e910036117b7..e547bbd34b5e 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/arm_sve.td +++ b/contrib/llvm-project/clang/include/clang/Basic/arm_sve.td @@ -1249,16 +1249,37 @@ def SVZIP1_BF16 : SInst<"svzip1[_{d}]", "ddd", "b", MergeNone, "aarch64_sve def SVZIP2_BF16 : SInst<"svzip2[_{d}]", "ddd", "b", MergeNone, "aarch64_sve_zip2">; } -def SVREV_B : SInst<"svrev_{d}", "PP", "PcPsPiPl", MergeNone, "aarch64_sve_rev">; -def SVSEL_B : SInst<"svsel[_b]", "PPPP", "Pc", MergeNone, "aarch64_sve_sel">; -def SVTRN1_B : SInst<"svtrn1_{d}", "PPP", "PcPsPiPl", MergeNone, "aarch64_sve_trn1">; -def SVTRN2_B : SInst<"svtrn2_{d}", "PPP", "PcPsPiPl", MergeNone, "aarch64_sve_trn2">; -def SVPUNPKHI : SInst<"svunpkhi[_b]", "PP", "Pc", MergeNone, "aarch64_sve_punpkhi">; -def SVPUNPKLO : SInst<"svunpklo[_b]", "PP", "Pc", MergeNone, "aarch64_sve_punpklo">; -def SVUZP1_B : SInst<"svuzp1_{d}", "PPP", "PcPsPiPl", MergeNone, "aarch64_sve_uzp1">; -def SVUZP2_B : SInst<"svuzp2_{d}", "PPP", "PcPsPiPl", MergeNone, "aarch64_sve_uzp2">; -def SVZIP1_B : SInst<"svzip1_{d}", "PPP", "PcPsPiPl", MergeNone, "aarch64_sve_zip1">; -def SVZIP2_B : SInst<"svzip2_{d}", "PPP", "PcPsPiPl", MergeNone, "aarch64_sve_zip2">; +def SVREV_B8 : SInst<"svrev_b8", "PP", "Pc", MergeNone, "aarch64_sve_rev">; +def SVREV_B16 : SInst<"svrev_b16", "PP", "Pc", MergeNone, "aarch64_sve_rev_b16", [IsOverloadNone]>; +def SVREV_B32 : SInst<"svrev_b32", "PP", "Pc", MergeNone, "aarch64_sve_rev_b32", [IsOverloadNone]>; +def SVREV_B64 : SInst<"svrev_b64", "PP", "Pc", MergeNone, "aarch64_sve_rev_b64", [IsOverloadNone]>; +def SVSEL_B : SInst<"svsel[_b]", "PPPP", "Pc", MergeNone, "aarch64_sve_sel">; +def SVTRN1_B8 : SInst<"svtrn1_b8", "PPP", "Pc", MergeNone, "aarch64_sve_trn1">; +def SVTRN1_B16 : SInst<"svtrn1_b16", "PPP", "Pc", MergeNone, "aarch64_sve_trn1_b16", [IsOverloadNone]>; +def SVTRN1_B32 : SInst<"svtrn1_b32", "PPP", "Pc", MergeNone, "aarch64_sve_trn1_b32", [IsOverloadNone]>; +def SVTRN1_B64 : SInst<"svtrn1_b64", "PPP", "Pc", MergeNone, "aarch64_sve_trn1_b64", [IsOverloadNone]>; +def SVTRN2_B8 : SInst<"svtrn2_b8", "PPP", "Pc", MergeNone, "aarch64_sve_trn2">; +def SVTRN2_B16 : SInst<"svtrn2_b16", "PPP", "Pc", MergeNone, "aarch64_sve_trn2_b16", [IsOverloadNone]>; +def SVTRN2_B32 : SInst<"svtrn2_b32", "PPP", "Pc", MergeNone, "aarch64_sve_trn2_b32", [IsOverloadNone]>; +def SVTRN2_B64 : SInst<"svtrn2_b64", "PPP", "Pc", MergeNone, "aarch64_sve_trn2_b64", [IsOverloadNone]>; +def SVPUNPKHI : SInst<"svunpkhi[_b]", "PP", "Pc", MergeNone, "aarch64_sve_punpkhi">; +def SVPUNPKLO : SInst<"svunpklo[_b]", "PP", "Pc", MergeNone, "aarch64_sve_punpklo">; +def SVUZP1_B8 : SInst<"svuzp1_b8", "PPP", "Pc", MergeNone, "aarch64_sve_uzp1">; +def SVUZP1_B16 : SInst<"svuzp1_b16", "PPP", "Pc", MergeNone, "aarch64_sve_uzp1_b16", [IsOverloadNone]>; +def SVUZP1_B32 : SInst<"svuzp1_b32", "PPP", "Pc", MergeNone, "aarch64_sve_uzp1_b32", [IsOverloadNone]>; +def SVUZP1_B64 : SInst<"svuzp1_b64", "PPP", "Pc", MergeNone, "aarch64_sve_uzp1_b64", [IsOverloadNone]>; +def SVUZP2_B8 : SInst<"svuzp2_b8", "PPP", "Pc", MergeNone, "aarch64_sve_uzp2">; +def SVUZP2_B16 : SInst<"svuzp2_b16", "PPP", "Pc", MergeNone, "aarch64_sve_uzp2_b16", [IsOverloadNone]>; +def SVUZP2_B32 : SInst<"svuzp2_b32", "PPP", "Pc", MergeNone, "aarch64_sve_uzp2_b32", [IsOverloadNone]>; +def SVUZP2_B64 : SInst<"svuzp2_b64", "PPP", "Pc", MergeNone, "aarch64_sve_uzp2_b64", [IsOverloadNone]>; +def SVZIP1_B8 : SInst<"svzip1_b8", "PPP", "Pc", MergeNone, "aarch64_sve_zip1">; +def SVZIP1_B16 : SInst<"svzip1_b16", "PPP", "Pc", MergeNone, "aarch64_sve_zip1_b16", [IsOverloadNone]>; +def SVZIP1_B32 : SInst<"svzip1_b32", "PPP", "Pc", MergeNone, "aarch64_sve_zip1_b32", [IsOverloadNone]>; +def SVZIP1_B64 : SInst<"svzip1_b64", "PPP", "Pc", MergeNone, "aarch64_sve_zip1_b64", [IsOverloadNone]>; +def SVZIP2_B : SInst<"svzip2_b8", "PPP", "Pc", MergeNone, "aarch64_sve_zip2">; +def SVZIP2_B16 : SInst<"svzip2_b16", "PPP", "Pc", MergeNone, "aarch64_sve_zip2_b16", [IsOverloadNone]>; +def SVZIP2_B32 : SInst<"svzip2_b32", "PPP", "Pc", MergeNone, "aarch64_sve_zip2_b32", [IsOverloadNone]>; +def SVZIP2_B64 : SInst<"svzip2_b64", "PPP", "Pc", MergeNone, "aarch64_sve_zip2_b64", [IsOverloadNone]>; //////////////////////////////////////////////////////////////////////////////// // Predicate creation diff --git a/contrib/llvm-project/clang/include/clang/Basic/riscv_vector.td b/contrib/llvm-project/clang/include/clang/Basic/riscv_vector.td index c63cba9aa459..b23e26ecaa57 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/riscv_vector.td +++ b/contrib/llvm-project/clang/include/clang/Basic/riscv_vector.td @@ -1539,7 +1539,7 @@ enum RVV_CSR { }; static __inline__ __attribute__((__always_inline__, __nodebug__)) -unsigned long vread_csr(enum RVV_CSR __csr) { +unsigned long __riscv_vread_csr(enum RVV_CSR __csr) { unsigned long __rv = 0; switch (__csr) { case RVV_VSTART: @@ -1559,7 +1559,7 @@ unsigned long vread_csr(enum RVV_CSR __csr) { } static __inline__ __attribute__((__always_inline__, __nodebug__)) -void vwrite_csr(enum RVV_CSR __csr, unsigned long __value) { +void __riscv_vwrite_csr(enum RVV_CSR __csr, unsigned long __value) { switch (__csr) { case RVV_VSTART: __asm__ __volatile__ ("csrw\tvstart, %z0" : : "rJ"(__value) : "memory"); @@ -1580,7 +1580,7 @@ def vread_vwrite_csr: RVVHeader; let HeaderCode = [{ -#define vlenb() __builtin_rvv_vlenb() +#define __riscv_vlenb() __builtin_rvv_vlenb() }] in def vlenb_macro: RVVHeader; @@ -1611,62 +1611,62 @@ let HasBuiltinAlias = false, HasVL = false, HasMasked = false, // and LMUL. let HeaderCode = [{ -#define vsetvl_e8mf4(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 6) -#define vsetvl_e8mf2(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 7) -#define vsetvl_e8m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 0) -#define vsetvl_e8m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 1) -#define vsetvl_e8m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 2) -#define vsetvl_e8m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 3) - -#define vsetvl_e16mf2(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 7) -#define vsetvl_e16m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 0) -#define vsetvl_e16m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 1) -#define vsetvl_e16m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 2) -#define vsetvl_e16m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 3) - -#define vsetvl_e32m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 0) -#define vsetvl_e32m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 1) -#define vsetvl_e32m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 2) -#define vsetvl_e32m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 3) +#define __riscv_vsetvl_e8mf4(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 6) +#define __riscv_vsetvl_e8mf2(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 7) +#define __riscv_vsetvl_e8m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 0) +#define __riscv_vsetvl_e8m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 1) +#define __riscv_vsetvl_e8m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 2) +#define __riscv_vsetvl_e8m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 3) + +#define __riscv_vsetvl_e16mf2(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 7) +#define __riscv_vsetvl_e16m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 0) +#define __riscv_vsetvl_e16m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 1) +#define __riscv_vsetvl_e16m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 2) +#define __riscv_vsetvl_e16m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 3) + +#define __riscv_vsetvl_e32m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 0) +#define __riscv_vsetvl_e32m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 1) +#define __riscv_vsetvl_e32m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 2) +#define __riscv_vsetvl_e32m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 3) #if __riscv_v_elen >= 64 -#define vsetvl_e8mf8(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 5) -#define vsetvl_e16mf4(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 6) -#define vsetvl_e32mf2(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 7) - -#define vsetvl_e64m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 0) -#define vsetvl_e64m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 1) -#define vsetvl_e64m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 2) -#define vsetvl_e64m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 3) +#define __riscv_vsetvl_e8mf8(avl) __builtin_rvv_vsetvli((size_t)(avl), 0, 5) +#define __riscv_vsetvl_e16mf4(avl) __builtin_rvv_vsetvli((size_t)(avl), 1, 6) +#define __riscv_vsetvl_e32mf2(avl) __builtin_rvv_vsetvli((size_t)(avl), 2, 7) + +#define __riscv_vsetvl_e64m1(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 0) +#define __riscv_vsetvl_e64m2(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 1) +#define __riscv_vsetvl_e64m4(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 2) +#define __riscv_vsetvl_e64m8(avl) __builtin_rvv_vsetvli((size_t)(avl), 3, 3) #endif -#define vsetvlmax_e8mf4() __builtin_rvv_vsetvlimax(0, 6) -#define vsetvlmax_e8mf2() __builtin_rvv_vsetvlimax(0, 7) -#define vsetvlmax_e8m1() __builtin_rvv_vsetvlimax(0, 0) -#define vsetvlmax_e8m2() __builtin_rvv_vsetvlimax(0, 1) -#define vsetvlmax_e8m4() __builtin_rvv_vsetvlimax(0, 2) -#define vsetvlmax_e8m8() __builtin_rvv_vsetvlimax(0, 3) +#define __riscv_vsetvlmax_e8mf4() __builtin_rvv_vsetvlimax(0, 6) +#define __riscv_vsetvlmax_e8mf2() __builtin_rvv_vsetvlimax(0, 7) +#define __riscv_vsetvlmax_e8m1() __builtin_rvv_vsetvlimax(0, 0) +#define __riscv_vsetvlmax_e8m2() __builtin_rvv_vsetvlimax(0, 1) +#define __riscv_vsetvlmax_e8m4() __builtin_rvv_vsetvlimax(0, 2) +#define __riscv_vsetvlmax_e8m8() __builtin_rvv_vsetvlimax(0, 3) -#define vsetvlmax_e16mf2() __builtin_rvv_vsetvlimax(1, 7) -#define vsetvlmax_e16m1() __builtin_rvv_vsetvlimax(1, 0) -#define vsetvlmax_e16m2() __builtin_rvv_vsetvlimax(1, 1) -#define vsetvlmax_e16m4() __builtin_rvv_vsetvlimax(1, 2) -#define vsetvlmax_e16m8() __builtin_rvv_vsetvlimax(1, 3) +#define __riscv_vsetvlmax_e16mf2() __builtin_rvv_vsetvlimax(1, 7) +#define __riscv_vsetvlmax_e16m1() __builtin_rvv_vsetvlimax(1, 0) +#define __riscv_vsetvlmax_e16m2() __builtin_rvv_vsetvlimax(1, 1) +#define __riscv_vsetvlmax_e16m4() __builtin_rvv_vsetvlimax(1, 2) +#define __riscv_vsetvlmax_e16m8() __builtin_rvv_vsetvlimax(1, 3) -#define vsetvlmax_e32m1() __builtin_rvv_vsetvlimax(2, 0) -#define vsetvlmax_e32m2() __builtin_rvv_vsetvlimax(2, 1) -#define vsetvlmax_e32m4() __builtin_rvv_vsetvlimax(2, 2) -#define vsetvlmax_e32m8() __builtin_rvv_vsetvlimax(2, 3) +#define __riscv_vsetvlmax_e32m1() __builtin_rvv_vsetvlimax(2, 0) +#define __riscv_vsetvlmax_e32m2() __builtin_rvv_vsetvlimax(2, 1) +#define __riscv_vsetvlmax_e32m4() __builtin_rvv_vsetvlimax(2, 2) +#define __riscv_vsetvlmax_e32m8() __builtin_rvv_vsetvlimax(2, 3) #if __riscv_v_elen >= 64 -#define vsetvlmax_e8mf8() __builtin_rvv_vsetvlimax(0, 5) -#define vsetvlmax_e16mf4() __builtin_rvv_vsetvlimax(1, 6) -#define vsetvlmax_e32mf2() __builtin_rvv_vsetvlimax(2, 7) - -#define vsetvlmax_e64m1() __builtin_rvv_vsetvlimax(3, 0) -#define vsetvlmax_e64m2() __builtin_rvv_vsetvlimax(3, 1) -#define vsetvlmax_e64m4() __builtin_rvv_vsetvlimax(3, 2) -#define vsetvlmax_e64m8() __builtin_rvv_vsetvlimax(3, 3) +#define __riscv_vsetvlmax_e8mf8() __builtin_rvv_vsetvlimax(0, 5) +#define __riscv_vsetvlmax_e16mf4() __builtin_rvv_vsetvlimax(1, 6) +#define __riscv_vsetvlmax_e32mf2() __builtin_rvv_vsetvlimax(2, 7) + +#define __riscv_vsetvlmax_e64m1() __builtin_rvv_vsetvlimax(3, 0) +#define __riscv_vsetvlmax_e64m2() __builtin_rvv_vsetvlimax(3, 1) +#define __riscv_vsetvlmax_e64m4() __builtin_rvv_vsetvlimax(3, 2) +#define __riscv_vsetvlmax_e64m8() __builtin_rvv_vsetvlimax(3, 3) #endif }] in diff --git a/contrib/llvm-project/clang/include/clang/Driver/Options.td b/contrib/llvm-project/clang/include/clang/Driver/Options.td index 23752823e88f..652c15afcce8 100644 --- a/contrib/llvm-project/clang/include/clang/Driver/Options.td +++ b/contrib/llvm-project/clang/include/clang/Driver/Options.td @@ -4559,6 +4559,8 @@ def mnvs : Flag<["-"], "mnvs">, Group, Flags<[CC1Option]>, HelpText<"Enable generation of new-value stores">; def mno_nvs : Flag<["-"], "mno-nvs">, Group, Flags<[CC1Option]>, HelpText<"Disable generation of new-value stores">; +def mcabac: Flag<["-"], "mcabac">, Group, + HelpText<"Enable CABAC instructions">; // SPARC feature flags def mfpu : Flag<["-"], "mfpu">, Group; diff --git a/contrib/llvm-project/clang/include/clang/Format/Format.h b/contrib/llvm-project/clang/include/clang/Format/Format.h index 72efd3be1cc7..7a313460d888 100755 --- a/contrib/llvm-project/clang/include/clang/Format/Format.h +++ b/contrib/llvm-project/clang/include/clang/Format/Format.h @@ -2500,6 +2500,10 @@ struct FormatStyle { /// Decimal: 3 /// Hex: -1 /// \endcode + /// + /// You can also specify a minimum number of digits (``BinaryMinDigits``, + /// ``DecimalMinDigits``, and ``HexMinDigits``) the integer literal must + /// have in order for the separators to be inserted. struct IntegerLiteralSeparatorStyle { /// Format separators in binary literals. /// \code{.text} @@ -2509,6 +2513,14 @@ struct FormatStyle { /// /* 4: */ b = 0b1001'1110'1101; /// \endcode int8_t Binary; + /// Format separators in binary literals with a minimum number of digits. + /// \code{.text} + /// // Binary: 3 + /// // BinaryMinDigits: 7 + /// b1 = 0b101101; + /// b2 = 0b1'101'101; + /// \endcode + int8_t BinaryMinDigits; /// Format separators in decimal literals. /// \code{.text} /// /* -1: */ d = 18446744073709550592ull; @@ -2516,6 +2528,14 @@ struct FormatStyle { /// /* 3: */ d = 18'446'744'073'709'550'592ull; /// \endcode int8_t Decimal; + /// Format separators in decimal literals with a minimum number of digits. + /// \code{.text} + /// // Decimal: 3 + /// // DecimalMinDigits: 5 + /// d1 = 2023; + /// d2 = 10'000; + /// \endcode + int8_t DecimalMinDigits; /// Format separators in hexadecimal literals. /// \code{.text} /// /* -1: */ h = 0xDEADBEEFDEADBEEFuz; @@ -2523,6 +2543,20 @@ struct FormatStyle { /// /* 2: */ h = 0xDE'AD'BE'EF'DE'AD'BE'EFuz; /// \endcode int8_t Hex; + /// Format separators in hexadecimal literals with a minimum number of + /// digits. + /// \code{.text} + /// // Hex: 2 + /// // HexMinDigits: 6 + /// h1 = 0xABCDE; + /// h2 = 0xAB'CD'EF; + /// \endcode + int8_t HexMinDigits; + bool operator==(const IntegerLiteralSeparatorStyle &R) const { + return Binary == R.Binary && BinaryMinDigits == R.BinaryMinDigits && + Decimal == R.Decimal && DecimalMinDigits == R.DecimalMinDigits && + Hex == R.Hex && HexMinDigits == R.HexMinDigits; + } }; /// Format integer literal separators (``'`` for C++ and ``_`` for C#, Java, @@ -4212,10 +4246,7 @@ struct FormatStyle { IndentWrappedFunctionNames == R.IndentWrappedFunctionNames && InsertBraces == R.InsertBraces && InsertNewlineAtEOF == R.InsertNewlineAtEOF && - IntegerLiteralSeparator.Binary == R.IntegerLiteralSeparator.Binary && - IntegerLiteralSeparator.Decimal == - R.IntegerLiteralSeparator.Decimal && - IntegerLiteralSeparator.Hex == R.IntegerLiteralSeparator.Hex && + IntegerLiteralSeparator == R.IntegerLiteralSeparator && JavaImportGroups == R.JavaImportGroups && JavaScriptQuotes == R.JavaScriptQuotes && JavaScriptWrapImports == R.JavaScriptWrapImports && diff --git a/contrib/llvm-project/clang/include/clang/Lex/Preprocessor.h b/contrib/llvm-project/clang/include/clang/Lex/Preprocessor.h index f383a2e5b530..322626802eab 100644 --- a/contrib/llvm-project/clang/include/clang/Lex/Preprocessor.h +++ b/contrib/llvm-project/clang/include/clang/Lex/Preprocessor.h @@ -193,11 +193,6 @@ class Preprocessor { LangOptions::FPEvalMethodKind CurrentFPEvalMethod = LangOptions::FPEvalMethodKind::FEM_UnsetOnCommandLine; - // Keeps the value of the last evaluation method before a - // `pragma float_control (precise,off) is applied. - LangOptions::FPEvalMethodKind LastFPEvalMethod = - LangOptions::FPEvalMethodKind::FEM_UnsetOnCommandLine; - // The most recent pragma location where the floating point evaluation // method was modified. This is used to determine whether the // 'pragma clang fp eval_method' was used whithin the current scope. @@ -313,6 +308,9 @@ private: /// The import path for named module that we're currently processing. SmallVector, 2> NamedModuleImportPath; + /// Whether the import is an `@import` or a standard c++ modules import. + bool IsAtImport = false; + /// Whether the last token we lexed was an '@'. bool LastTokenWasAt = false; @@ -456,6 +454,144 @@ private: TrackGMF TrackGMFState = TrackGMF::BeforeGMFIntroducer; + /// Track the status of the c++20 module decl. + /// + /// module-declaration: + /// 'export'[opt] 'module' module-name module-partition[opt] + /// attribute-specifier-seq[opt] ';' + /// + /// module-name: + /// module-name-qualifier[opt] identifier + /// + /// module-partition: + /// ':' module-name-qualifier[opt] identifier + /// + /// module-name-qualifier: + /// identifier '.' + /// module-name-qualifier identifier '.' + /// + /// Transition state: + /// + /// NotAModuleDecl --- export ---> FoundExport + /// NotAModuleDecl --- module ---> ImplementationCandidate + /// FoundExport --- module ---> InterfaceCandidate + /// ImplementationCandidate --- Identifier ---> ImplementationCandidate + /// ImplementationCandidate --- period ---> ImplementationCandidate + /// ImplementationCandidate --- colon ---> ImplementationCandidate + /// InterfaceCandidate --- Identifier ---> InterfaceCandidate + /// InterfaceCandidate --- period ---> InterfaceCandidate + /// InterfaceCandidate --- colon ---> InterfaceCandidate + /// ImplementationCandidate --- Semi ---> NamedModuleImplementation + /// NamedModuleInterface --- Semi ---> NamedModuleInterface + /// NamedModuleImplementation --- Anything ---> NamedModuleImplementation + /// NamedModuleInterface --- Anything ---> NamedModuleInterface + /// + /// FIXME: We haven't handle attribute-specifier-seq here. It may not be bad + /// soon since we don't support any module attributes yet. + class ModuleDeclSeq { + enum ModuleDeclState : int { + NotAModuleDecl, + FoundExport, + InterfaceCandidate, + ImplementationCandidate, + NamedModuleInterface, + NamedModuleImplementation, + }; + + public: + ModuleDeclSeq() : State(NotAModuleDecl) {} + + void handleExport() { + if (State == NotAModuleDecl) + State = FoundExport; + else if (!isNamedModule()) + reset(); + } + + void handleModule() { + if (State == FoundExport) + State = InterfaceCandidate; + else if (State == NotAModuleDecl) + State = ImplementationCandidate; + else if (!isNamedModule()) + reset(); + } + + void handleIdentifier(IdentifierInfo *Identifier) { + if (isModuleCandidate() && Identifier) + Name += Identifier->getName().str(); + else if (!isNamedModule()) + reset(); + } + + void handleColon() { + if (isModuleCandidate()) + Name += ":"; + else if (!isNamedModule()) + reset(); + } + + void handlePeriod() { + if (isModuleCandidate()) + Name += "."; + else if (!isNamedModule()) + reset(); + } + + void handleSemi() { + if (!Name.empty() && isModuleCandidate()) { + if (State == InterfaceCandidate) + State = NamedModuleInterface; + else if (State == ImplementationCandidate) + State = NamedModuleImplementation; + else + llvm_unreachable("Unimaged ModuleDeclState."); + } else if (!isNamedModule()) + reset(); + } + + void handleMisc() { + if (!isNamedModule()) + reset(); + } + + bool isModuleCandidate() const { + return State == InterfaceCandidate || State == ImplementationCandidate; + } + + bool isNamedModule() const { + return State == NamedModuleInterface || + State == NamedModuleImplementation; + } + + bool isNamedInterface() const { return State == NamedModuleInterface; } + + bool isImplementationUnit() const { + return State == NamedModuleImplementation && !getName().contains(':'); + } + + StringRef getName() const { + assert(isNamedModule() && "Can't get name from a non named module"); + return Name; + } + + StringRef getPrimaryName() const { + assert(isNamedModule() && "Can't get name from a non named module"); + return getName().split(':').first; + } + + void reset() { + Name.clear(); + State = NotAModuleDecl; + } + + private: + ModuleDeclState State; + std::string Name; + }; + + ModuleDeclSeq ModuleDeclState; + /// Whether the module import expects an identifier next. Otherwise, /// it expects a '.' or ';'. bool ModuleImportExpectsIdentifier = false; @@ -2194,14 +2330,6 @@ public: return LastFPEvalPragmaLocation; } - LangOptions::FPEvalMethodKind getLastFPEvalMethod() const { - return LastFPEvalMethod; - } - - void setLastFPEvalMethod(LangOptions::FPEvalMethodKind Val) { - LastFPEvalMethod = Val; - } - void setCurrentFPEvalMethod(SourceLocation PragmaLoc, LangOptions::FPEvalMethodKind Val) { assert(Val != LangOptions::FEM_UnsetOnCommandLine && @@ -2225,6 +2353,36 @@ public: /// Retrieves the module whose implementation we're current compiling, if any. Module *getCurrentModuleImplementation(); + /// If we are preprocessing a named module. + bool isInNamedModule() const { return ModuleDeclState.isNamedModule(); } + + /// If we are proprocessing a named interface unit. + /// Note that a module implementation partition is not considered as an + /// named interface unit here although it is importable + /// to ease the parsing. + bool isInNamedInterfaceUnit() const { + return ModuleDeclState.isNamedInterface(); + } + + /// Get the named module name we're preprocessing. + /// Requires we're preprocessing a named module. + StringRef getNamedModuleName() const { return ModuleDeclState.getName(); } + + /// If we are implementing an implementation module unit. + /// Note that the module implementation partition is not considered as an + /// implementation unit. + bool isInImplementationUnit() const { + return ModuleDeclState.isImplementationUnit(); + } + + /// If we're importing a standard C++20 Named Modules. + bool isInImportingCXXNamedModules() const { + // NamedModuleImportPath will be non-empty only if we're importing + // Standard C++ named modules. + return !NamedModuleImportPath.empty() && getLangOpts().CPlusPlusModules && + !IsAtImport; + } + /// Allocate a new MacroInfo object with the provided SourceLocation. MacroInfo *AllocateMacroInfo(SourceLocation L); diff --git a/contrib/llvm-project/clang/include/clang/Sema/DeclSpec.h b/contrib/llvm-project/clang/include/clang/Sema/DeclSpec.h index a95fe5686009..69fe2c541607 100644 --- a/contrib/llvm-project/clang/include/clang/Sema/DeclSpec.h +++ b/contrib/llvm-project/clang/include/clang/Sema/DeclSpec.h @@ -506,16 +506,8 @@ public: assert(isTypeRep((TST) TypeSpecType) && "DeclSpec does not store a type"); return TypeRep; } - // Returns the underlying decl, if any. Decl *getRepAsDecl() const { - auto *D = getRepAsFoundDecl(); - if (const auto *Using = dyn_cast_or_null(D)) - return Using->getTargetDecl(); - return D; - } - // Returns the originally found decl, if any. - Decl *getRepAsFoundDecl() const { - assert(isDeclRep((TST)TypeSpecType) && "DeclSpec does not store a decl"); + assert(isDeclRep((TST) TypeSpecType) && "DeclSpec does not store a decl"); return DeclRep; } Expr *getRepAsExpr() const { diff --git a/contrib/llvm-project/clang/include/clang/Sema/Sema.h b/contrib/llvm-project/clang/include/clang/Sema/Sema.h index 9ab4146aaefe..e57955f16bdd 100644 --- a/contrib/llvm-project/clang/include/clang/Sema/Sema.h +++ b/contrib/llvm-project/clang/include/clang/Sema/Sema.h @@ -238,11 +238,9 @@ namespace threadSafety { // FIXME: No way to easily map from TemplateTypeParmTypes to // TemplateTypeParmDecls, so we have this horrible PointerUnion. -using UnexpandedParameterPack = std::pair< - llvm::PointerUnion< - const TemplateTypeParmType *, const SubstTemplateTypeParmPackType *, - const SubstNonTypeTemplateParmPackExpr *, const NamedDecl *>, - SourceLocation>; +typedef std::pair, + SourceLocation> + UnexpandedParameterPack; /// Describes whether we've seen any nullability information for the given /// file. @@ -3330,9 +3328,7 @@ public: SourceLocation ScopedEnumKWLoc, bool ScopedEnumUsesClassTag, TypeResult UnderlyingType, bool IsTypeSpecifier, bool IsTemplateParamOrArg, - OffsetOfKind OOK, - UsingShadowDecl*& FoundUsingShadow, - SkipBodyInfo *SkipBody = nullptr); + OffsetOfKind OOK, SkipBodyInfo *SkipBody = nullptr); DeclResult ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc, unsigned TagSpec, SourceLocation TagLoc, @@ -7284,24 +7280,34 @@ private: private: // The current stack of constraint satisfactions, so we can exit-early. - llvm::SmallVector SatisfactionStack; + using SatisfactionStackEntryTy = + std::pair; + llvm::SmallVector + SatisfactionStack; public: - void PushSatisfactionStackEntry(const llvm::FoldingSetNodeID &ID) { - SatisfactionStack.push_back(ID); + void PushSatisfactionStackEntry(const NamedDecl *D, + const llvm::FoldingSetNodeID &ID) { + const NamedDecl *Can = cast(D->getCanonicalDecl()); + SatisfactionStack.emplace_back(Can, ID); } void PopSatisfactionStackEntry() { SatisfactionStack.pop_back(); } - bool SatisfactionStackContains(const llvm::FoldingSetNodeID &ID) const { - return llvm::find(SatisfactionStack, ID) != SatisfactionStack.end(); + bool SatisfactionStackContains(const NamedDecl *D, + const llvm::FoldingSetNodeID &ID) const { + const NamedDecl *Can = cast(D->getCanonicalDecl()); + return llvm::find(SatisfactionStack, + SatisfactionStackEntryTy{Can, ID}) != + SatisfactionStack.end(); } // Resets the current SatisfactionStack for cases where we are instantiating // constraints as a 'side effect' of normal instantiation in a way that is not // indicative of recursive definition. class SatisfactionStackResetRAII { - llvm::SmallVector BackupSatisfactionStack; + llvm::SmallVector + BackupSatisfactionStack; Sema &SemaRef; public: @@ -7314,8 +7320,8 @@ public: } }; - void - SwapSatisfactionStack(llvm::SmallVectorImpl &NewSS) { + void SwapSatisfactionStack( + llvm::SmallVectorImpl &NewSS) { SatisfactionStack.swap(NewSS); } diff --git a/contrib/llvm-project/clang/include/clang/Sema/SemaInternal.h b/contrib/llvm-project/clang/include/clang/Sema/SemaInternal.h index 4eca50919dc7..842eec099540 100644 --- a/contrib/llvm-project/clang/include/clang/Sema/SemaInternal.h +++ b/contrib/llvm-project/clang/include/clang/Sema/SemaInternal.h @@ -62,7 +62,7 @@ inline InheritableAttr *getDLLAttr(Decl *D) { } /// Retrieve the depth and index of a template parameter. -inline std::pair getDepthAndIndex(const NamedDecl *ND) { +inline std::pair getDepthAndIndex(NamedDecl *ND) { if (const auto *TTP = dyn_cast(ND)) return std::make_pair(TTP->getDepth(), TTP->getIndex()); @@ -79,7 +79,7 @@ getDepthAndIndex(UnexpandedParameterPack UPP) { if (const auto *TTP = UPP.first.dyn_cast()) return std::make_pair(TTP->getDepth(), TTP->getIndex()); - return getDepthAndIndex(UPP.first.get()); + return getDepthAndIndex(UPP.first.get()); } class TypoCorrectionConsumer : public VisibleDeclConsumer { diff --git a/contrib/llvm-project/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h b/contrib/llvm-project/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h index ea05b9f8ee3f..fcc9c02999b3 100644 --- a/contrib/llvm-project/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h +++ b/contrib/llvm-project/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h @@ -454,7 +454,9 @@ public: llvm::SMTExprRef OperandExp = getSymExpr(Solver, Ctx, USE->getOperand(), &OperandTy, hasComparison); llvm::SMTExprRef UnaryExp = - fromUnOp(Solver, USE->getOpcode(), OperandExp); + OperandTy->isRealFloatingType() + ? fromFloatUnOp(Solver, USE->getOpcode(), OperandExp) + : fromUnOp(Solver, USE->getOpcode(), OperandExp); // Currently, without the `support-symbolic-integer-casts=true` option, // we do not emit `SymbolCast`s for implicit casts. diff --git a/contrib/llvm-project/clang/include/clang/Support/RISCVVIntrinsicUtils.h b/contrib/llvm-project/clang/include/clang/Support/RISCVVIntrinsicUtils.h index fc53d70019c5..bf31dced98b2 100644 --- a/contrib/llvm-project/clang/include/clang/Support/RISCVVIntrinsicUtils.h +++ b/contrib/llvm-project/clang/include/clang/Support/RISCVVIntrinsicUtils.h @@ -92,25 +92,24 @@ enum class TypeModifier : uint8_t { LLVM_MARK_AS_BITMASK_ENUM(LMUL1), }; -struct Policy { - bool IsUnspecified = false; +class Policy { +public: enum PolicyType { Undisturbed, Agnostic, }; - PolicyType TailPolicy = Agnostic; - PolicyType MaskPolicy = Agnostic; - bool HasTailPolicy, HasMaskPolicy; - Policy(bool HasTailPolicy, bool HasMaskPolicy) - : IsUnspecified(true), HasTailPolicy(HasTailPolicy), - HasMaskPolicy(HasMaskPolicy) {} - Policy(PolicyType TailPolicy, bool HasTailPolicy, bool HasMaskPolicy) - : TailPolicy(TailPolicy), HasTailPolicy(HasTailPolicy), - HasMaskPolicy(HasMaskPolicy) {} - Policy(PolicyType TailPolicy, PolicyType MaskPolicy, bool HasTailPolicy, - bool HasMaskPolicy) - : TailPolicy(TailPolicy), MaskPolicy(MaskPolicy), - HasTailPolicy(HasTailPolicy), HasMaskPolicy(HasMaskPolicy) {} + +private: + // The default assumption for an RVV instruction is TAMA, as an undisturbed + // policy generally will affect the performance of an out-of-order core. + const PolicyType TailPolicy = Agnostic; + const PolicyType MaskPolicy = Agnostic; *** 12885 LINES SKIPPED *** From nobody Sun Jul 23 18:27:03 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 4R8BbC5vfbz4p65J; Sun, 23 Jul 2023 18:27:03 +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 4R8BbC3mNRz3RDh; Sun, 23 Jul 2023 18:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136823; 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=PXuS418JWtVCrSQqIIA5Y3zXHpweiOLfjLGeQBu/svM=; b=Vee4h86kELURqEq3IVdchrId9+6jucdIPxrp9DlI6317LfnQZfaLyPduVpFSIUXzo4KQNn AJr/rj/DfFqJ0I2Rr6mqjOonp+GjI3xSOxfCNG5gjRc8eDRxGKJRtzuCGYFWq2nf+KGg/D 2MK5USsCr2t1d4YbIZOllKn7DrLDC0Y5MQ2S5yDKQyzCraF9DHOC/tt7Li1ZeddHpUUbRa hLaPdOsfVp7Ob8iBSggxobo6bJplAIhtbIO1YMTf28gSE+he+5Irh+Jdylfb2jVG8J/Uwa XN4dHw8I2JxTODIZeIz9OkY8YqclqEZpddH3Etb+wISOpG/7zAv9NgVGfrMh9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136823; 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=PXuS418JWtVCrSQqIIA5Y3zXHpweiOLfjLGeQBu/svM=; b=ADr3/tTZRwe0k6TM/HXG+NNXlGiExuy6njQ6SWvtFrBSEQZ+8GBKx1dXIEnhB5hXtWSoSD YOn08M+uOMd4k6gwZOJJFJeIxbHnfOCOFToPWNT7F57V8gYCnp7kxVoqVkzYyQSI1GHUOK mal2OB9mvyZ5V8D+cxa5H+VA/uljm1v0MH8fsLpjMgrfYmcWy8dv2MiptuyTwYC7OA4QP7 B5jGJD9J/J04+dwnsipq26PbwIIzDCH2a3hi7a16ww9IAaoheW5Y8mcl4ODaq7bauCujRK YczQWR9zJgmdajWBvaM36nPUYNSM+85v8lH/M0Yi+w3MvJa7Rq+qVyJJd0w5qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136823; a=rsa-sha256; cv=none; b=h4At5AU8L+3Tj4PGF0w+Oj2iXe5XT7GSA8oseNm4o6g5+4wTxVIr79SLLVJHJo+hqXApvB ejvJQtlFAIBISj6P/h6wiwa3/AUE+0I75oWoH/e3SHVQix+FtjiNph14OdU8LbfCew9MTp TauE4YeTSzKORCbr6OotMLJkxhboicqXYP+sXHIT7Qm05AZgq71R4vBaoikxqkBI4c9JZH tfcSowNp6NnjuY+h7sKbQIDlVd8hSMw8tBMYV/nHQOMNg23a7UeaAC0LoGkmNSej+yvOTB R13Kc2dJTvUxI/sXDoOqSgLkylH5nxdzJNyHg5vuKYo//3hj2SjYgRspBlo+Tg== 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 4R8BbC2tQ2zmqm; Sun, 23 Jul 2023 18:27:03 +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 36NIR3q3058663; Sun, 23 Jul 2023 18:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR3Zg058662; Sun, 23 Jul 2023 18:27:03 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:03 GMT Message-Id: <202307231827.36NIR3Zg058662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9f57b84aa13e - stable/13 - Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f57b84aa13e6a0c8956bdbb9d07eceec4c9bc21 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9f57b84aa13e6a0c8956bdbb9d07eceec4c9bc21 commit 9f57b84aa13e6a0c8956bdbb9d07eceec4c9bc21 Author: Dimitry Andric AuthorDate: 2023-04-20 19:21:37 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:09 +0000 Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): [compiler-rt] Include system headers before optionally defining HWCAP macros In https://reviews.llvm.org/D141285 the optional definitions of `HWCAP` macros were moved to before their usage. However, they were also moved to before the inclusion of system headers which can optionally define them. If any of those system headers then actually defined any of the `HWCAP` macros, it would result in a redefinition error. Move the system header includes to just before the optional definitions, to avoid this problem. Reviewed By: ilinpv Differential Revision: https://reviews.llvm.org/D148819 PR: 271047 MFC after: 1 month (cherry picked from commit 482e0fcdf745981f2c2b12311405fe93563cefc4) --- .../compiler-rt/lib/builtins/cpu_model.c | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c b/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c index f5ad530c7e88..f2dcd974008c 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c +++ b/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c @@ -839,6 +839,25 @@ int CONSTRUCTOR_ATTRIBUTE __cpu_indicator_init(void) { } #elif defined(__aarch64__) +// LSE support detection for out-of-line atomics +// using HWCAP and Auxiliary vector +_Bool __aarch64_have_lse_atomics + __attribute__((visibility("hidden"), nocommon)); + +#if defined(__has_include) +#if __has_include() +#include +#if __has_include() +#include + +#if defined(__ANDROID__) +#include +#include +#elif defined(__Fuchsia__) +#include +#include +#endif + #ifndef AT_HWCAP #define AT_HWCAP 16 #endif @@ -1009,25 +1028,6 @@ int CONSTRUCTOR_ATTRIBUTE __cpu_indicator_init(void) { #define HWCAP2_SVE_EBF16 (1UL << 33) #endif -// LSE support detection for out-of-line atomics -// using HWCAP and Auxiliary vector -_Bool __aarch64_have_lse_atomics - __attribute__((visibility("hidden"), nocommon)); - -#if defined(__has_include) -#if __has_include() -#include -#if __has_include() -#include - -#if defined(__ANDROID__) -#include -#include -#elif defined(__Fuchsia__) -#include -#include -#endif - // Detect Exynos 9810 CPU #define IF_EXYNOS9810 \ char arch[PROP_VALUE_MAX]; \ From nobody Sun Jul 23 18:27:04 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 4R8BbD6rFRz4p6DZ; Sun, 23 Jul 2023 18:27:04 +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 4R8BbD5WqFz3RKK; Sun, 23 Jul 2023 18:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136824; 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=NpgER2BwhfhunfYe42Ch3So1tntMc/2qUWpRmonIEao=; b=c+ne7Wi/z+7iduvFk+KzRO/XEWTQrQCn868qhS+NF62sSUE91LOtsfDxh7y5xXKkpDFaDP /Thvps7IHJA+ucWGthT/ka63dq2l+rJOdUvK3zj6B5mNdYaQPshqMBTxidSooRtEW2C80h ATdVISQtoTxXt/h/A/K0AxZixXmTB/Yccwunx07ZFJoa456zjU9oJI/MmuuKHbuvmSVO4/ QDMi1wvnOJzfgUSboRhGBH+vC31pHNyuUmT/o6uMe5IzrWMnbx/z6j3owXWONMXZii5+xb PDz3H233zlYvzoQi/r9md5AS7gXD0FxbKc2qy2Yv0FRWjT6CH0UViUZH4hCWeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136824; 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=NpgER2BwhfhunfYe42Ch3So1tntMc/2qUWpRmonIEao=; b=xn89M2jGtKEqiwWMHTL+Q66IpZD19gmCbVdP5XfqBLKn9dHyvJjNU7xsZFkEoTwYlzgG4G e9KRC13zBdgNju58hM43Di9J3husGpcRrGTWPu2RlKkXWJVDakhFiDZpJILpg8o6lLzSLJ wmTIr60jyhHiwXD8bZ61fnkV+5zh9eaRKEqhenTkCf+mMPjGgdcRv9myEwYbiw4HxkGC1F yWvoIvSgqcOXcPcIt5oXChDdkVh1JUSxO0ToRV9aUd5VmmCeLq/WpIhOFxhUozEo48vWFb aGiyqz83IZB7HcRZ1+F5Fpepnxhdl7Jig921OHQ2pm4ewdPZHB9jw6x7jkkpFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136824; a=rsa-sha256; cv=none; b=vOHMaCcSDz0uXcynWKjB5ZjbLryPh7gkKlVtxuvzyFtK7vMvG0lGs/wkNvd2HROnwSqCR6 tfpaPQRo00YapFk7o6w8m1V9dPB3A+HgXTRvfxxl8/GggFd54NM2nvOhvUCTrodSH+biD1 7qGcrkllI1WdmkqjG1Jm/G/avwNAKEGm6PYRBfg/hPVVV4kxlSc++0wIUM7DisotM2c5KU k3C6AtbM9z2XyNw84ei9cUsaDRwPEsZgq1id6lPFXnT5ElbKuOj4kPhGhphTw4WUA9BKV/ YoPGqu3ZiG5Ei75Ked9657L2E2WGIeDytKRl6xOw3+zZlrfaOpwPuAnH91Er/w== 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 4R8BbD3qDBzmfD; Sun, 23 Jul 2023 18:27:04 +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 36NIR4nd058686; Sun, 23 Jul 2023 18:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR4EG058685; Sun, 23 Jul 2023 18:27:04 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:04 GMT Message-Id: <202307231827.36NIR4EG058685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2da197f30da5 - stable/13 - Merge commit db492316399a from llvm-project (by Dimitry Andric): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2da197f30da59015be64f98a2901c4e0a16819f6 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2da197f30da59015be64f98a2901c4e0a16819f6 commit 2da197f30da59015be64f98a2901c4e0a16819f6 Author: Dimitry Andric AuthorDate: 2023-04-20 19:22:59 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:09 +0000 Merge commit db492316399a from llvm-project (by Dimitry Andric): [clang][BFloat] Avoid redefining bfloat16_t in arm_neon.h As of https://reviews.llvm.org/D79708, clang-tblgen generates `arm_neon.h`, `arm_sve.h` and `arm_bf16.h`, and all those generated files will contain a typedef of `bfloat16_t`. However, `arm_neon.h` and `arm_sve.h` include `arm_bf16.h` immediately before their own typedef: #include typedef __bf16 bfloat16_t; With a recent version of clang (I used 16.0.1) this results in warnings: /usr/lib/clang/16/include/arm_neon.h:38:16: error: redefinition of typedef 'bfloat16_t' is a C11 feature [-Werror,-Wtypedef-redefinition] Since `arm_bf16.h` is very likely supposed to be the one true place where `bfloat16_t` is defined, I propose to delete the duplicate typedefs from the generated `arm_neon.h` and `arm_sve.h`. Reviewed By: sdesmalen, simonbutcher Differential Revision: https://reviews.llvm.org/D148822 PR: 271047 MFC after: 1 month (cherry picked from commit 1ac57eed95099f4d9da2ecab6000ad66d05c1018) --- contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp | 1 - contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp b/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp index 8f46b08b1366..08f2344f5d0a 100644 --- a/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp +++ b/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp @@ -2353,7 +2353,6 @@ void NeonEmitter::run(raw_ostream &OS) { OS << "#include \n\n"; OS << "#include \n"; - OS << "typedef __bf16 bfloat16_t;\n"; // Emit NEON-specific scalar typedefs. OS << "typedef float float32_t;\n"; diff --git a/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp b/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp index a577c10e3c64..bca61e703020 100644 --- a/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp +++ b/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp @@ -1103,7 +1103,6 @@ void SVEEmitter::createHeader(raw_ostream &OS) { OS << "typedef __SVBFloat16_t svbfloat16_t;\n"; OS << "#include \n"; - OS << "typedef __bf16 bfloat16_t;\n"; OS << "typedef __SVFloat32_t svfloat32_t;\n"; OS << "typedef __SVFloat64_t svfloat64_t;\n"; From nobody Sun Jul 23 18:27:05 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 4R8BbG3Czxz4p6KF; Sun, 23 Jul 2023 18:27:06 +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 4R8BbF737mz3RDy; Sun, 23 Jul 2023 18:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136826; 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=q1PxiDNzYlcD5OLSsudP4tWb5kLxAmGIYSS+gyTrTMY=; b=xKHevAT4IAeoXKqlt/qK4rmqay0DU45TTz5zoWANNDjna24hqH1dszJfcguNd965Wr5Azc hDlYn77GYVkT0j/hJEpe2OcwokIrzTirr58uamyLYrizMxSgVC9468h1Fi5Btll6GOLx6W E3eVUBRG9WOFAvPRpagmgB6lI7A/tQx+gWXMLg6sivDc2FGOscW2W61sOcYSs7A7uuBU5y hql95oYT2RPTm9MonJSKpR5CICgviENDNi+PmDaXnWAO9nlxcCA+aM9VflUBvP8tXhNd8Y aVvbxk8osTP0ZhFXKoZqp/GydZb5Djq1GPp/qee8f2MpQEuGavPiwM8i3baJtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136826; 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=q1PxiDNzYlcD5OLSsudP4tWb5kLxAmGIYSS+gyTrTMY=; b=xWnhIo46U+LMf48A4a43/V8didbnSH0kOYF1sdupfUXFoYNL4dCY+U9yB/ZO1thHPPZ0yN PUyqF4EzlTXyoc0SctGPWYENHCj9Dvg453TTQLkopDWyGfTxfKkVue11tCiXapq2HCioSw thivGN1ar4R4MqMnQ/x4Ef1dftn5gNEW5iNBkBdzPTM9+9Hy6ImHvQpqUBaTEEDFOOvl+V kLUcvw7+kclJ6MQwBdEOreqeeD25Gq7D5O2c/jGQCi+e0JaLsTkXN2f96pKVGvIKEtaSF9 bZrGA7tIKZBWrT7DdgAZZqH6j7cbn10Cf4V62KqMG0xw10bXa862hH3CCjAkeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136826; a=rsa-sha256; cv=none; b=riUxohTgbxnPpNpQnr6jDJHT3Z2iSyAp5K7BsYOBvVlPAOVoL8RpnU7zP96fBv+ZkpDYZJ u/Q8Qgvqor5ZUrv1nAUnuRafBSjyUwb3/bqpPjCy63jtBnWZPudY5gITA4SLHToWh4OOwH 2xY6emD3KSSW2Gc7jl3+F3uQgPMPeP/5l52IEyjC4RwCtJBBKwyxuj1Ad79P74DvGck+XM zZ4K/Skcrt/3cFafy+aGJQRlqgiXqdpFU+WZWxncwVU7c95fnoIpI6aP1uqEGN6jEPCh1L B9KL8S547tvojrnVrqOGjPyoHvatekEZ7yuMAAoPkLUsAAru9lpwXOPJtS5C3A== 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 4R8BbF4brzzmfF; Sun, 23 Jul 2023 18:27:05 +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 36NIR5pY058710; Sun, 23 Jul 2023 18:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR5cB058708; Sun, 23 Jul 2023 18:27:05 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:05 GMT Message-Id: <202307231827.36NIR5cB058708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 702c3649b50c - stable/13 - Merge llvm-project release/16.x llvmorg-16.0.2-0-g18ddebe1a1a9 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 702c3649b50c733618e61bc7ea923ad361487685 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=702c3649b50c733618e61bc7ea923ad361487685 commit 702c3649b50c733618e61bc7ea923ad361487685 Author: Dimitry Andric AuthorDate: 2023-04-22 17:27:13 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:09 +0000 Merge llvm-project release/16.x llvmorg-16.0.2-0-g18ddebe1a1a9 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.2-0-g18ddebe1a1a9 (aka 16.0.2 release). PR: 271047 MFC after: 1 month (cherry picked from commit 9e7101a856ad738879b0bde099bfb2ba08b7995c) --- contrib/llvm-project/clang/lib/Format/Format.cpp | 10 +- .../clang/lib/Format/TokenAnnotator.cpp | 9 +- .../compiler-rt/lib/asan/asan_interceptors.cpp | 47 ++++-- .../compiler-rt/lib/asan/asan_internal.h | 2 +- .../compiler-rt/lib/asan/asan_linux.cpp | 158 +++++++++++---------- contrib/llvm-project/libcxx/include/__config | 2 +- .../libunwind/src/UnwindRegistersRestore.S | 4 +- .../llvm/TargetParser/AArch64TargetParser.h | 2 +- .../llvm/lib/CodeGen/StackProtector.cpp | 21 ++- .../llvm-project/llvm/lib/Support/raw_ostream.cpp | 7 + .../llvm/lib/Transforms/Scalar/SROA.cpp | 6 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 18 files changed, 166 insertions(+), 132 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Format/Format.cpp b/contrib/llvm-project/clang/lib/Format/Format.cpp index 0d3fde90ab38..a59d53009eaa 100644 --- a/contrib/llvm-project/clang/lib/Format/Format.cpp +++ b/contrib/llvm-project/clang/lib/Format/Format.cpp @@ -721,23 +721,23 @@ template <> struct MappingTraits { FormatStyle::TrailingCommentsAlignmentStyle &Value) { IO.enumCase(Value, "Leave", FormatStyle::TrailingCommentsAlignmentStyle( - {FormatStyle::TCAS_Leave, 1})); + {FormatStyle::TCAS_Leave, 0})); IO.enumCase(Value, "Always", FormatStyle::TrailingCommentsAlignmentStyle( - {FormatStyle::TCAS_Always, 1})); + {FormatStyle::TCAS_Always, 0})); IO.enumCase(Value, "Never", FormatStyle::TrailingCommentsAlignmentStyle( - {FormatStyle::TCAS_Never, 1})); + {FormatStyle::TCAS_Never, 0})); // For backwards compatibility IO.enumCase(Value, "true", FormatStyle::TrailingCommentsAlignmentStyle( - {FormatStyle::TCAS_Always, 1})); + {FormatStyle::TCAS_Always, 0})); IO.enumCase(Value, "false", FormatStyle::TrailingCommentsAlignmentStyle( - {FormatStyle::TCAS_Never, 1})); + {FormatStyle::TCAS_Never, 0})); } static void mapping(IO &IO, diff --git a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp index ca651eaa9440..464594bf7488 100644 --- a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp +++ b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp @@ -399,8 +399,7 @@ private: FormatToken *Next = CurrentToken->Next; if (PrevPrev && PrevPrev->is(tok::identifier) && Prev->isOneOf(tok::star, tok::amp, tok::ampamp) && - CurrentToken->is(tok::identifier) && - !Next->isOneOf(tok::equal, tok::l_brace)) { + CurrentToken->is(tok::identifier) && Next->isNot(tok::equal)) { Prev->setType(TT_BinaryOperator); LookForDecls = false; } @@ -2399,12 +2398,6 @@ private: return TT_PointerOrReference; } - // if (Class* obj { function() }) - if (PrevToken->Tok.isAnyIdentifier() && NextToken->Tok.isAnyIdentifier() && - NextToken->Next && NextToken->Next->is(tok::l_brace)) { - return TT_PointerOrReference; - } - if (PrevToken->endsSequence(tok::r_square, tok::l_square, tok::kw_delete)) return TT_UnaryOperator; diff --git a/contrib/llvm-project/compiler-rt/lib/asan/asan_interceptors.cpp b/contrib/llvm-project/compiler-rt/lib/asan/asan_interceptors.cpp index 817008253fc0..776f512d08a0 100644 --- a/contrib/llvm-project/compiler-rt/lib/asan/asan_interceptors.cpp +++ b/contrib/llvm-project/compiler-rt/lib/asan/asan_interceptors.cpp @@ -257,12 +257,36 @@ static void ClearShadowMemoryForContextStack(uptr stack, uptr ssize) { PoisonShadow(bottom, ssize, 0); } -INTERCEPTOR(int, getcontext, struct ucontext_t *ucp) { - // API does not requires to have ucp clean, and sets only part of fields. We - // use ucp->uc_stack to unpoison new stack. We prefer to have zeroes then - // uninitialized bytes. - ResetContextStack(ucp); - return REAL(getcontext)(ucp); +INTERCEPTOR(void, makecontext, struct ucontext_t *ucp, void (*func)(), int argc, + ...) { + va_list ap; + uptr args[64]; + // We don't know a better way to forward ... into REAL function. We can + // increase args size if neccecary. + CHECK_LE(argc, ARRAY_SIZE(args)); + internal_memset(args, 0, sizeof(args)); + va_start(ap, argc); + for (int i = 0; i < argc; ++i) args[i] = va_arg(ap, uptr); + va_end(ap); + +# define ENUMERATE_ARRAY_4(start) \ + args[start], args[start + 1], args[start + 2], args[start + 3] +# define ENUMERATE_ARRAY_16(start) \ + ENUMERATE_ARRAY_4(start), ENUMERATE_ARRAY_4(start + 4), \ + ENUMERATE_ARRAY_4(start + 8), ENUMERATE_ARRAY_4(start + 12) +# define ENUMERATE_ARRAY_64() \ + ENUMERATE_ARRAY_16(0), ENUMERATE_ARRAY_16(16), ENUMERATE_ARRAY_16(32), \ + ENUMERATE_ARRAY_16(48) + + REAL(makecontext) + ((struct ucontext_t *)ucp, func, argc, ENUMERATE_ARRAY_64()); + +# undef ENUMERATE_ARRAY_4 +# undef ENUMERATE_ARRAY_16 +# undef ENUMERATE_ARRAY_64 + + // Sign the stack so we can identify it for unpoisoning. + SignContextStack(ucp); } INTERCEPTOR(int, swapcontext, struct ucontext_t *oucp, @@ -279,9 +303,6 @@ INTERCEPTOR(int, swapcontext, struct ucontext_t *oucp, ReadContextStack(ucp, &stack, &ssize); ClearShadowMemoryForContextStack(stack, ssize); - // See getcontext interceptor. - ResetContextStack(oucp); - # if __has_attribute(__indirect_return__) && \ (defined(__x86_64__) || defined(__i386__)) int (*real_swapcontext)(struct ucontext_t *, struct ucontext_t *) @@ -658,11 +679,11 @@ void InitializeAsanInterceptors() { // Intecept jump-related functions. ASAN_INTERCEPT_FUNC(longjmp); -#if ASAN_INTERCEPT_SWAPCONTEXT - ASAN_INTERCEPT_FUNC(getcontext); +# if ASAN_INTERCEPT_SWAPCONTEXT ASAN_INTERCEPT_FUNC(swapcontext); -#endif -#if ASAN_INTERCEPT__LONGJMP + ASAN_INTERCEPT_FUNC(makecontext); +# endif +# if ASAN_INTERCEPT__LONGJMP ASAN_INTERCEPT_FUNC(_longjmp); #endif #if ASAN_INTERCEPT___LONGJMP_CHK diff --git a/contrib/llvm-project/compiler-rt/lib/asan/asan_internal.h b/contrib/llvm-project/compiler-rt/lib/asan/asan_internal.h index 959fdec26042..a5348e35b297 100644 --- a/contrib/llvm-project/compiler-rt/lib/asan/asan_internal.h +++ b/contrib/llvm-project/compiler-rt/lib/asan/asan_internal.h @@ -105,8 +105,8 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle); void AsanOnDeadlySignal(int, void *siginfo, void *context); +void SignContextStack(void *context); void ReadContextStack(void *context, uptr *stack, uptr *ssize); -void ResetContextStack(void *context); void StopInitOrderChecking(); // Wrapper for TLS/TSD. diff --git a/contrib/llvm-project/compiler-rt/lib/asan/asan_linux.cpp b/contrib/llvm-project/compiler-rt/lib/asan/asan_linux.cpp index 4c01ff9e2ae8..e19b4479aaf3 100644 --- a/contrib/llvm-project/compiler-rt/lib/asan/asan_linux.cpp +++ b/contrib/llvm-project/compiler-rt/lib/asan/asan_linux.cpp @@ -15,55 +15,56 @@ #if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \ SANITIZER_SOLARIS -#include "asan_interceptors.h" -#include "asan_internal.h" -#include "asan_premap_shadow.h" -#include "asan_thread.h" -#include "sanitizer_common/sanitizer_flags.h" -#include "sanitizer_common/sanitizer_freebsd.h" -#include "sanitizer_common/sanitizer_libc.h" -#include "sanitizer_common/sanitizer_procmaps.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if SANITIZER_FREEBSD -#include -#endif - -#if SANITIZER_SOLARIS -#include -#endif - -#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS -#include -extern "C" void* _DYNAMIC; -#elif SANITIZER_NETBSD -#include -#include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include + +# include "asan_interceptors.h" +# include "asan_internal.h" +# include "asan_premap_shadow.h" +# include "asan_thread.h" +# include "sanitizer_common/sanitizer_flags.h" +# include "sanitizer_common/sanitizer_freebsd.h" +# include "sanitizer_common/sanitizer_hash.h" +# include "sanitizer_common/sanitizer_libc.h" +# include "sanitizer_common/sanitizer_procmaps.h" + +# if SANITIZER_FREEBSD +# include +# endif + +# if SANITIZER_SOLARIS +# include +# endif + +# if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS +# include +extern "C" void *_DYNAMIC; +# elif SANITIZER_NETBSD +# include +# include extern Elf_Dyn _DYNAMIC; -#else -#include -#include +# else +# include +# include extern ElfW(Dyn) _DYNAMIC[]; -#endif +# endif // x86-64 FreeBSD 9.2 and older define 'ucontext_t' incorrectly in // 32-bit mode. -#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) && \ - __FreeBSD_version <= 902001 // v9.2 -#define ucontext_t xucontext_t -#endif +# if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) && \ + __FreeBSD_version <= 902001 // v9.2 +# define ucontext_t xucontext_t +# endif typedef enum { ASAN_RT_VERSION_UNDEFINED = 0, @@ -74,21 +75,21 @@ typedef enum { // FIXME: perhaps also store abi version here? extern "C" { SANITIZER_INTERFACE_ATTRIBUTE -asan_rt_version_t __asan_rt_version; +asan_rt_version_t __asan_rt_version; } namespace __asan { void InitializePlatformInterceptors() {} void InitializePlatformExceptionHandlers() {} -bool IsSystemHeapAddress (uptr addr) { return false; } +bool IsSystemHeapAddress(uptr addr) { return false; } void *AsanDoesNotSupportStaticLinkage() { // This will fail to link with -static. return &_DYNAMIC; } -#if ASAN_PREMAP_SHADOW +# if ASAN_PREMAP_SHADOW uptr FindPremappedShadowStart(uptr shadow_size_bytes) { uptr granularity = GetMmapGranularity(); uptr shadow_start = reinterpret_cast(&__asan_shadow); @@ -98,14 +99,14 @@ uptr FindPremappedShadowStart(uptr shadow_size_bytes) { UnmapFromTo(shadow_start + shadow_size, shadow_start + premap_shadow_size); return shadow_start; } -#endif +# endif uptr FindDynamicShadowStart() { uptr shadow_size_bytes = MemToShadowSize(kHighMemEnd); -#if ASAN_PREMAP_SHADOW +# if ASAN_PREMAP_SHADOW if (!PremapShadowFailed()) return FindPremappedShadowStart(shadow_size_bytes); -#endif +# endif return MapDynamicShadow(shadow_size_bytes, ASAN_SHADOW_SCALE, /*min_shadow_base_alignment*/ 0, kHighMemEnd); @@ -121,11 +122,11 @@ void FlushUnneededASanShadowMemory(uptr p, uptr size) { ReleaseMemoryPagesToOS(MemToShadow(p), MemToShadow(p + size)); } -#if SANITIZER_ANDROID +# if SANITIZER_ANDROID // FIXME: should we do anything for Android? void AsanCheckDynamicRTPrereqs() {} void AsanCheckIncompatibleRT() {} -#else +# else static int FindFirstDSOCallback(struct dl_phdr_info *info, size_t size, void *data) { VReport(2, "info->dlpi_name = %s\tinfo->dlpi_addr = %p\n", info->dlpi_name, @@ -154,7 +155,7 @@ static int FindFirstDSOCallback(struct dl_phdr_info *info, size_t size, static bool IsDynamicRTName(const char *libname) { return internal_strstr(libname, "libclang_rt.asan") || - internal_strstr(libname, "libasan.so"); + internal_strstr(libname, "libasan.so"); } static void ReportIncompatibleRT() { @@ -170,9 +171,10 @@ void AsanCheckDynamicRTPrereqs() { const char *first_dso_name = nullptr; dl_iterate_phdr(FindFirstDSOCallback, &first_dso_name); if (first_dso_name && first_dso_name[0] && !IsDynamicRTName(first_dso_name)) { - Report("ASan runtime does not come first in initial library list; " - "you should either link runtime to your application or " - "manually preload it with LD_PRELOAD.\n"); + Report( + "ASan runtime does not come first in initial library list; " + "you should either link runtime to your application or " + "manually preload it with LD_PRELOAD.\n"); Die(); } } @@ -190,13 +192,14 @@ void AsanCheckIncompatibleRT() { // as early as possible, otherwise ASan interceptors could bind to // the functions in dynamic ASan runtime instead of the functions in // system libraries, causing crashes later in ASan initialization. - MemoryMappingLayout proc_maps(/*cache_enabled*/true); + MemoryMappingLayout proc_maps(/*cache_enabled*/ true); char filename[PATH_MAX]; MemoryMappedSegment segment(filename, sizeof(filename)); while (proc_maps.Next(&segment)) { if (IsDynamicRTName(segment.filename)) { - Report("Your application is linked against " - "incompatible ASan runtimes.\n"); + Report( + "Your application is linked against " + "incompatible ASan runtimes.\n"); Die(); } } @@ -206,25 +209,36 @@ void AsanCheckIncompatibleRT() { } } } -#endif // SANITIZER_ANDROID +# endif // SANITIZER_ANDROID # if ASAN_INTERCEPT_SWAPCONTEXT -void ReadContextStack(void *context, uptr *stack, uptr *ssize) { - ucontext_t *ucp = (ucontext_t*)context; - *stack = (uptr)ucp->uc_stack.ss_sp; - *ssize = ucp->uc_stack.ss_size; +constexpr u32 kAsanContextStackFlagsMagic = 0x51260eea; + +static int HashContextStack(const ucontext_t &ucp) { + MurMur2Hash64Builder hash(kAsanContextStackFlagsMagic); + hash.add(reinterpret_cast(ucp.uc_stack.ss_sp)); + hash.add(ucp.uc_stack.ss_size); + return static_cast(hash.get()); } -void ResetContextStack(void *context) { - ucontext_t *ucp = (ucontext_t *)context; - ucp->uc_stack.ss_sp = nullptr; - ucp->uc_stack.ss_size = 0; +void SignContextStack(void *context) { + ucontext_t *ucp = reinterpret_cast(context); + ucp->uc_stack.ss_flags = HashContextStack(*ucp); } -# endif // ASAN_INTERCEPT_SWAPCONTEXT -void *AsanDlSymNext(const char *sym) { - return dlsym(RTLD_NEXT, sym); +void ReadContextStack(void *context, uptr *stack, uptr *ssize) { + const ucontext_t *ucp = reinterpret_cast(context); + if (HashContextStack(*ucp) == ucp->uc_stack.ss_flags) { + *stack = reinterpret_cast(ucp->uc_stack.ss_sp); + *ssize = ucp->uc_stack.ss_size; + return; + } + *stack = 0; + *ssize = 0; } +# endif // ASAN_INTERCEPT_SWAPCONTEXT + +void *AsanDlSymNext(const char *sym) { return dlsym(RTLD_NEXT, sym); } bool HandleDlopenInit() { // Not supported on this platform. @@ -233,7 +247,7 @@ bool HandleDlopenInit() { return false; } -} // namespace __asan +} // namespace __asan #endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || // SANITIZER_SOLARIS diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 581ada45b3f0..5e30a42174af 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -38,7 +38,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 160001 +# define _LIBCPP_VERSION 160002 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/contrib/llvm-project/libunwind/src/UnwindRegistersRestore.S b/contrib/llvm-project/libunwind/src/UnwindRegistersRestore.S index 543b19f7e72a..951189ea54dd 100644 --- a/contrib/llvm-project/libunwind/src/UnwindRegistersRestore.S +++ b/contrib/llvm-project/libunwind/src/UnwindRegistersRestore.S @@ -1221,8 +1221,8 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind19Registers_loongarch6jumptoEv) ld.d $r\i, $a0, (8 * \i) .endr - ld.d $r4, $a0, (8 * 4) // restore $a0 last - ld.d $r1, $a0, (8 * 32) // load new pc into $ra + ld.d $ra, $a0, (8 * 32) // load new pc into $ra + ld.d $a0, $a0, (8 * 4) // restore $a0 last jr $ra diff --git a/contrib/llvm-project/llvm/include/llvm/TargetParser/AArch64TargetParser.h b/contrib/llvm-project/llvm/include/llvm/TargetParser/AArch64TargetParser.h index 11fce886ffb8..1326968e34de 100644 --- a/contrib/llvm-project/llvm/include/llvm/TargetParser/AArch64TargetParser.h +++ b/contrib/llvm-project/llvm/include/llvm/TargetParser/AArch64TargetParser.h @@ -177,7 +177,7 @@ inline constexpr ExtensionInfo Extensions[] = { {"brbe", AArch64::AEK_BRBE, "+brbe", "-brbe", FEAT_MAX, "", 0}, {"bti", AArch64::AEK_NONE, {}, {}, FEAT_BTI, "+bti", 510}, {"crc", AArch64::AEK_CRC, "+crc", "-crc", FEAT_CRC, "+crc", 110}, - {"crypto", AArch64::AEK_CRYPTO, "+crypto", "-crypto", FEAT_MAX, "", 0}, + {"crypto", AArch64::AEK_CRYPTO, "+crypto", "-crypto", FEAT_MAX, "+aes,+sha2", 0}, {"cssc", AArch64::AEK_CSSC, "+cssc", "-cssc", FEAT_MAX, "", 0}, {"d128", AArch64::AEK_D128, "+d128", "-d128", FEAT_MAX, "", 0}, {"dgh", AArch64::AEK_NONE, {}, {}, FEAT_DGH, "", 260}, diff --git a/contrib/llvm-project/llvm/lib/CodeGen/StackProtector.cpp b/contrib/llvm-project/llvm/lib/CodeGen/StackProtector.cpp index 46685f7b8208..c5cf6ae6578b 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/StackProtector.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/StackProtector.cpp @@ -455,18 +455,15 @@ bool StackProtector::InsertStackProtectors() { if (&BB == FailBB) continue; Instruction *CheckLoc = dyn_cast(BB.getTerminator()); - if (!CheckLoc && !DisableCheckNoReturn) { - for (auto &Inst : BB) { - auto *CB = dyn_cast(&Inst); - if (!CB) - continue; - if (!CB->doesNotReturn()) - continue; - // Do stack check before non-return calls (e.g: __cxa_throw) - CheckLoc = CB; - break; - } - } + if (!CheckLoc && !DisableCheckNoReturn) + for (auto &Inst : BB) + if (auto *CB = dyn_cast(&Inst)) + // Do stack check before noreturn calls that aren't nounwind (e.g: + // __cxa_throw). + if (CB->doesNotReturn() && !CB->doesNotThrow()) { + CheckLoc = CB; + break; + } if (!CheckLoc) continue; diff --git a/contrib/llvm-project/llvm/lib/Support/raw_ostream.cpp b/contrib/llvm-project/llvm/lib/Support/raw_ostream.cpp index 7b9b8b2f53fb..fae4a4308fd7 100644 --- a/contrib/llvm-project/llvm/lib/Support/raw_ostream.cpp +++ b/contrib/llvm-project/llvm/lib/Support/raw_ostream.cpp @@ -84,8 +84,15 @@ raw_ostream::~raw_ostream() { } size_t raw_ostream::preferred_buffer_size() const { +#ifdef _WIN32 + // On Windows BUFSIZ is only 512 which results in more calls to write. This + // overhead can cause significant performance degradation. Therefore use a + // better default. + return (16 * 1024); +#else // BUFSIZ is intended to be a reasonable default. return BUFSIZ; +#endif } void raw_ostream::SetBuffered() { diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/SROA.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/SROA.cpp index 8339981e1bdc..818d64725893 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/SROA.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/SROA.cpp @@ -1581,15 +1581,17 @@ static void rewriteMemOpOfSelect(SelectInst &SI, T &I, bool IsThen = SuccBB == HeadBI->getSuccessor(0); int SuccIdx = IsThen ? 0 : 1; auto *NewMemOpBB = SuccBB == Tail ? Head : SuccBB; + auto &CondMemOp = cast(*I.clone()); if (NewMemOpBB != Head) { NewMemOpBB->setName(Head->getName() + (IsThen ? ".then" : ".else")); if (isa(I)) ++NumLoadsPredicated; else ++NumStoresPredicated; - } else + } else { + CondMemOp.dropUndefImplyingAttrsAndUnknownMetadata(); ++NumLoadsSpeculated; - auto &CondMemOp = cast(*I.clone()); + } CondMemOp.insertBefore(NewMemOpBB->getTerminator()); Value *Ptr = SI.getOperand(1 + SuccIdx); if (auto *PtrTy = Ptr->getType(); diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 17a4e9fbc6bc..420881e41de4 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define CLANG_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define LLDB_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 7b3afbcccb01..c6154e17ec22 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,10 +1,10 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 16.0.1 -#define CLANG_VERSION_STRING "16.0.1" +#define CLANG_VERSION 16.0.2 +#define CLANG_VERSION_STRING "16.0.2" #define CLANG_VERSION_MAJOR 16 #define CLANG_VERSION_MAJOR_STRING "16" #define CLANG_VERSION_MINOR 0 -#define CLANG_VERSION_PATCHLEVEL 1 +#define CLANG_VERSION_PATCHLEVEL 2 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index b5cd91c34032..4e2cc44c9364 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "16.0.1 (FreeBSD llvmorg-16.0.1-0-gcd89023f7979-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "16.0.2 (FreeBSD llvmorg-16.0.2-0-g18ddebe1a1a9-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 7060f0d93cbc..dab8cdb281fa 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 16.0.1 -#define LLDB_VERSION_STRING "16.0.1" +#define LLDB_VERSION 16.0.2 +#define LLDB_VERSION_STRING "16.0.2" #define LLDB_VERSION_MAJOR 16 #define LLDB_VERSION_MINOR 0 -#define LLDB_VERSION_PATCH 1 +#define LLDB_VERSION_PATCH 2 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 46ac23cf47a1..93cb4b9dd9dc 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -348,10 +348,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 16.0.1" +#define PACKAGE_STRING "LLVM 16.0.2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "16.0.1" +#define PACKAGE_VERSION "16.0.2" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 640003331a8e..b5b415db51c4 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -74,10 +74,10 @@ #define LLVM_VERSION_MINOR 0 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 1 +#define LLVM_VERSION_PATCH 2 /* LLVM version string */ -#define LLVM_VERSION_STRING "16.0.1" +#define LLVM_VERSION_STRING "16.0.2" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 5194bb986dc0..760d4e828e07 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Sun Jul 23 18:27:06 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 4R8BbH1QDdz4p6H3; Sun, 23 Jul 2023 18:27:07 +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 4R8BbG6sdKz3RF8; Sun, 23 Jul 2023 18:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136827; 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=oC+5GgMluqg4V4uomXHruYfC+Xf+SIqU+5MC54JdCNc=; b=AUYUt9lwjtjTxR5LBkb4IxlojCqC/zKqv1OrQ+3FNh+QdDRmrEDmvx1yQAK4lHunkX/uLM dUCSNVFN2SOk+RKAkbisJqRiiJjQd64wVgWwHCAbXkIMAywM+h1gxfhMY7hOjeOrXRhvOo 3r9Ul4/5qaUmxbGwxejs3wHK/ZX4u5+uUZMVtLue7luXfk639fqWuVoHHq4rshaEoIDyCP ycuAm8b7rQQi4y4wnZcaGeCg2eThehzTG1Ichhr6CHOe6RAjrrHVTZKN+cEptXgZB+7IOj N4FyvGez7qR/2LXxFp7RGkc6b+qBD1t/CTdjKWfKnc1Zp4+lIlL53txYwyxbbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136827; 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=oC+5GgMluqg4V4uomXHruYfC+Xf+SIqU+5MC54JdCNc=; b=WSkwj22m71UrrLsda9bLLBOOoRroTdFbc18seqE0Skua5wgR37zF8KevWJEcM4S9bA/8/R 17mElE29g9M+7BdxnUApZGiPaCWtHHPwwreiILh8JptZ2yOXTJKDN5zYl6yDaJhNduIpwn a3KJUum85saP5EqjGRnq7ynubNZbaFrCl4jJdkwg+PZpVXmz5lRa3IFmYYEarMFyb4Zidj KiontMhg9MdG3Nj5Lq2rNKy/7quZQGnE35mfo4j6v5BZpuJ7IgV+54kyK8klR9W0efIO4q ei9ZRTCcC28Er3cD8JD4P5OYRSnyjLVUiLtfJVGZNPTNma+IN97OqYiSbz4Vag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136827; a=rsa-sha256; cv=none; b=TDtCEkL+JTtO28+eXIVcnk8lookA8UgRGq/HnzXaMgffSmj81OFfZWjfYTuI8lab9OlEoz guxh5VRUGN0R1HGkTe9VI6kv40xt7c75kyPMPsIKnMyIdivQO+tKc0Y/VeB9TCWL1RtWFr 3ZQRVYg6OF3T2pswCnY2I5BYUwshURdMbumuHkwNFkS7gJLtOplBS/ZAa5GJTcOhc4bxLw cXA+UAMQHnIiW7TTsPIAUPZaBzFoxPky/Hi+tqCf++KBGk3w8c11p9Jk/tLDxfMiD2zABE PaAtICFAG8k6iLV8eHZoYZpHtQWJ4cOLmqMnjOO32QrLjNyF8eFbuFGM0tMwmg== 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 4R8BbG5bSrzmVR; Sun, 23 Jul 2023 18:27:06 +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 36NIR69E058732; Sun, 23 Jul 2023 18:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR6H1058731; Sun, 23 Jul 2023 18:27:06 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:06 GMT Message-Id: <202307231827.36NIR6H1058731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c1f875b54b19 - stable/13 - clang: re-downgrade implicit int/function declarations to warning only List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1f875b54b192f35b57953c514ec1800a4b5d0d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c1f875b54b192f35b57953c514ec1800a4b5d0d9 commit c1f875b54b192f35b57953c514ec1800a4b5d0d9 Author: Dimitry Andric AuthorDate: 2023-04-25 19:24:04 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:09 +0000 clang: re-downgrade implicit int/function declarations to warning only This reapplies upstream commit c0141f3c300f by Aaron Ballman: Downgrade implicit int and implicit function declaration to warning only The changes in Clang 15.0.0 which enabled these diagnostics as a warning which defaulted to an error caused disruption for people working on distributions such as Gentoo. There was an explicit request to downgrade these to be warning-only in Clang 15.0.1 with the expectation that Clang 16 will default the diagnostics to an error. See https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 for more details on the discussion. See https://reviews.llvm.org/D133800 for the public review of these changes. As noted in the upstream discussion, there are many programs that fail to configure or build correctly, if these warnings are turned into errors by default. Note that most affected programs in ports are relatively old, and are unlikely to be fixed by actually adjusting their declarations, but by compiling with -std=gnu89, which downgrades the errors back to warning again. Lots of tedious work for very little gain. (cherry picked from commit c3450ad127e94d3fa67ae337310e59c002f51bfc) --- .../llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td index bfe582d8252f..31a27558bca4 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -419,7 +419,7 @@ def warn_implicit_function_decl : Warning< InGroup, DefaultIgnore; def ext_implicit_function_decl_c99 : ExtWarn< "call to undeclared function %0; ISO C99 and later do not support implicit " - "function declarations">, InGroup, DefaultError; + "function declarations">, InGroup; def note_function_suggestion : Note<"did you mean %0?">; def err_ellipsis_first_param : Error< @@ -709,7 +709,7 @@ def ext_implicit_lib_function_decl : ExtWarn< def ext_implicit_lib_function_decl_c99 : ExtWarn< "call to undeclared library function '%0' with type %1; ISO C99 and later " "do not support implicit function declarations">, - InGroup, DefaultError; + InGroup; def note_include_header_or_declare : Note< "include the header <%0> or explicitly provide a declaration for '%1'">; def note_previous_builtin_declaration : Note<"%0 is a builtin with type %1">; @@ -4390,7 +4390,7 @@ def err_ident_list_in_fn_declaration : Error< "a parameter list without types is only allowed in a function definition">; def ext_param_not_declared : ExtWarn< "parameter %0 was not declared, defaults to 'int'; ISO C99 and later do not " - "support implicit int">, InGroup, DefaultError; + "support implicit int">, InGroup; def err_param_default_argument : Error< "C does not support default arguments">; def err_param_default_argument_redefinition : Error< @@ -10104,7 +10104,7 @@ def warn_receiver_forward_class : Warning< def note_method_sent_forward_class : Note<"method %0 is used for the forward class">; def ext_missing_type_specifier : ExtWarn< "type specifier missing, defaults to 'int'; ISO C99 and later do not support " - "implicit int">, InGroup, DefaultError; + "implicit int">, InGroup; def err_missing_type_specifier : Error< "a type specifier is required for all declarations">; def err_decimal_unsupported : Error< From nobody Sun Jul 23 18:27:07 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 4R8BbJ3jwtz4p6KQ; Sun, 23 Jul 2023 18:27:08 +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 4R8BbJ0CrMz3h6Z; Sun, 23 Jul 2023 18:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136828; 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=Y2xXZ1ZQpGQ1NEVJIxy4NtdJZcrVNMOlDLanh8FSjEY=; b=HgrYAAOyy4w89WKN+Tz+mMpzHXOPAo4bh3vKFSNKqCxpexsX5Ii64suGEA+T8vaBbmqO1q I4gYT1EjXKgopN1+gXWu+n7DemA9WP12PgaJF0ZsADlMHlr7m1NWYIPkjxWKOjlCj5LIj6 Iy9Il7M0ccUbHPIkBpjlEC+TOpBABgRFKE+AEqPJDh3x9hqmwyC4a3sqWXU3IC7SedI3WH BxFuDA//ZmdzCIrYabTZcjSHHbB6itqH0WUwegolNbHlevuwzvnIVPlfasBQBKXFm6v7cs p5oysI0VRXDhrCvJ8wSqYyqgAo3cA8B0hb+7aALJorgJZnq5Agotb3a9hEaAjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136828; 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=Y2xXZ1ZQpGQ1NEVJIxy4NtdJZcrVNMOlDLanh8FSjEY=; b=IlQXMcFW7Qbpj2e/XNqntHVQpIGJKDoUhnOo+UrETh87QL6D2qao8n79QGC+q+rGk4fmNY ft7Xb2eIoxcEWGSU8xLIhdzfSLN0zEie9mG1jArz0YkCWq/m73hwwfoOcQJwhMcDn0ADEz YDDDE93Uod7lhac/hvZPyHCB5GtpKPHlpDFwQDLimad9cUVLIYccbgqT7Vo1yPZbEQIWFx jHQL6vpAoj86NP2PSUeKpb0sCqmpldiwo61IAVzOOrJmNNkEgBIw3+Ofkk4VeKD9gQ6kPW oJRYywLrAN6oa5hELrqPnqg7Z4+uz9LOteZGPi6tqE1TMJNm2XsXBU8Z7LfdGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136828; a=rsa-sha256; cv=none; b=csYnivm+9mIYfjHyw3+yXcwLJXLXJlkezUFKJG7rdYDjmIqFxiAlqZpmE5rB9Y7SnMco+a tvbTfRR6XIKrRbwSMQGzZ14pcdnUnHYUnP7lfgO1EhmRoP5cUJA0nVb+CTXJgMHOTugylX KIrOEVkkaal3TFfcXnpzQtKtUnok+v3+9qOBIx3NpsDLrd9fyZFrtxvcGO74n0cdXcniMX NEHewd6fVw14IygRcdugmPl4qF4KJ+sWtnagSeg+phLDzwfnfj5r+O235nU2sG5wLTSZsR OQW3he6pWp54/E9XZ5DiVZOdO/TWvmcZG/9bY6fmxT22Q9vV3zEwwXkq8OmRyQ== 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 4R8BbH6Qh9zmhh; Sun, 23 Jul 2023 18:27:07 +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 36NIR7GE058751; Sun, 23 Jul 2023 18:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR7N3058750; Sun, 23 Jul 2023 18:27:07 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:07 GMT Message-Id: <202307231827.36NIR7N3058750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: da3adc3ce965 - stable/13 - Merge llvm-project release/16.x llvmorg-16.0.3-0-gda3cd333bea5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: da3adc3ce9654206cdd1f6a481e5f55d6f880bd3 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=da3adc3ce9654206cdd1f6a481e5f55d6f880bd3 commit da3adc3ce9654206cdd1f6a481e5f55d6f880bd3 Author: Dimitry Andric AuthorDate: 2023-05-05 17:37:33 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:10 +0000 Merge llvm-project release/16.x llvmorg-16.0.3-0-gda3cd333bea5 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.3-0-gda3cd333bea5 (aka 16.0.3 release). PR: 271047 MFC after: 1 month (cherry picked from commit cbe9438cfe07adfbcdeafe8e363614f83b03a055) --- contrib/llvm-project/clang/lib/AST/Expr.cpp | 4 +++ .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 7 ++++ contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 7 ++-- .../llvm-project/clang/lib/Sema/TreeTransform.h | 22 +++++------- contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/COFF/Driver.cpp | 8 ++++- contrib/llvm-project/lld/COFF/Options.td | 3 ++ .../lldb/source/Host/posix/MainLoopPosix.cpp | 9 +++-- .../llvm/lib/CodeGen/MachineLateInstrsCleanup.cpp | 3 +- .../InstCombine/InstCombineMulDivRem.cpp | 41 ++++++++++++++-------- .../llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 10 ++++-- lib/clang/include/VCSVersion.inc | 6 ++-- lib/clang/include/clang/Basic/Version.inc | 6 ++-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 ++-- lib/clang/include/llvm/Config/config.h | 4 +-- lib/clang/include/llvm/Config/llvm-config.h | 4 +-- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 18 files changed, 93 insertions(+), 53 deletions(-) diff --git a/contrib/llvm-project/clang/lib/AST/Expr.cpp b/contrib/llvm-project/clang/lib/AST/Expr.cpp index 67862a8692ac..e45ae68cd5fe 100644 --- a/contrib/llvm-project/clang/lib/AST/Expr.cpp +++ b/contrib/llvm-project/clang/lib/AST/Expr.cpp @@ -1963,6 +1963,10 @@ Expr *ignoreImplicitSemaNodes(Expr *E) { if (auto *Full = dyn_cast(E)) return Full->getSubExpr(); + if (auto *CPLIE = dyn_cast(E); + CPLIE && CPLIE->getInitExprs().size() == 1) + return CPLIE->getInitExprs()[0]; + return E; } } // namespace diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/CommonArgs.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/CommonArgs.cpp index 0883631dfe98..34640b3c450d 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -757,6 +757,13 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args, D.Diag(clang::diag::warn_drv_fjmc_for_elf_only); } + if (Arg *A = Args.getLastArg(options::OPT_femulated_tls, + options::OPT_fno_emulated_tls)) { + bool Enable = A->getOption().getID() == options::OPT_femulated_tls; + CmdArgs.push_back(Args.MakeArgString( + Twine(PluginOptPrefix) + "-emulated-tls=" + (Enable ? "1" : "0"))); + } + if (Args.hasFlag(options::OPT_fstack_size_section, options::OPT_fno_stack_size_section, false)) CmdArgs.push_back( diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index ddb2b5cf5cd1..99801a88e3ed 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -5420,8 +5420,9 @@ static void TryOrBuildParenListInitialization( } else if (auto *RT = Entity.getType()->getAs()) { const CXXRecordDecl *RD = cast(RT->getDecl()); - auto BaseRange = map_range(RD->bases(), [&S](auto &base) { - return InitializedEntity::InitializeBase(S.getASTContext(), &base, false); + auto BaseRange = map_range(RD->bases(), [&](auto &base) { + return InitializedEntity::InitializeBase(S.getASTContext(), &base, false, + &Entity); }); auto FieldRange = map_range(RD->fields(), [](auto *field) { return InitializedEntity::InitializeMember(field); @@ -9180,6 +9181,8 @@ ExprResult InitializationSequence::Perform(Sema &S, /*VerifyOnly=*/false, &CurInit); if (CurInit.get() && ResultType) *ResultType = CurInit.get()->getType(); + if (shouldBindAsTemporary(Entity)) + CurInit = S.MaybeBindToTemporary(CurInit.get()); break; } } diff --git a/contrib/llvm-project/clang/lib/Sema/TreeTransform.h b/contrib/llvm-project/clang/lib/Sema/TreeTransform.h index 48bb28b56cd3..4244bbc1e4b1 100644 --- a/contrib/llvm-project/clang/lib/Sema/TreeTransform.h +++ b/contrib/llvm-project/clang/lib/Sema/TreeTransform.h @@ -3137,6 +3137,13 @@ public: Expr *Sub, SourceLocation RParenLoc, bool ListInitialization) { + // If Sub is a ParenListExpr, then Sub is the syntatic form of a + // CXXParenListInitExpr. Pass its expanded arguments so that the + // CXXParenListInitExpr can be rebuilt. + if (auto *PLE = dyn_cast(Sub)) + return getSema().BuildCXXTypeConstructExpr( + TInfo, LParenLoc, MultiExprArg(PLE->getExprs(), PLE->getNumExprs()), + RParenLoc, ListInitialization); return getSema().BuildCXXTypeConstructExpr(TInfo, LParenLoc, MultiExprArg(&Sub, 1), RParenLoc, ListInitialization); @@ -3866,16 +3873,6 @@ public: return getSema().BuildEmptyCXXFoldExpr(EllipsisLoc, Operator); } - ExprResult RebuildCXXParenListInitExpr(ArrayRef Args, QualType T, - unsigned NumUserSpecifiedExprs, - SourceLocation InitLoc, - SourceLocation LParenLoc, - SourceLocation RParenLoc) { - return CXXParenListInitExpr::Create(getSema().Context, Args, T, - NumUserSpecifiedExprs, InitLoc, - LParenLoc, RParenLoc); - } - /// Build a new atomic operation expression. /// /// By default, performs semantic analysis to build the new expression. @@ -14075,9 +14072,8 @@ TreeTransform::TransformCXXParenListInitExpr(CXXParenListInitExpr *E) { TransformedInits)) return ExprError(); - return getDerived().RebuildCXXParenListInitExpr( - TransformedInits, E->getType(), E->getUserSpecifiedInitExprs().size(), - E->getInitLoc(), E->getBeginLoc(), E->getEndLoc()); + return getDerived().RebuildParenListExpr(E->getBeginLoc(), TransformedInits, + E->getEndLoc()); } template diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 5e30a42174af..36bdbd8680db 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -38,7 +38,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 160002 +# define _LIBCPP_VERSION 160003 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/contrib/llvm-project/lld/COFF/Driver.cpp b/contrib/llvm-project/lld/COFF/Driver.cpp index 0a153c8f6cb7..d6b71eaf7f28 100644 --- a/contrib/llvm-project/lld/COFF/Driver.cpp +++ b/contrib/llvm-project/lld/COFF/Driver.cpp @@ -436,9 +436,12 @@ void LinkerDriver::parseDirectives(InputFile *file) { case OPT_editandcontinue: case OPT_guardsym: case OPT_throwingnew: + case OPT_inferasanlibs: + case OPT_inferasanlibs_no: break; default: - error(arg->getSpelling() + " is not allowed in .drectve"); + error(arg->getSpelling() + " is not allowed in .drectve (" + + toString(file) + ")"); } } } @@ -1923,6 +1926,9 @@ void LinkerDriver::linkerMain(ArrayRef argsArr) { args.hasFlag(OPT_stdcall_fixup, OPT_stdcall_fixup_no, config->mingw); config->warnStdcallFixup = !args.hasArg(OPT_stdcall_fixup); + if (args.hasFlag(OPT_inferasanlibs, OPT_inferasanlibs_no, false)) + warn("ignoring '/inferasanlibs', this flag is not supported"); + // Don't warn about long section names, such as .debug_info, for mingw or // when -debug:dwarf is requested. if (config->mingw || config->debugDwarf) diff --git a/contrib/llvm-project/lld/COFF/Options.td b/contrib/llvm-project/lld/COFF/Options.td index df527bb48ae7..2a89509be5fe 100644 --- a/contrib/llvm-project/lld/COFF/Options.td +++ b/contrib/llvm-project/lld/COFF/Options.td @@ -194,6 +194,9 @@ defm highentropyva : B<"highentropyva", defm incremental : B<"incremental", "Keep original import library if contents are unchanged", "Overwrite import library even if contents are unchanged">; +defm inferasanlibs : B<"inferasanlibs", + "Unused, generates a warning", + "No effect (default)">; defm integritycheck : B<"integritycheck", "Set FORCE_INTEGRITY bit in PE header", "No effect (default)">; diff --git a/contrib/llvm-project/lldb/source/Host/posix/MainLoopPosix.cpp b/contrib/llvm-project/lldb/source/Host/posix/MainLoopPosix.cpp index b185c3d3b707..5b50b450433e 100644 --- a/contrib/llvm-project/lldb/source/Host/posix/MainLoopPosix.cpp +++ b/contrib/llvm-project/lldb/source/Host/posix/MainLoopPosix.cpp @@ -156,9 +156,12 @@ Status MainLoopPosix::RunImpl::Poll() { size_t sigset_len; } extra_data = {&kernel_sigset, sizeof(kernel_sigset)}; if (syscall(__NR_pselect6, nfds, &read_fd_set, nullptr, nullptr, nullptr, - &extra_data) == -1 && - errno != EINTR) - return Status(errno, eErrorTypePOSIX); + &extra_data) == -1) { + if (errno != EINTR) + return Status(errno, eErrorTypePOSIX); + else + FD_ZERO(&read_fd_set); + } return Status(); } diff --git a/contrib/llvm-project/llvm/lib/CodeGen/MachineLateInstrsCleanup.cpp b/contrib/llvm-project/llvm/lib/CodeGen/MachineLateInstrsCleanup.cpp index c400ce190b46..bb33b843e024 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/MachineLateInstrsCleanup.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/MachineLateInstrsCleanup.cpp @@ -175,7 +175,8 @@ bool MachineLateInstrsCleanup::processBlock(MachineBasicBlock *MBB) { Reg2DefMap &MBBDefs = RegDefs[MBB->getNumber()]; // Find reusable definitions in the predecessor(s). - if (!MBB->pred_empty() && !MBB->isEHPad()) { + if (!MBB->pred_empty() && !MBB->isEHPad() && + !MBB->isInlineAsmBrIndirectTarget()) { MachineBasicBlock *FirstPred = *MBB->pred_begin(); for (auto [Reg, DefMI] : RegDefs[FirstPred->getNumber()]) if (llvm::all_of( diff --git a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp index 97f129e200de..dd1e8da2eb48 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp @@ -1121,7 +1121,7 @@ static const unsigned MaxDepth = 6; // actual instructions, otherwise return a non-null dummy value. Return nullptr // on failure. static Value *takeLog2(IRBuilderBase &Builder, Value *Op, unsigned Depth, - bool DoFold) { + bool AssumeNonZero, bool DoFold) { auto IfFold = [DoFold](function_ref Fn) { if (!DoFold) return reinterpret_cast(-1); @@ -1147,14 +1147,18 @@ static Value *takeLog2(IRBuilderBase &Builder, Value *Op, unsigned Depth, // FIXME: Require one use? Value *X, *Y; if (match(Op, m_ZExt(m_Value(X)))) - if (Value *LogX = takeLog2(Builder, X, Depth, DoFold)) + if (Value *LogX = takeLog2(Builder, X, Depth, AssumeNonZero, DoFold)) return IfFold([&]() { return Builder.CreateZExt(LogX, Op->getType()); }); // log2(X << Y) -> log2(X) + Y // FIXME: Require one use unless X is 1? - if (match(Op, m_Shl(m_Value(X), m_Value(Y)))) - if (Value *LogX = takeLog2(Builder, X, Depth, DoFold)) - return IfFold([&]() { return Builder.CreateAdd(LogX, Y); }); + if (match(Op, m_Shl(m_Value(X), m_Value(Y)))) { + auto *BO = cast(Op); + // nuw will be set if the `shl` is trivially non-zero. + if (AssumeNonZero || BO->hasNoUnsignedWrap() || BO->hasNoSignedWrap()) + if (Value *LogX = takeLog2(Builder, X, Depth, AssumeNonZero, DoFold)) + return IfFold([&]() { return Builder.CreateAdd(LogX, Y); }); + } // log2(Cond ? X : Y) -> Cond ? log2(X) : log2(Y) // FIXME: missed optimization: if one of the hands of select is/contains @@ -1162,8 +1166,10 @@ static Value *takeLog2(IRBuilderBase &Builder, Value *Op, unsigned Depth, // FIXME: can both hands contain undef? // FIXME: Require one use? if (SelectInst *SI = dyn_cast(Op)) - if (Value *LogX = takeLog2(Builder, SI->getOperand(1), Depth, DoFold)) - if (Value *LogY = takeLog2(Builder, SI->getOperand(2), Depth, DoFold)) + if (Value *LogX = takeLog2(Builder, SI->getOperand(1), Depth, + AssumeNonZero, DoFold)) + if (Value *LogY = takeLog2(Builder, SI->getOperand(2), Depth, + AssumeNonZero, DoFold)) return IfFold([&]() { return Builder.CreateSelect(SI->getOperand(0), LogX, LogY); }); @@ -1171,13 +1177,18 @@ static Value *takeLog2(IRBuilderBase &Builder, Value *Op, unsigned Depth, // log2(umin(X, Y)) -> umin(log2(X), log2(Y)) // log2(umax(X, Y)) -> umax(log2(X), log2(Y)) auto *MinMax = dyn_cast(Op); - if (MinMax && MinMax->hasOneUse() && !MinMax->isSigned()) - if (Value *LogX = takeLog2(Builder, MinMax->getLHS(), Depth, DoFold)) - if (Value *LogY = takeLog2(Builder, MinMax->getRHS(), Depth, DoFold)) + if (MinMax && MinMax->hasOneUse() && !MinMax->isSigned()) { + // Use AssumeNonZero as false here. Otherwise we can hit case where + // log2(umax(X, Y)) != umax(log2(X), log2(Y)) (because overflow). + if (Value *LogX = takeLog2(Builder, MinMax->getLHS(), Depth, + /*AssumeNonZero*/ false, DoFold)) + if (Value *LogY = takeLog2(Builder, MinMax->getRHS(), Depth, + /*AssumeNonZero*/ false, DoFold)) return IfFold([&]() { - return Builder.CreateBinaryIntrinsic( - MinMax->getIntrinsicID(), LogX, LogY); + return Builder.CreateBinaryIntrinsic(MinMax->getIntrinsicID(), LogX, + LogY); }); + } return nullptr; } @@ -1297,8 +1308,10 @@ Instruction *InstCombinerImpl::visitUDiv(BinaryOperator &I) { } // Op1 udiv Op2 -> Op1 lshr log2(Op2), if log2() folds away. - if (takeLog2(Builder, Op1, /*Depth*/0, /*DoFold*/false)) { - Value *Res = takeLog2(Builder, Op1, /*Depth*/0, /*DoFold*/true); + if (takeLog2(Builder, Op1, /*Depth*/ 0, /*AssumeNonZero*/ true, + /*DoFold*/ false)) { + Value *Res = takeLog2(Builder, Op1, /*Depth*/ 0, + /*AssumeNonZero*/ true, /*DoFold*/ true); return replaceInstUsesWith( I, Builder.CreateLShr(Op0, Res, I.getName(), I.isExact())); } diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 9e0483966d3e..f662e126e378 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -2455,9 +2455,13 @@ bool CompatibleSets::shouldBelongToSameSet(ArrayRef Invokes) { // Can we theoretically form the data operands for the merged `invoke`? auto IsIllegalToMergeArguments = [](auto Ops) { - Type *Ty = std::get<0>(Ops)->getType(); - assert(Ty == std::get<1>(Ops)->getType() && "Incompatible types?"); - return Ty->isTokenTy() && std::get<0>(Ops) != std::get<1>(Ops); + Use &U0 = std::get<0>(Ops); + Use &U1 = std::get<1>(Ops); + if (U0 == U1) + return false; + return U0->getType()->isTokenTy() || + !canReplaceOperandWithVariable(cast(U0.getUser()), + U0.getOperandNo()); }; assert(Invokes.size() == 2 && "Always called with exactly two candidates."); if (any_of(zip(Invokes[0]->data_ops(), Invokes[1]->data_ops()), diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 420881e41de4..466b5ce7ecfd 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define CLANG_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define LLDB_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index c6154e17ec22..13d7baf64730 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,10 +1,10 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 16.0.2 -#define CLANG_VERSION_STRING "16.0.2" +#define CLANG_VERSION 16.0.3 +#define CLANG_VERSION_STRING "16.0.3" #define CLANG_VERSION_MAJOR 16 #define CLANG_VERSION_MAJOR_STRING "16" #define CLANG_VERSION_MINOR 0 -#define CLANG_VERSION_PATCHLEVEL 2 +#define CLANG_VERSION_PATCHLEVEL 3 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 4e2cc44c9364..8f4dd4a4b559 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "16.0.2 (FreeBSD llvmorg-16.0.2-0-g18ddebe1a1a9-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "16.0.3 (FreeBSD llvmorg-16.0.3-0-gda3cd333bea5-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index dab8cdb281fa..4434036b81e2 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 16.0.2 -#define LLDB_VERSION_STRING "16.0.2" +#define LLDB_VERSION 16.0.3 +#define LLDB_VERSION_STRING "16.0.3" #define LLDB_VERSION_MAJOR 16 #define LLDB_VERSION_MINOR 0 -#define LLDB_VERSION_PATCH 2 +#define LLDB_VERSION_PATCH 3 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 93cb4b9dd9dc..57914743328d 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -348,10 +348,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 16.0.2" +#define PACKAGE_STRING "LLVM 16.0.3" /* Define to the version of this package. */ -#define PACKAGE_VERSION "16.0.2" +#define PACKAGE_VERSION "16.0.3" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index b5b415db51c4..3932cfc4d1c3 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -74,10 +74,10 @@ #define LLVM_VERSION_MINOR 0 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 2 +#define LLVM_VERSION_PATCH 3 /* LLVM version string */ -#define LLVM_VERSION_STRING "16.0.2" +#define LLVM_VERSION_STRING "16.0.3" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 760d4e828e07..4fa56888d33c 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Sun Jul 23 18:27:08 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 4R8BbK4rx6z4p6H9; Sun, 23 Jul 2023 18:27:09 +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 4R8BbK30tqz3h2P; Sun, 23 Jul 2023 18:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136829; 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=jHAwSo1IVnNQ92voCwzjdQhc2x6eHR4Kp4IVHERlgfw=; b=qEQqTQumwZQGQ53GyRQMdI9qCLYH/EOtuP+naZUIS8gaK2z7USm1eB7ynyqMleJXIro/kF QKlURZad6MiF0K4dGCDtmmCR0LipynoKE1rgFW4UrrrtZKyCd+aYg7y6IBgbwQ1GAOs9Ch +97gE2QIPhOQy/9/C8lDJV1bSTcwzk7f+vgkIIdkWGW9/jIgspIM2i51XqVod2loVkC2sO 1on15gaEsC05SC34v30a61xcZdX335s1rdBQ3HfS1mJ2C/qEHqWpzJTwaRTzBk4tQj5JJg a6jrYZFeGWrcQXQy3FCE9vVciIp/p+ceVyLz+l6BQtoac5Km+hblfxkWUhQfUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136829; 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=jHAwSo1IVnNQ92voCwzjdQhc2x6eHR4Kp4IVHERlgfw=; b=JpwvpVehnWvn7DxhxC7S2Go52fdQUKAQgaeJwrc+UUhx2iMAsX0wQoLMV0Ko2/1LYnrIoO xNAu724Ar94luyQp7ucMU7pQFMC0wO+AImEcMiF4Fn8xjoi1oSmdj0ZMAuG9m7ehtRHz6g kWTD8nTHrVK7geJlG1U5LofvIa0XeWqJvnUmaAw4evCnIAEcZX5L6pZANwevd1WumXPvf6 A3/xyGXIF9GiZtx49SJiovAR3h4Jcm8CXBr8pVQEn3a2lNTPfCu0CiiHUluRmGR5dzLBxA n/tmqAcLXRWCxZpZUEhqqQtTCzQkPwJO5WBnLvvratCgzMAEDoWirxuntitNRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136829; a=rsa-sha256; cv=none; b=oEFmNxXiJ47Cekm5N/MjFkxUXlZUK3DsnWPBlZxJTOKEfYDWpcTFP9T5cYFQ+TFjPaPZ7A 1VS4W7T5gXHJaDkuijKYlGp+bmzvs0g6T0uWS6gSulsHLtOUCAtSvuG+SAOppYtK9x3PIr zvqU5UQ4mHhYKfdqtSAtz3hnL0H+gD/uHCdvFoOGeeiCl6rauu+KNw538emzTJ7WS1n0SN K+6l5JVIgnAd2967T/8tUMawQK84ALnYHL61kopmhlDJAXfQrZ6YjCOwR5pRK4O8FISdOx Dbpl/NBReiFDgtIhhTe0oL4oZxVxS+bSY73+57xtwMxuf7ATj1Zv1HSwlL9BXA== 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 4R8BbK0c9mzmhj; Sun, 23 Jul 2023 18:27:09 +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 36NIR9s5058770; Sun, 23 Jul 2023 18:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR8iR058769; Sun, 23 Jul 2023 18:27:08 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:08 GMT Message-Id: <202307231827.36NIR8iR058769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2e0c78c9c134 - stable/13 - Merge llvm-project release/16.x llvmorg-16.0.4-0-gae42196bc493 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e0c78c9c134db4facda3abd297597e64f28fda7 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2e0c78c9c134db4facda3abd297597e64f28fda7 commit 2e0c78c9c134db4facda3abd297597e64f28fda7 Author: Dimitry Andric AuthorDate: 2023-05-22 17:29:55 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:10 +0000 Merge llvm-project release/16.x llvmorg-16.0.4-0-gae42196bc493 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.4-0-gae42196bc493 (aka 16.0.4 release). PR: 271047 MFC after: 1 month (cherry picked from commit a324c34037ef2e1101962fca4ad0c021253288e1) --- contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 2 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 2 +- .../clang/lib/Driver/ToolChains/MSVC.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 16 +- contrib/llvm-project/libcxx/include/__config | 2 +- .../lib/CodeGen/SelectionDAG/TargetLowering.cpp | 9 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 6 +- .../llvm/lib/Target/X86/X86FrameLowering.cpp | 14 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- usr.bin/clang/bugpoint/bugpoint.1 | 39 +- usr.bin/clang/clang/clang.1 | 116 ++- usr.bin/clang/llc/llc.1 | 15 +- usr.bin/clang/lli/lli.1 | 11 +- usr.bin/clang/llvm-ar/llvm-ar.1 | 73 +- usr.bin/clang/llvm-ar/llvm-ranlib.1 | 11 +- usr.bin/clang/llvm-as/llvm-as.1 | 5 +- usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1 | 25 +- usr.bin/clang/llvm-cov/llvm-cov.1 | 143 +++- usr.bin/clang/llvm-cxxfilt/llvm-cxxfilt.1 | 10 +- usr.bin/clang/llvm-diff/llvm-diff.1 | 5 +- usr.bin/clang/llvm-dis/llvm-dis.1 | 5 +- usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1 | 19 +- usr.bin/clang/llvm-dwarfutil/llvm-dwarfutil.1 | 10 +- usr.bin/clang/llvm-extract/llvm-extract.1 | 7 +- usr.bin/clang/llvm-link/llvm-link.1 | 7 +- usr.bin/clang/llvm-mca/llvm-mca.1 | 326 +++++++- usr.bin/clang/llvm-nm/llvm-nm.1 | 89 ++- usr.bin/clang/llvm-objcopy/llvm-objcopy.1 | 73 +- usr.bin/clang/llvm-objdump/llvm-objdump.1 | 125 ++- usr.bin/clang/llvm-pdbutil/llvm-pdbutil.1 | 9 +- usr.bin/clang/llvm-profdata/llvm-profdata.1 | 134 ++-- usr.bin/clang/llvm-readobj/llvm-readelf.1 | 59 +- usr.bin/clang/llvm-readobj/llvm-readobj.1 | 88 +- usr.bin/clang/llvm-size/llvm-size.1 | 14 +- usr.bin/clang/llvm-strings/llvm-strings.1 | 14 +- usr.bin/clang/llvm-symbolizer/llvm-addr2line.1 | 5 +- usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1 | 214 ++++- usr.bin/clang/llvm-tblgen/Makefile | 1 + usr.bin/clang/llvm-tblgen/llvm-tblgen.1 | 888 --------------------- usr.bin/clang/opt/opt.1 | 45 +- 46 files changed, 1266 insertions(+), 1402 deletions(-) diff --git a/contrib/llvm-project/clang/lib/AST/TypePrinter.cpp b/contrib/llvm-project/clang/lib/AST/TypePrinter.cpp index 5c2464904485..2d06faeca182 100644 --- a/contrib/llvm-project/clang/lib/AST/TypePrinter.cpp +++ b/contrib/llvm-project/clang/lib/AST/TypePrinter.cpp @@ -1812,7 +1812,7 @@ void TypePrinter::printAttributedAfter(const AttributedType *T, void TypePrinter::printBTFTagAttributedBefore(const BTFTagAttributedType *T, raw_ostream &OS) { printBefore(T->getWrappedType(), OS); - OS << " btf_type_tag(" << T->getAttr()->getBTFTypeTag() << ")"; + OS << " __attribute__((btf_type_tag(\"" << T->getAttr()->getBTFTypeTag() << "\")))"; } void TypePrinter::printBTFTagAttributedAfter(const BTFTagAttributedType *T, diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp index ec6860113b7e..238507e06335 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp @@ -7782,7 +7782,7 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType, if (Args.hasArg(options::OPT__SLASH_kernel)) CmdArgs.push_back("-fms-kernel"); - if (Arg *A = Args.getLastArg(options::OPT__SLASH_guard)) { + for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) { StringRef GuardArgs = A->getValue(); // The only valid options are "cf", "cf,nochecks", "cf-", "ehcont" and // "ehcont-". diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/MSVC.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/MSVC.cpp index 8ad67ca3e13f..b8aa21b7a766 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/MSVC.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/MSVC.cpp @@ -227,7 +227,7 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgValues(CmdArgs, options::OPT__SLASH_link); // Control Flow Guard checks - if (Arg *A = Args.getLastArg(options::OPT__SLASH_guard)) { + for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) { StringRef GuardArgs = A->getValue(); if (GuardArgs.equals_insensitive("cf") || GuardArgs.equals_insensitive("cf,nochecks")) { diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 99801a88e3ed..44adb167dcc0 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -5348,14 +5348,16 @@ static void TryOrBuildParenListInitialization( // The remaining elements are initialized with their default member // initializers, if any auto *FD = cast(SubEntity.getDecl()); - if (Expr *ICE = FD->getInClassInitializer(); ICE && !VerifyOnly) { - ExprResult DIE = S.BuildCXXDefaultInitExpr(FD->getLocation(), FD); - if (DIE.isInvalid()) - return false; - S.checkInitializerLifetime(SubEntity, DIE.get()); - InitExprs.push_back(DIE.get()); + if (FD->hasInClassInitializer()) { + if (!VerifyOnly) { + ExprResult DIE = S.BuildCXXDefaultInitExpr(FD->getLocation(), FD); + if (DIE.isInvalid()) + return false; + S.checkInitializerLifetime(SubEntity, DIE.get()); + InitExprs.push_back(DIE.get()); + } continue; - }; + } } // Remaining class elements without default member initializers and // array elements are value initialized: diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 36bdbd8680db..9009b9014abb 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -38,7 +38,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 160003 +# define _LIBCPP_VERSION 160004 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index 8d4c8802f71c..3de4efb5ba22 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -1724,12 +1724,9 @@ bool TargetLowering::SimplifyDemandedBits( unsigned InnerBits = InnerVT.getScalarSizeInBits(); if (ShAmt < InnerBits && DemandedBits.getActiveBits() <= InnerBits && isTypeDesirableForOp(ISD::SHL, InnerVT)) { - EVT ShTy = getShiftAmountTy(InnerVT, DL); - if (!APInt(BitWidth, ShAmt).isIntN(ShTy.getSizeInBits())) - ShTy = InnerVT; - SDValue NarrowShl = - TLO.DAG.getNode(ISD::SHL, dl, InnerVT, InnerOp, - TLO.DAG.getConstant(ShAmt, dl, ShTy)); + SDValue NarrowShl = TLO.DAG.getNode( + ISD::SHL, dl, InnerVT, InnerOp, + TLO.DAG.getShiftAmountConstant(ShAmt, InnerVT, dl)); return TLO.CombineTo( Op, TLO.DAG.getNode(ISD::ANY_EXTEND, dl, VT, NarrowShl)); } diff --git a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp index 5dca792dc89a..0b3059df124e 100644 --- a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp @@ -8488,11 +8488,13 @@ SystemZTargetLowering::emitMemMemWrapper(MachineInstr &MI, .addReg(RemSrcReg).addImm(SrcDisp); MBB->addSuccessor(AllDoneMBB); MBB = AllDoneMBB; - if (EndMBB) { + if (Opcode != SystemZ::MVC) { EXRL_MIB.addReg(SystemZ::CC, RegState::ImplicitDefine); - MBB->addLiveIn(SystemZ::CC); + if (EndMBB) + MBB->addLiveIn(SystemZ::CC); } } + MF.getProperties().reset(MachineFunctionProperties::Property::NoPHIs); } // Handle any remaining bytes with straight-line code. diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86FrameLowering.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86FrameLowering.cpp index 1606413c382b..df9aaddd5729 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -1557,7 +1557,19 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF, Fn.arg_size() == 2) { StackSize += 8; MFI.setStackSize(StackSize); - emitSPUpdate(MBB, MBBI, DL, -8, /*InEpilogue=*/false); + + // Update the stack pointer by pushing a register. This is the instruction + // emitted that would be end up being emitted by a call to `emitSPUpdate`. + // Hard-coding the update to a push avoids emitting a second + // `STACKALLOC_W_PROBING` instruction in the save block: We know that stack + // probing isn't needed anyways for an 8-byte update. + // Pushing a register leaves us in a similar situation to a regular + // function call where we know that the address at (rsp-8) is writeable. + // That way we avoid any off-by-ones with stack probing for additional + // stack pointer updates later on. + BuildMI(MBB, MBBI, DL, TII.get(X86::PUSH64r)) + .addReg(X86::RAX, RegState::Undef) + .setMIFlag(MachineInstr::FrameSetup); } // If this is x86-64 and the Red Zone is not disabled, if we are a leaf diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 466b5ce7ecfd..514717a358fc 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define LLVM_REVISION "llvmorg-16.0.4-0-gae42196bc493" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define CLANG_REVISION "llvmorg-16.0.4-0-gae42196bc493" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define LLDB_REVISION "llvmorg-16.0.4-0-gae42196bc493" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 13d7baf64730..301f49bfd08c 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,10 +1,10 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 16.0.3 -#define CLANG_VERSION_STRING "16.0.3" +#define CLANG_VERSION 16.0.4 +#define CLANG_VERSION_STRING "16.0.4" #define CLANG_VERSION_MAJOR 16 #define CLANG_VERSION_MAJOR_STRING "16" #define CLANG_VERSION_MINOR 0 -#define CLANG_VERSION_PATCHLEVEL 3 +#define CLANG_VERSION_PATCHLEVEL 4 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 8f4dd4a4b559..61598755e168 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "16.0.3 (FreeBSD llvmorg-16.0.3-0-gda3cd333bea5-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "16.0.4 (FreeBSD llvmorg-16.0.4-0-gae42196bc493-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 4434036b81e2..cdc1a2c63f72 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 16.0.3 -#define LLDB_VERSION_STRING "16.0.3" +#define LLDB_VERSION 16.0.4 +#define LLDB_VERSION_STRING "16.0.4" #define LLDB_VERSION_MAJOR 16 #define LLDB_VERSION_MINOR 0 -#define LLDB_VERSION_PATCH 3 +#define LLDB_VERSION_PATCH 4 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 57914743328d..105378ec0dcd 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -348,10 +348,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 16.0.3" +#define PACKAGE_STRING "LLVM 16.0.4" /* Define to the version of this package. */ -#define PACKAGE_VERSION "16.0.3" +#define PACKAGE_VERSION "16.0.4" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 3932cfc4d1c3..956e14142365 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -74,10 +74,10 @@ #define LLVM_VERSION_MINOR 0 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 3 +#define LLVM_VERSION_PATCH 4 /* LLVM version string */ -#define LLVM_VERSION_STRING "16.0.3" +#define LLVM_VERSION_STRING "16.0.4" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 4fa56888d33c..ca9915b70f68 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define LLVM_REVISION "llvmorg-16.0.4-0-gae42196bc493" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/usr.bin/clang/bugpoint/bugpoint.1 b/usr.bin/clang/bugpoint/bugpoint.1 index 97b227ea82d1..efbecd28e178 100644 --- a/usr.bin/clang/bugpoint/bugpoint.1 +++ b/usr.bin/clang/bugpoint/bugpoint.1 @@ -1,4 +1,3 @@ -.\" $FreeBSD$ .\" Man page generated from reStructuredText. . . @@ -28,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "BUGPOINT" "1" "2021-06-07" "12" "LLVM" +.TH "BUGPOINT" "1" "2023-05-24" "16" "LLVM" .SH NAME bugpoint \- automatic test case reduction tool .SH SYNOPSIS @@ -42,7 +41,7 @@ can be used to debug three types of failures: optimizer crashes, miscompilations by optimizers, or bad native code generation (including problems in the static and JIT compilers). It aims to reduce large test cases to small, useful ones. For more information on the design and inner workings of \fBbugpoint\fP, as well as -advice for using bugpoint, see /Bugpoint in the LLVM +advice for using bugpoint, see \fI\%LLVM bugpoint tool: design and usage\fP in the LLVM distribution. .SH OPTIONS .sp @@ -67,7 +66,7 @@ code is considered a test failure. Defaults to false. .INDENT 0.0 .INDENT 3.5 Pass all arguments specified after \fB\-\-args\fP to the test program whenever it runs. -Note that if any of the \fIprogram args\fP start with a "\fB\-\fP", you should use: +Note that if any of the \fIprogram args\fP start with a \(dq\fB\-\fP\(dq, you should use: .INDENT 0.0 .INDENT 3.5 .sp @@ -79,8 +78,8 @@ bugpoint [bugpoint args] \-\-args \-\- [program args] .UNINDENT .UNINDENT .sp -The "\fB\-\-\fP" right after the \fB\-\-args\fP option tells \fBbugpoint\fP to consider -any options starting with "\fB\-\fP" to be part of the \fB\-\-args\fP option, not as +The \(dq\fB\-\-\fP\(dq right after the \fB\-\-args\fP option tells \fBbugpoint\fP to consider +any options starting with \(dq\fB\-\fP\(dq to be part of the \fB\-\-args\fP option, not as options to \fBbugpoint\fP itself. .UNINDENT .UNINDENT @@ -102,8 +101,8 @@ bugpoint [bugpoint args] \-\-tool\-args \-\- [tool args] .UNINDENT .UNINDENT .sp -The "\fB\-\-\fP" right after the \fB\-\-tool\-args\fP option tells \fBbugpoint\fP to -consider any options starting with "\fB\-\fP" to be part of the \fB\-\-tool\-args\fP +The \(dq\fB\-\-\fP\(dq right after the \fB\-\-tool\-args\fP option tells \fBbugpoint\fP to +consider any options starting with \(dq\fB\-\fP\(dq to be part of the \fB\-\-tool\-args\fP option, not as options to \fBbugpoint\fP itself. (See \fB\-\-args\fP, above.) .UNINDENT .UNINDENT @@ -111,7 +110,7 @@ option, not as options to \fBbugpoint\fP itself. (See \fB\-\-args\fP, above.) \fB\-\-safe\-tool\-args\fP \fItool args\fP .INDENT 0.0 .INDENT 3.5 -Pass all arguments specified after \fB\-\-safe\-tool\-args\fP to the "safe" execution +Pass all arguments specified after \fB\-\-safe\-tool\-args\fP to the \(dqsafe\(dq execution tool. .UNINDENT .UNINDENT @@ -205,9 +204,9 @@ to zero to disable the limit. .INDENT 0.0 .INDENT 3.5 Whenever the test program produces output on its standard output stream, it -should match the contents of \fIfilename\fP (the "reference output"). If you +should match the contents of \fIfilename\fP (the \(dqreference output\(dq). If you do not use this option, \fBbugpoint\fP will attempt to generate a reference output -by compiling the program with the "safe" backend and running it. +by compiling the program with the \(dqsafe\(dq backend and running it. .UNINDENT .UNINDENT .sp @@ -225,13 +224,13 @@ custom command (see \fB\-\-exec\-command\fP) respectively. .INDENT 0.0 .INDENT 3.5 When debugging a code generator, \fBbugpoint\fP should use the specified code -generator as the "safe" code generator. This is a known\-good code generator -used to generate the "reference output" if it has not been provided, and to +generator as the \(dqsafe\(dq code generator. This is a known\-good code generator +used to generate the \(dqreference output\(dq if it has not been provided, and to compile portions of the program that as they are excluded from the testcase. These options allow you to choose the static native code compiler, or a custom command, (see \fB\-\-exec\-command\fP) respectively. The interpreter and the JIT backends cannot currently -be used as the "safe" backends. +be used as the \(dqsafe\(dq backends. .UNINDENT .UNINDENT .sp @@ -249,9 +248,9 @@ be useful for cross\-compilation. .INDENT 3.5 This option defines the command to use with the \fB\-\-compile\-custom\fP option to compile the bitcode testcase. The command should exit with a -failure exit code if the file is "interesting" and should exit with a +failure exit code if the file is \(dqinteresting\(dq and should exit with a success exit code (i.e. 0) otherwise (this is the same as if it crashed on -"interesting" inputs). +\(dqinteresting\(dq inputs). .sp This can be useful for testing compiler output without running any link or execute stages. To @@ -263,14 +262,14 @@ testcase and pass the name of an executable compile\-command script in this form .nf .ft C #!/bin/sh -llc "$@" +llc \(dq$@\(dq not FileCheck [bugpoint input file].ll < bugpoint\-test\-program.s .ft P .fi .UNINDENT .UNINDENT .sp -This script will "fail" as long as FileCheck passes. So the result +This script will \(dqfail\(dq as long as FileCheck passes. So the result will be the minimum bitcode that passes FileCheck. .UNINDENT .UNINDENT @@ -287,7 +286,7 @@ option. \fB\-\-verbose\-errors\fP=\fI{true,false}\fP .INDENT 0.0 .INDENT 3.5 -The default behavior of bugpoint is to print "" when it finds a reduced +The default behavior of bugpoint is to print \(dq\(dq when it finds a reduced test that crashes compilation. This flag prints the output of the crashing program to stderr. This is useful to make sure it is the same error being tracked down and not a different error that happens to crash the compiler as @@ -304,6 +303,6 @@ if an error occurs, it will exit with a non\-zero value. .SH AUTHOR Maintained by the LLVM Team (https://llvm.org/). .SH COPYRIGHT -2003-2021, LLVM Project +2003-2023, LLVM Project .\" Generated by docutils manpage writer. . diff --git a/usr.bin/clang/clang/clang.1 b/usr.bin/clang/clang/clang.1 index 10e78ebe16df..8099bd228799 100644 --- a/usr.bin/clang/clang/clang.1 +++ b/usr.bin/clang/clang/clang.1 @@ -1,4 +1,3 @@ -.\" $FreeBSD$ .\" Man page generated from reStructuredText. . . @@ -28,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "CLANG" "1" "2021-06-07" "12" "Clang" +.TH "CLANG" "1" "2023-05-24" "16" "Clang" .SH NAME clang \- the Clang C, C++, and Objective-C compiler .SH SYNOPSIS @@ -53,8 +52,8 @@ transparently use it to run the other tools. .B Preprocessing This stage handles tokenization of the input source file, macro expansion, #include expansion and handling of other preprocessor directives. The -output of this stage is typically called a ".i" (for C), ".ii" (for C++), -".mi" (for Objective\-C), or ".mii" (for Objective\-C++) file. +output of this stage is typically called a \(dq.i\(dq (for C), \(dq.ii\(dq (for C++), +\(dq.mi\(dq (for Objective\-C), or \(dq.mii\(dq (for Objective\-C++) file. .TP .B Parsing and Semantic Analysis This stage parses the input file, translating preprocessor tokens into a @@ -62,27 +61,27 @@ parse tree. Once in the form of a parse tree, it applies semantic analysis to compute types for expressions as well and determine whether the code is well formed. This stage is responsible for generating most of the compiler warnings as well as parse errors. The output of this stage is -an "Abstract Syntax Tree" (AST). +an \(dqAbstract Syntax Tree\(dq (AST). .TP .B Code Generation and Optimization This stage translates an AST into low\-level intermediate code (known as -"LLVM IR") and ultimately to machine code. This phase is responsible for +\(dqLLVM IR\(dq) and ultimately to machine code. This phase is responsible for optimizing the generated code and handling target\-specific code generation. -The output of this stage is typically called a ".s" file or "assembly" file. +The output of this stage is typically called a \(dq.s\(dq file or \(dqassembly\(dq file. .sp Clang also supports the use of an integrated assembler, in which the code generator produces object files directly. This avoids the overhead of -generating the ".s" file and of calling the target assembler. +generating the \(dq.s\(dq file and of calling the target assembler. .TP .B Assembler This stage runs the target assembler to translate the output of the compiler into a target object file. The output of this stage is typically -called a ".o" file or "object" file. +called a \(dq.o\(dq file or \(dqobject\(dq file. .TP .B Linker This stage runs the target linker to merge multiple object files into an executable or dynamic library. The output of this stage is typically called -an "a.out", ".dylib" or ".so" file. +an \(dqa.out\(dq, \(dq.dylib\(dq or \(dq.so\(dq file. .UNINDENT .sp \fBClang Static Analyzer\fP @@ -101,7 +100,7 @@ Run the preprocessor stage. .INDENT 0.0 .TP .B \-fsyntax\-only -Run the preprocessor, parser and type checking stages. +Run the preprocessor, parser and semantic analysis stages. .UNINDENT .INDENT 0.0 .TP @@ -112,7 +111,7 @@ and target\-specific code generation, producing an assembly file. .INDENT 0.0 .TP .B \-c -Run all of the above, plus the assembler, generating a target ".o" object file. +Run all of the above, plus the assembler, generating a target \(dq.o\(dq object file. .UNINDENT .INDENT 0.0 .TP @@ -305,27 +304,45 @@ ISO C++ 2017 with amendments and GNU extensions .UNINDENT .UNINDENT .nf -\fBc++2a\fP +\fBc++20\fP .fi .sp .INDENT 0.0 .INDENT 3.5 -Working draft for ISO C++ 2020 +ISO C++ 2020 with amendments .UNINDENT .UNINDENT .nf -\fBgnu++2a\fP +\fBgnu++20\fP .fi .sp .INDENT 0.0 .INDENT 3.5 -Working draft for ISO C++ 2020 with GNU extensions +ISO C++ 2020 with amendments and GNU extensions +.UNINDENT +.UNINDENT +.nf +\fBc++2b\fP +.fi +.sp +.INDENT 0.0 +.INDENT 3.5 +Working draft for ISO C++ 2023 +.UNINDENT +.UNINDENT +.nf +\fBgnu++2b\fP +.fi +.sp +.INDENT 0.0 +.INDENT 3.5 +Working draft for ISO C++ 2023 with GNU extensions .UNINDENT .UNINDENT .UNINDENT .UNINDENT .sp -The default C++ language standard is \fBgnu++14\fP\&. +The default C++ language standard is \fBgnu++17\fP\&. .sp Supported values for the OpenCL language are: .INDENT 7.0 @@ -424,8 +441,26 @@ implementations, as these are needed for efficient codegen for many programs. .INDENT 0.0 .TP .B \-fno\-builtin -Disable special handling and optimizations of builtin functions like -\fBstrlen()\fP and \fBmalloc()\fP\&. +Disable special handling and optimizations of well\-known library functions, +like \fBstrlen()\fP and \fBmalloc()\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B \-fno\-builtin\- +Disable special handling and optimizations for the specific library function. +For example, \fB\-fno\-builtin\-strlen\fP removes any special handling for the +\fBstrlen()\fP library function. +.UNINDENT +.INDENT 0.0 +.TP +.B \-fno\-builtin\-std\- +Disable special handling and optimizations for the specific C++ standard +library function in namespace \fBstd\fP\&. For example, +\fB\-fno\-builtin\-std\-move_if_noexcept\fP removes any special handling for the +\fBstd::move_if_noexcept()\fP library function. +.sp +For C standard library functions that the C++ standard library also provides +in namespace \fBstd\fP, use \fI\%\-fno\-builtin\-\fP instead. .UNINDENT .INDENT 0.0 .TP @@ -435,7 +470,7 @@ Indicate that math functions should be treated as updating \fBerrno\fP\&. .INDENT 0.0 .TP .B \-fpascal\-strings -Enable support for Pascal\-style strings with "\epfoo". +Enable support for Pascal\-style strings with \(dq\epfoo\(dq. .UNINDENT .INDENT 0.0 .TP @@ -479,13 +514,13 @@ overall bit\-width .INDENT 0.0 .TP .B \-fblocks -Enable the "Blocks" language feature. +Enable the \(dqBlocks\(dq language feature. .UNINDENT .INDENT 0.0 .TP .B \-fobjc\-abi\-version=version Select the Objective\-C ABI version to use. Available versions are 1 (legacy -"fragile" ABI), 2 (non\-fragile ABI 1), and 3 (non\-fragile ABI 2). +\(dqfragile\(dq ABI), 2 (non\-fragile ABI 1), and 3 (non\-fragile ABI 2). .UNINDENT .INDENT 0.0 .TP @@ -509,7 +544,12 @@ number of cross compilers, or may only support a native target. .INDENT 0.0 .TP .B \-arch -Specify the architecture to build for. +Specify the architecture to build for (Mac OS X specific). +.UNINDENT +.INDENT 0.0 +.TP +.B \-target +Specify the architecture to build for (all platforms). .UNINDENT .INDENT 0.0 .TP @@ -550,7 +590,7 @@ but which may not exist on earlier ones. Specify which optimization level to use: .INDENT 7.0 .INDENT 3.5 -\fI\%\-O0\fP Means "no optimization": this level compiles the fastest and +\fI\%\-O0\fP Means \(dqno optimization\(dq: this level compiles the fastest and generates the most debuggable code. .sp \fI\%\-O1\fP Somewhere between \fI\%\-O0\fP and \fI\%\-O2\fP\&. @@ -594,9 +634,9 @@ best at \fI\%\-O0\fP\&. When more than one option starting with \fI\-g\fP is specified, the last one wins: .INDENT 7.0 .INDENT 3.5 -\fB\-g\fP Generate debug information. +\fI\%\-g\fP Generate debug information. .sp -\fB\-gline\-tables\-only\fP Generate only line table debug information. This +\fI\%\-gline\-tables\-only\fP Generate only line table debug information. This allows for symbolicated backtraces with inlining information, but does not include any information about variables, their locations or types. .sp @@ -627,7 +667,7 @@ needed by a module and could be replaced with a forward declaration. Further, Clang will only emit type info for a dynamic C++ class in the module that contains the vtable for the class. .sp -The \fB\-fstandalone\-debug\fP option turns off these optimizations. +The \fI\%\-fstandalone\-debug\fP option turns off these optimizations. This is useful when working with 3rd\-party libraries that don\(aqt come with debug information. This is the default on Darwin. Note that Clang will never emit type information for types that are not referenced at all by the @@ -668,8 +708,8 @@ It can be disabled with \fI\%\-fno\-common\fP\&. .TP .B \-ftls\-model= Set the default thread\-local storage (TLS) model to use for thread\-local -variables. Valid values are: "global\-dynamic", "local\-dynamic", -"initial\-exec" and "local\-exec". The default is "global\-dynamic". The default +variables. Valid values are: \(dqglobal\-dynamic\(dq, \(dqlocal\-dynamic\(dq, +\(dqinitial\-exec\(dq and \(dqlocal\-exec\(dq. The default is \(dqglobal\-dynamic\(dq. The default model can be overridden with the tls_model attribute. The compiler will try to choose a more efficient model if possible. .UNINDENT @@ -681,16 +721,16 @@ When used with \fI\%\-S\fP this generates LLVM intermediate language assembly files, otherwise this generates LLVM bitcode format object files (which may be passed to the linker depending on the stage selection options). .sp -The default for \fI\%\-flto\fP is "full", in which the +The default for \fI\%\-flto\fP is \(dqfull\(dq, in which the LLVM bitcode is suitable for monolithic Link Time Optimization (LTO), where the linker merges all such modules into a single combined module for -optimization. With "thin", ThinLTO +optimization. With \(dqthin\(dq, \fI\%ThinLTO\fP compilation is invoked instead. .sp \fBNOTE:\fP .INDENT 7.0 .INDENT 3.5 -On Darwin, when using \fI\%\-flto\fP along with \fB\-g\fP and +On Darwin, when using \fI\%\-flto\fP along with \fI\%\-g\fP and compiling and linking in separate steps, you also need to pass \fB\-Wl,\-object_path_lto,.o\fP at the linking step to instruct the ld64 linker not to delete the temporary object file generated during Link @@ -765,7 +805,7 @@ Print the full library path of file. .TP .B \-print\-libgcc\-file\-name Print the library path for the currently used compiler runtime library -("libgcc.a" or "libclang_rt.builtins.*.a"). +(\(dqlibgcc.a\(dq or \(dqlibclang_rt.builtins.*.a\(dq). .UNINDENT .INDENT 0.0 .TP @@ -786,8 +826,8 @@ Save intermediate compilation results. .TP .B \-save\-stats, \-save\-stats=cwd, \-save\-stats=obj Save internal code generation (LLVM) statistics to a file in the current -directory (\fI\%\-save\-stats\fP/"\-save\-stats=cwd") or the directory -of the output file ("\-save\-state=obj"). +directory (\fI\%\-save\-stats\fP/\(dq\-save\-stats=cwd\(dq) or the directory +of the output file (\(dq\-save\-state=obj\(dq). .UNINDENT .INDENT 0.0 .TP @@ -895,15 +935,15 @@ Darwin targets. .UNINDENT .SH BUGS .sp -To report bugs, please visit <\fI\%https://bugs.llvm.org/\fP>. Most bug reports should +To report bugs, please visit <\fI\%https://github.com/llvm/llvm\-project/issues/\fP>. Most bug reports should include preprocessed source files (use the \fI\%\-E\fP option) and the full output of the compiler, along with information to reproduce. .SH SEE ALSO .sp -\fBld(1)\fP +\fBas(1)\fP, \fBld(1)\fP .SH AUTHOR Maintained by the Clang / LLVM Team () .SH COPYRIGHT -2007-2021, The Clang Team +2007-2023, The Clang Team .\" Generated by docutils manpage writer. . diff --git a/usr.bin/clang/llc/llc.1 b/usr.bin/clang/llc/llc.1 index 0fb50f43ed9d..1dfef564fcd6 100644 --- a/usr.bin/clang/llc/llc.1 +++ b/usr.bin/clang/llc/llc.1 @@ -1,4 +1,3 @@ -.\" $FreeBSD$ .\" Man page generated from reStructuredText. . . @@ -28,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LLC" "1" "2021-06-07" "12" "LLVM" +.TH "LLC" "1" "2023-05-24" "16" "LLVM" .SH NAME llc \- LLVM static compiler .SH SYNOPSIS @@ -45,15 +44,15 @@ determined from the input file, unless the \fI\%\-march\fP option is used to override the default. .SH OPTIONS .sp -If \fBfilename\fP is "\fB\-\fP" or omitted, \fBllc\fP reads from standard input. -Otherwise, it will from \fBfilename\fP\&. Inputs can be in either the LLVM assembly -language format (\fB\&.ll\fP) or the LLVM bitcode format (\fB\&.bc\fP). +If \fBfilename\fP is \(dq\fB\-\fP\(dq or omitted, \fBllc\fP reads from standard input. +Otherwise, it will read from \fBfilename\fP\&. Inputs can be in either the LLVM +assembly language format (\fB\&.ll\fP) or the LLVM bitcode format (\fB\&.bc\fP). .sp If the \fI\%\-o\fP option is omitted, then \fBllc\fP will send its output to standard output if the input is from standard input. If the \fI\%\-o\fP -option specifies "\fB\-\fP", then the output will also be sent to standard output. +option specifies \(dq\fB\-\fP\(dq, then the output will also be sent to standard output. .sp -If no \fI\%\-o\fP option is specified and an input file other than "\fB\-\fP" is +If no \fI\%\-o\fP option is specified and an input file other than \(dq\fB\-\fP\(dq is specified, then \fBllc\fP creates the output filename by taking the input filename, removing any existing \fB\&.bc\fP extension, and adding a \fB\&.s\fP suffix. .sp @@ -291,6 +290,6 @@ occurs, it will exit with a non\-zero value. .SH AUTHOR Maintained by the LLVM Team (https://llvm.org/). .SH COPYRIGHT -2003-2021, LLVM Project +2003-2023, LLVM Project .\" Generated by docutils manpage writer. . diff --git a/usr.bin/clang/lli/lli.1 b/usr.bin/clang/lli/lli.1 index 6684ab4411b8..b82e6a903a1d 100644 --- a/usr.bin/clang/lli/lli.1 +++ b/usr.bin/clang/lli/lli.1 @@ -1,4 +1,3 @@ -.\" $FreeBSD$ .\" Man page generated from reStructuredText. . . @@ -28,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LLI" "1" "2021-06-07" "12" "LLVM" +.TH "LLI" "1" "2023-05-24" "16" "LLVM" .SH NAME lli \- directly execute programs from LLVM bitcode .SH SYNOPSIS @@ -228,7 +227,8 @@ Register allocator to use (default=linearscan) .nf .ft C =bigblock: Big\-block register allocator -=linearscan: linear scan register allocator =local \- local register allocator +=linearscan: linear scan register allocator +=local: local register allocator =simple: simple register allocator .ft P .fi @@ -245,7 +245,8 @@ Choose relocation model from: .nf .ft C =default: Target default relocation model -=static: Non\-relocatable code =pic \- Fully relocatable, position independent code +=static: Non\-relocatable code +=pic: Fully relocatable, position independent code =dynamic\-no\-pic: Relocatable external references, non\-relocatable code .ft P .fi @@ -294,6 +295,6 @@ Otherwise, it will return the exit code of the program it executes. .SH AUTHOR Maintained by the LLVM Team (https://llvm.org/). .SH COPYRIGHT -2003-2021, LLVM Project +2003-2023, LLVM Project .\" Generated by docutils manpage writer. . diff --git a/usr.bin/clang/llvm-ar/llvm-ar.1 b/usr.bin/clang/llvm-ar/llvm-ar.1 index d386e6bcc6fa..9f2be0c401cc 100644 --- a/usr.bin/clang/llvm-ar/llvm-ar.1 +++ b/usr.bin/clang/llvm-ar/llvm-ar.1 @@ -1,4 +1,3 @@ -.\" $FreeBSD$ .\" Man page generated from reStructuredText. . . @@ -28,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LLVM-AR" "1" "2021-06-07" "12" "LLVM" +.TH "LLVM-AR" "1" "2023-05-24" "16" "LLVM" .SH NAME llvm-ar \- LLVM archiver .SH SYNOPSIS @@ -43,9 +42,9 @@ the archive can contain any kind of file. By default, \fBllvm\-ar\fP generates a symbol table that makes linking faster because only the symbol table needs to be consulted, not each individual file member of the archive. .sp -The \fBllvm\-ar\fP command can be used to \fIread\fP archive files in SVR4, -GNU, BSD and Darwin format, and \fIwrite\fP in the GNU, BSD, and Darwin style -archive files. If an SVR4 format archive is used with the \fI\%r\fP +The \fBllvm\-ar\fP command can be used to \fIread\fP archive files in SVR4, GNU, +BSD , Big Archive, and Darwin format, and \fIwrite\fP in the GNU, BSD, Big Archive, and +Darwin style archive files. If an SVR4 format archive is used with the \fI\%r\fP (replace), \fI\%d\fP (delete), \fI\%m\fP (move) or \fI\%q\fP (quick update) operations, the archive will be reconstructed in the format defined by \fI\%\-\-format\fP\&. @@ -104,7 +103,7 @@ found in other \fBar\fP implementations. The options for \fBllvm\-ar\fP specify a single basic Operation to perform on the archive, a variety of Modifiers for that Operation, the name of the archive file, and an optional list of file names. If the \fIfiles\fP option is not specified, it -generally means either "none" or "all" members, depending on the operation. The +generally means either \(dqnone\(dq or \(dqall\(dq members, depending on the operation. The Options, Operations and Modifiers are explained in the sections below. .sp The minimal set of options is at least one operator and the name of the @@ -235,7 +234,7 @@ is a feature for \fBllvm\-ar\fP that is not found in gnu\-ar. .B N When extracting or deleting a member that shares its name with another member, the \fIcount\fP parameter allows you to supply a positive whole number that -selects the instance of the given name, with "1" indicating the first +selects the instance of the given name, with \(dq1\(dq indicating the first instance. If \fI\%N\fP is not specified the first member of that name will be selected. If \fIcount\fP is not supplied, the operation fails.*count* cannot be .UNINDENT @@ -254,10 +253,8 @@ Display member offsets inside the archive. .INDENT 0.0 .TP .B T -When creating or modifying an archive, this option specifies that the -\fBarchive\fP will be thin. By default, archives are not created as thin -archives and when modifying a thin archive, it will be converted to a regular -archive. +Alias for \fB\-\-thin\fP\&. In many ar implementations \fBT\fP has a different +meaning, as specified by X/Open System interface. .UNINDENT .INDENT 0.0 .TP @@ -338,11 +335,63 @@ stream. No other options are compatible with this option. .UNINDENT .INDENT 0.0 .TP +.B \-\-output= +Specify a directory where archive members should be extracted to. By default the +current working directory is used. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-rsp\-quoting= +.TP +.B This option selects the quoting style \(ga\(ga\(ga\(ga for response files, either +.TP +.B \(ga\(gaposix\(ga\(ga or \(ga\(gawindows\(ga\(ga. The default when on Windows is \(ga\(gawindows\(ga\(ga, otherwise the +.TP +.B default is \(ga\(gaposix\(ga\(ga. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-thin +When creating or modifying an archive, this option specifies that the +\fBarchive\fP will be thin. By default, archives are not created as thin archives +and when modifying a thin archive, it will be converted to a regular archive. +.UNINDENT +.INDENT 0.0 +.TP .B \-\-version Display the version of the \fBllvm\-ar\fP executable. .UNINDENT .INDENT 0.0 .TP +.B \-X mode +Specifies the type of object file \fBllvm\-ar\fP will recognise. The mode must be +one of the following: +.INDENT 7.0 +.INDENT 3.5 +.INDENT 0.0 +.TP +.B 32 +Process only 32\-bit object files. +.TP +.B 64 +Process only 64\-bit object files. +.TP +.B 32_64 +Process both 32\-bit and 64\-bit object files. +.TP +.B any +Process all object files. +.UNINDENT +.UNINDENT +.UNINDENT +.sp +The default is to process 32\-bit object files (ignore 64\-bit objects). The mode can also +be set with the OBJECT_MODE environment variable. For example, OBJECT_MODE=64 causes ar to +process any 64\-bit objects and ignore 32\-bit objects. The \-X flag overrides the OBJECT_MODE +variable. +.UNINDENT +.INDENT 0.0 +.TP .B @ Read command\-line options and commands from response file \fB\fP\&. .UNINDENT @@ -415,6 +464,6 @@ will exit with a non\-zero value. .SH AUTHOR Maintained by the LLVM Team (https://llvm.org/). .SH COPYRIGHT -2003-2021, LLVM Project +2003-2023, LLVM Project .\" Generated by docutils manpage writer. . diff --git a/usr.bin/clang/llvm-ar/llvm-ranlib.1 b/usr.bin/clang/llvm-ar/llvm-ranlib.1 index 3fd6e6618dd1..36c715546faa 100644 *** 4099 LINES SKIPPED *** From nobody Sun Jul 23 18:27:10 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 4R8BbL4rw7z4p6By; Sun, 23 Jul 2023 18:27:10 +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 4R8BbL37Pdz3RFj; Sun, 23 Jul 2023 18:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136830; 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=HuNX5cho4ll5D+JF6LUA8TICkaCMLHxXGJVyyxru8cc=; b=Oz9rmBSRTqAw1nnabdoSxShyiVDMgHgcMkp/5PkcFuHQQnR8CjMpLnd7E1WdMhtF0BQ8n0 rpkGNSUR8hbTdZ7jU2VczZE1jOt9+a+QyhDID3x0QxiBXOXAk4/zrznUQE1QOOZOvqlk2i xw5D+kwJH/CDe7V1utELX6W68P9A9koExchB70pK3nBnIvoHM8l9k13uJA3v1vxK5syBWe pHh9MYOlaZALNs3TqTqUMCL/rrRxW9KrqlugrH0lswtJ489m8MU8RAMzM9FXnZdpeFa/tv KmI6AEmMmDYzweUWORtg+/9nFIrH7HoEW1IMlnFy8rbFKcIIcyOSxMRmAKJkAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136830; 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=HuNX5cho4ll5D+JF6LUA8TICkaCMLHxXGJVyyxru8cc=; b=yqjriPsFGcOrgtrvQzmltHGCpQgLvgZlqijNVZx+JI6dGAuJ/SGCzvdWemgE4PTBQJWJyL +dKtqCPWDsXOQASbSmfCpjCFtsyLdT+J1wYumMq84FEk7kXDeyN7Ye/9eBkh/F008t2dyD 41+ET5TFRXLYNfMGUXJkOr6eLmMaO1L11PdUObDXqAdRtR6Zsd5smaqIJqRKiRktx/6dh+ ccTAsUJiV5PrG2VQydNd0TpfzIJBedb8q1Suy8vz9xcBjVNAbx41vReLX0TT+knKgiyE82 4Vg02ZJ03OfyB230wubQeGORk89SIz71JJqpWnc252wdLvj13IkF7XSKlByCFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136830; a=rsa-sha256; cv=none; b=pl5W1utMNs9R8SCOOCIrX79AjEwpdJDodbyMrzIrXBPSj2L/czgKyj2lXcAvQVF9foof9V ODGKHFc+YeU8FbTw1aQCRkerlKcANxW7xTrII9tDhJ8y6JmXy4zgkATEeUkmfgqIZ/22n+ YIbnLo2Womj0BRaFjRlRA1+a2hXTuSO7bPgbkJJ11loJ1jEubr7VYrB87zXSH650lHYzHn uYt7X4rEX2d8E9ZPQYuLO3DwuU3En//DZadXrfcZJSh/nxvf7NzPUTAf1nQ254tRO9f2B9 VZYVjDHAWGMgrj780m8SbnqJyOcZrgpT7L0PeJb2yJh6UkAAqzp8RNZ7Qt6cxg== 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 4R8BbL2C30zmKq; Sun, 23 Jul 2023 18:27:10 +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 36NIRASg058789; Sun, 23 Jul 2023 18:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRAcW058788; Sun, 23 Jul 2023 18:27:10 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:10 GMT Message-Id: <202307231827.36NIRAcW058788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b41a5b1e742a - stable/13 - Merge llvm-project release/16.x llvmorg-16.0.5-0-g185b81e034ba List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b41a5b1e742a7f3d743eed8d2ccfe51ed2313332 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b41a5b1e742a7f3d743eed8d2ccfe51ed2313332 commit b41a5b1e742a7f3d743eed8d2ccfe51ed2313332 Author: Dimitry Andric AuthorDate: 2023-06-04 19:01:35 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:10 +0000 Merge llvm-project release/16.x llvmorg-16.0.5-0-g185b81e034ba This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.5-0-g185b81e034ba (aka 16.0.5 release). PR: 271047 MFC after: 1 month (cherry picked from commit 2efbaac7a07fff163640a67873b3ac250794ec3f) --- .../clang/include/clang/AST/ExprConcepts.h | 8 + .../include/clang/Basic/DiagnosticSemaKinds.td | 3 +- .../clang/include/clang/Sema/Initialization.h | 18 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 3 +- .../llvm-project/clang/lib/AST/ExprConcepts.cpp | 19 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 1 + .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 6 +- contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 335 ++++++++++++--------- contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/docs/WebAssembly.rst | 33 ++ .../llvm/include/llvm/Analysis/AliasAnalysis.h | 9 + .../llvm/include/llvm/Analysis/TargetLibraryInfo.h | 12 +- .../lib/Target/Hexagon/HexagonISelLowering.cpp | 7 +- .../llvm/lib/Target/Hexagon/HexagonPatterns.td | 24 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 27 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 21 ++ .../llvm-project/llvm/tools/llvm-mca/llvm-mca.cpp | 19 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 26 files changed, 397 insertions(+), 185 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/AST/ExprConcepts.h b/contrib/llvm-project/clang/include/clang/AST/ExprConcepts.h index f02c140c14c1..746a5b2fbfc6 100644 --- a/contrib/llvm-project/clang/include/clang/AST/ExprConcepts.h +++ b/contrib/llvm-project/clang/include/clang/AST/ExprConcepts.h @@ -64,6 +64,7 @@ protected: const ConstraintSatisfaction *Satisfaction); ConceptSpecializationExpr(const ASTContext &C, ConceptDecl *NamedConcept, + const ASTTemplateArgumentListInfo *ArgsAsWritten, ImplicitConceptSpecializationDecl *SpecDecl, const ConstraintSatisfaction *Satisfaction, bool Dependent, @@ -85,6 +86,13 @@ public: const ConstraintSatisfaction *Satisfaction, bool Dependent, bool ContainsUnexpandedParameterPack); + static ConceptSpecializationExpr * + Create(const ASTContext &C, ConceptDecl *NamedConcept, + const ASTTemplateArgumentListInfo *ArgsAsWritten, + ImplicitConceptSpecializationDecl *SpecDecl, + const ConstraintSatisfaction *Satisfaction, bool Dependent, + bool ContainsUnexpandedParameterPack); + ArrayRef getTemplateArguments() const { return SpecDecl->getTemplateArguments(); } diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td index 31a27558bca4..e4651678603d 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -2124,7 +2124,8 @@ def err_init_conversion_failed : Error< "exception object|a member subobject|an array element|a new value|a value|a " "base class|a constructor delegation|a vector element|a block element|a " "block element|a complex element|a lambda capture|a compound literal " - "initializer|a related result|a parameter of CF audited function}0 " + "initializer|a related result|a parameter of CF audited function|a " + "structured binding|a member subobject}0 " "%diff{of type $ with an %select{rvalue|lvalue}2 of type $|" "with an %select{rvalue|lvalue}2 of incompatible type}1,3" "%select{|: different classes%diff{ ($ vs $)|}5,6" diff --git a/contrib/llvm-project/clang/include/clang/Sema/Initialization.h b/contrib/llvm-project/clang/include/clang/Sema/Initialization.h index e5a98ba97f4f..e1bbea0d118d 100644 --- a/contrib/llvm-project/clang/include/clang/Sema/Initialization.h +++ b/contrib/llvm-project/clang/include/clang/Sema/Initialization.h @@ -123,6 +123,10 @@ public: /// decomposition declaration. EK_Binding, + /// The entity being initialized is a non-static data member subobject of an + /// object initialized via parenthesized aggregate initialization. + EK_ParenAggInitMember, + // Note: err_init_conversion_failed in DiagnosticSemaKinds.td uses this // enum as an index for its first %select. When modifying this list, // that diagnostic text needs to be updated as well. @@ -227,8 +231,10 @@ private: /// Create the initialization entity for a member subobject. InitializedEntity(FieldDecl *Member, const InitializedEntity *Parent, - bool Implicit, bool DefaultMemberInit) - : Kind(EK_Member), Parent(Parent), Type(Member->getType()), + bool Implicit, bool DefaultMemberInit, + bool IsParenAggInit = false) + : Kind(IsParenAggInit ? EK_ParenAggInitMember : EK_Member), + Parent(Parent), Type(Member->getType()), Variable{Member, Implicit, DefaultMemberInit} {} /// Create the initialization entity for an array element. @@ -388,6 +394,14 @@ public: return InitializedEntity(Member->getAnonField(), Parent, Implicit, false); } + /// Create the initialization entity for a member subobject initialized via + /// parenthesized aggregate init. + static InitializedEntity InitializeMemberFromParenAggInit(FieldDecl *Member) { + return InitializedEntity(Member, /*Parent=*/nullptr, /*Implicit=*/false, + /*DefaultMemberInit=*/false, + /*IsParenAggInit=*/true); + } + /// Create the initialization entity for a default member initializer. static InitializedEntity InitializeMemberFromDefaultMemberInitializer(FieldDecl *Member) { diff --git a/contrib/llvm-project/clang/lib/AST/ASTContext.cpp b/contrib/llvm-project/clang/lib/AST/ASTContext.cpp index 2884fe660422..8054eb2e12d3 100644 --- a/contrib/llvm-project/clang/lib/AST/ASTContext.cpp +++ b/contrib/llvm-project/clang/lib/AST/ASTContext.cpp @@ -765,7 +765,8 @@ canonicalizeImmediatelyDeclaredConstraint(const ASTContext &C, Expr *IDC, CSE->getNamedConcept()->getLocation(), NewConverted); Expr *NewIDC = ConceptSpecializationExpr::Create( - C, CSE->getNamedConcept(), CSD, nullptr, CSE->isInstantiationDependent(), + C, CSE->getNamedConcept(), CSE->getTemplateArgsAsWritten(), CSD, + /*Satisfaction=*/nullptr, CSE->isInstantiationDependent(), CSE->containsUnexpandedParameterPack()); if (auto *OrigFold = dyn_cast(IDC)) diff --git a/contrib/llvm-project/clang/lib/AST/ExprConcepts.cpp b/contrib/llvm-project/clang/lib/AST/ExprConcepts.cpp index fc8f1eb2abf1..cdc13c2d3969 100644 --- a/contrib/llvm-project/clang/lib/AST/ExprConcepts.cpp +++ b/contrib/llvm-project/clang/lib/AST/ExprConcepts.cpp @@ -58,6 +58,15 @@ ConceptSpecializationExpr::ConceptSpecializationExpr( ConceptSpecializationExpr::ConceptSpecializationExpr(EmptyShell Empty) : Expr(ConceptSpecializationExprClass, Empty) {} +ConceptSpecializationExpr *ConceptSpecializationExpr::Create( + const ASTContext &C, ConceptDecl *NamedConcept, + ImplicitConceptSpecializationDecl *SpecDecl, + const ConstraintSatisfaction *Satisfaction, bool Dependent, + bool ContainsUnexpandedParameterPack) { + return Create(C, NamedConcept, /*ArgsAsWritten*/ nullptr, SpecDecl, Satisfaction, + Dependent, ContainsUnexpandedParameterPack); +} + ConceptSpecializationExpr *ConceptSpecializationExpr::Create( const ASTContext &C, NestedNameSpecifierLoc NNS, SourceLocation TemplateKWLoc, DeclarationNameInfo ConceptNameInfo, @@ -72,13 +81,14 @@ ConceptSpecializationExpr *ConceptSpecializationExpr::Create( ConceptSpecializationExpr::ConceptSpecializationExpr( const ASTContext &C, ConceptDecl *NamedConcept, + const ASTTemplateArgumentListInfo *ArgsAsWritten, ImplicitConceptSpecializationDecl *SpecDecl, const ConstraintSatisfaction *Satisfaction, bool Dependent, bool ContainsUnexpandedParameterPack) : Expr(ConceptSpecializationExprClass, C.BoolTy, VK_PRValue, OK_Ordinary), ConceptReference(NestedNameSpecifierLoc(), SourceLocation(), DeclarationNameInfo(), NamedConcept, NamedConcept, - nullptr), + ArgsAsWritten), SpecDecl(SpecDecl), Satisfaction(Satisfaction ? ASTConstraintSatisfaction::Create(C, *Satisfaction) @@ -95,12 +105,13 @@ ConceptSpecializationExpr::ConceptSpecializationExpr( ConceptSpecializationExpr *ConceptSpecializationExpr::Create( const ASTContext &C, ConceptDecl *NamedConcept, + const ASTTemplateArgumentListInfo *ArgsAsWritten, ImplicitConceptSpecializationDecl *SpecDecl, const ConstraintSatisfaction *Satisfaction, bool Dependent, bool ContainsUnexpandedParameterPack) { - return new (C) - ConceptSpecializationExpr(C, NamedConcept, SpecDecl, Satisfaction, - Dependent, ContainsUnexpandedParameterPack); + return new (C) ConceptSpecializationExpr(C, NamedConcept, ArgsAsWritten, + SpecDecl, Satisfaction, Dependent, + ContainsUnexpandedParameterPack); } const TypeConstraint * diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp index 238507e06335..77554aa2c462 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp @@ -7801,6 +7801,7 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType, } else { D.Diag(diag::err_drv_invalid_value) << A->getSpelling() << GuardArgs; } + A->claim(); } } diff --git a/contrib/llvm-project/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp b/contrib/llvm-project/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp index 44034e44adec..3cc68673cd13 100644 --- a/contrib/llvm-project/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp +++ b/contrib/llvm-project/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp @@ -113,7 +113,11 @@ IntegerLiteralSeparatorFixer::process(const Environment &Env, continue; } if (Style.isCpp()) { - if (const auto Pos = Text.find_first_of("_i"); Pos != StringRef::npos) { + // Hex alpha digits a-f/A-F must be at the end of the string literal. + StringRef Suffixes = "_himnsuyd"; + if (const auto Pos = + Text.find_first_of(IsBase16 ? Suffixes.drop_back() : Suffixes); + Pos != StringRef::npos) { Text = Text.substr(0, Pos); Length = Pos; } diff --git a/contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp b/contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp index cbda62497e6a..4a39c2d065e6 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp @@ -1651,7 +1651,8 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, << Entity.getBaseSpecifier()->getType() << getSpecialMember(Constructor); break; - case InitializedEntity::EK_Member: { + case InitializedEntity::EK_Member: + case InitializedEntity::EK_ParenAggInitMember: { const FieldDecl *Field = cast(Entity.getDecl()); PD = PDiag(diag::err_access_field_ctor); PD << Field->getType() << getSpecialMember(Constructor); diff --git a/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp index 051fad04219f..0fbef1cc8b52 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp @@ -8693,7 +8693,7 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) { } // Check that SVE types are only used in functions with SVE available. - if (T->isSVESizelessBuiltinType() && CurContext->isFunctionOrMethod()) { + if (T->isSVESizelessBuiltinType() && isa(CurContext)) { const FunctionDecl *FD = cast(CurContext); llvm::StringMap CallerFeatureMap; Context.getFunctionFeatureMap(CallerFeatureMap, FD); diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 44adb167dcc0..cc8d1405ec55 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -1152,6 +1152,7 @@ static void warnBracedScalarInit(Sema &S, const InitializedEntity &Entity, case InitializedEntity::EK_Parameter_CF_Audited: case InitializedEntity::EK_TemplateParameter: case InitializedEntity::EK_Result: + case InitializedEntity::EK_ParenAggInitMember: // Extra braces here are suspicious. DiagID = diag::warn_braces_around_init; break; @@ -3348,6 +3349,7 @@ DeclarationName InitializedEntity::getName() const { case EK_Variable: case EK_Member: + case EK_ParenAggInitMember: case EK_Binding: case EK_TemplateParameter: return Variable.VariableOrMember->getDeclName(); @@ -3379,6 +3381,7 @@ ValueDecl *InitializedEntity::getDecl() const { switch (getKind()) { case EK_Variable: case EK_Member: + case EK_ParenAggInitMember: case EK_Binding: case EK_TemplateParameter: return Variable.VariableOrMember; @@ -3420,6 +3423,7 @@ bool InitializedEntity::allowsNRVO() const { case EK_Parameter_CF_Audited: case EK_TemplateParameter: case EK_Member: + case EK_ParenAggInitMember: case EK_Binding: case EK_New: case EK_Temporary: @@ -3454,7 +3458,10 @@ unsigned InitializedEntity::dumpImpl(raw_ostream &OS) const { case EK_Result: OS << "Result"; break; case EK_StmtExprResult: OS << "StmtExprResult"; break; case EK_Exception: OS << "Exception"; break; - case EK_Member: OS << "Member"; break; + case EK_Member: + case EK_ParenAggInitMember: + OS << "Member"; + break; case EK_Binding: OS << "Binding"; break; case EK_New: OS << "New"; break; case EK_Temporary: OS << "Temporary"; break; @@ -5274,179 +5281,224 @@ static void TryOrBuildParenListInitialization( Sema &S, const InitializedEntity &Entity, const InitializationKind &Kind, ArrayRef Args, InitializationSequence &Sequence, bool VerifyOnly, ExprResult *Result = nullptr) { - unsigned ArgIndexToProcess = 0; + unsigned EntityIndexToProcess = 0; SmallVector InitExprs; QualType ResultType; Expr *ArrayFiller = nullptr; FieldDecl *InitializedFieldInUnion = nullptr; - // Process entities (i.e. array members, base classes, or class fields) by - // adding an initialization expression to InitExprs for each entity to - // initialize. - auto ProcessEntities = [&](auto Range) -> bool { - bool IsUnionType = Entity.getType()->isUnionType(); - for (InitializedEntity SubEntity : Range) { - // Unions should only have one initializer expression. - // If there are more initializers than it will be caught when we check - // whether Index equals Args.size(). - if (ArgIndexToProcess == 1 && IsUnionType) - return true; - - bool IsMember = SubEntity.getKind() == InitializedEntity::EK_Member; - - // Unnamed bitfields should not be initialized at all, either with an arg - // or by default. - if (IsMember && cast(SubEntity.getDecl())->isUnnamedBitfield()) - continue; - - if (ArgIndexToProcess < Args.size()) { - // There are still expressions in Args that haven't been processed. - // Let's match them to the current entity to initialize. - Expr *E = Args[ArgIndexToProcess++]; - - // Incomplete array types indicate flexible array members. Do not allow - // paren list initializations of structs with these members, as GCC - // doesn't either. - if (IsMember) { - auto *FD = cast(SubEntity.getDecl()); - if (FD->getType()->isIncompleteArrayType()) { - if (!VerifyOnly) { - S.Diag(E->getBeginLoc(), diag::err_flexible_array_init) - << SourceRange(E->getBeginLoc(), E->getEndLoc()); - S.Diag(FD->getLocation(), diag::note_flexible_array_member) << FD; - } - Sequence.SetFailed( - InitializationSequence::FK_ParenthesizedListInitFailed); - return false; - } - } - - InitializationKind SubKind = InitializationKind::CreateForInit( - E->getExprLoc(), /*isDirectInit=*/false, E); - InitializationSequence SubSeq(S, SubEntity, SubKind, E); - - if (SubSeq.Failed()) { - if (!VerifyOnly) - SubSeq.Diagnose(S, SubEntity, SubKind, E); - else - Sequence.SetFailed( - InitializationSequence::FK_ParenthesizedListInitFailed); + auto HandleInitializedEntity = [&](const InitializedEntity &SubEntity, + const InitializationKind &SubKind, + Expr *Arg, Expr **InitExpr = nullptr) { + InitializationSequence IS = [&]() { + if (Arg) + return InitializationSequence(S, SubEntity, SubKind, Arg); + return InitializationSequence(S, SubEntity, SubKind, std::nullopt); + }(); - return false; - } - if (!VerifyOnly) { - ExprResult ER = SubSeq.Perform(S, SubEntity, SubKind, E); - InitExprs.push_back(ER.get()); - if (IsMember && IsUnionType) - InitializedFieldInUnion = cast(SubEntity.getDecl()); - } + if (IS.Failed()) { + if (!VerifyOnly) { + if (Arg) + IS.Diagnose(S, SubEntity, SubKind, Arg); + else + IS.Diagnose(S, SubEntity, SubKind, std::nullopt); } else { - // We've processed all of the args, but there are still entities that - // have to be initialized. - if (IsMember) { - // C++ [dcl.init]p17.6.2.2 - // The remaining elements are initialized with their default member - // initializers, if any - auto *FD = cast(SubEntity.getDecl()); - if (FD->hasInClassInitializer()) { - if (!VerifyOnly) { - ExprResult DIE = S.BuildCXXDefaultInitExpr(FD->getLocation(), FD); - if (DIE.isInvalid()) - return false; - S.checkInitializerLifetime(SubEntity, DIE.get()); - InitExprs.push_back(DIE.get()); - } - continue; - } - } - // Remaining class elements without default member initializers and - // array elements are value initialized: - // - // C++ [dcl.init]p17.6.2.2 - // The remaining elements...otherwise are value initialzed - // - // C++ [dcl.init]p17.5 - // if the destination type is an array, the object is initialized as - // . follows. Let x1, . . . , xk be the elements of the expression-list - // ...Let n denote the array size...the ith array element is...value- - // initialized for each k < i <= n. - InitializationKind SubKind = InitializationKind::CreateValue( - Kind.getLocation(), Kind.getLocation(), Kind.getLocation(), true); - InitializationSequence SubSeq(S, SubEntity, SubKind, std::nullopt); - if (SubSeq.Failed()) { - if (!VerifyOnly) - SubSeq.Diagnose(S, SubEntity, SubKind, std::nullopt); - return false; - } - if (!VerifyOnly) { - ExprResult ER = SubSeq.Perform(S, SubEntity, SubKind, std::nullopt); - if (SubEntity.getKind() == InitializedEntity::EK_ArrayElement) { - ArrayFiller = ER.get(); - return true; - } - InitExprs.push_back(ER.get()); - } + Sequence.SetFailed( + InitializationSequence::FK_ParenthesizedListInitFailed); } + + return false; + } + if (!VerifyOnly) { + ExprResult ER; + if (Arg) + ER = IS.Perform(S, SubEntity, SubKind, Arg); + else + ER = IS.Perform(S, SubEntity, SubKind, std::nullopt); + if (InitExpr) + *InitExpr = ER.get(); + else + InitExprs.push_back(ER.get()); } return true; }; if (const ArrayType *AT = S.getASTContext().getAsArrayType(Entity.getType())) { - SmallVector ElementEntities; uint64_t ArrayLength; - // C++ [dcl.init]p17.5 + // C++ [dcl.init]p16.5 // if the destination type is an array, the object is initialized as // follows. Let x1, . . . , xk be the elements of the expression-list. If - // the destination type is an array of unknown bound, it is define as + // the destination type is an array of unknown bound, it is defined as // having k elements. if (const ConstantArrayType *CAT = - S.getASTContext().getAsConstantArrayType(Entity.getType())) + S.getASTContext().getAsConstantArrayType(Entity.getType())) { ArrayLength = CAT->getSize().getZExtValue(); - else + ResultType = Entity.getType(); + } else if (const VariableArrayType *VAT = + S.getASTContext().getAsVariableArrayType(Entity.getType())) { + // Braced-initialization of variable array types is not allowed, even if + // the size is greater than or equal to the number of args, so we don't + // allow them to be initialized via parenthesized aggregate initialization + // either. + const Expr *SE = VAT->getSizeExpr(); + S.Diag(SE->getBeginLoc(), diag::err_variable_object_no_init) + << SE->getSourceRange(); + return; + } else { + assert(isa(Entity.getType())); ArrayLength = Args.size(); + } + EntityIndexToProcess = ArrayLength; - if (ArrayLength >= Args.size()) { - for (uint64_t I = 0; I < ArrayLength; ++I) - ElementEntities.push_back( - InitializedEntity::InitializeElement(S.getASTContext(), I, Entity)); - - if (!ProcessEntities(ElementEntities)) + // ...the ith array element is copy-initialized with xi for each + // 1 <= i <= k + for (Expr *E : Args) { + InitializedEntity SubEntity = InitializedEntity::InitializeElement( + S.getASTContext(), EntityIndexToProcess, Entity); + InitializationKind SubKind = InitializationKind::CreateForInit( + E->getExprLoc(), /*isDirectInit=*/false, E); + if (!HandleInitializedEntity(SubEntity, SubKind, E)) + return; + } + // ...and value-initialized for each k < i <= n; + if (ArrayLength > Args.size()) { + InitializedEntity SubEntity = InitializedEntity::InitializeElement( + S.getASTContext(), Args.size(), Entity); + InitializationKind SubKind = InitializationKind::CreateValue( + Kind.getLocation(), Kind.getLocation(), Kind.getLocation(), true); + if (!HandleInitializedEntity(SubEntity, SubKind, nullptr, &ArrayFiller)) return; + } + if (ResultType.isNull()) { ResultType = S.Context.getConstantArrayType( AT->getElementType(), llvm::APInt(/*numBits=*/32, ArrayLength), - nullptr, ArrayType::Normal, 0); + /*SizeExpr=*/nullptr, ArrayType::Normal, 0); } } else if (auto *RT = Entity.getType()->getAs()) { + bool IsUnion = RT->isUnionType(); const CXXRecordDecl *RD = cast(RT->getDecl()); - auto BaseRange = map_range(RD->bases(), [&](auto &base) { - return InitializedEntity::InitializeBase(S.getASTContext(), &base, false, - &Entity); - }); - auto FieldRange = map_range(RD->fields(), [](auto *field) { - return InitializedEntity::InitializeMember(field); - }); + if (!IsUnion) { + for (const CXXBaseSpecifier &Base : RD->bases()) { + InitializedEntity SubEntity = InitializedEntity::InitializeBase( + S.getASTContext(), &Base, false, &Entity); + if (EntityIndexToProcess < Args.size()) { + // C++ [dcl.init]p16.6.2.2. + // ...the object is initialized is follows. Let e1, ..., en be the + // elements of the aggregate([dcl.init.aggr]). Let x1, ..., xk be + // the elements of the expression-list...The element ei is + // copy-initialized with xi for 1 <= i <= k. + Expr *E = Args[EntityIndexToProcess]; + InitializationKind SubKind = InitializationKind::CreateForInit( + E->getExprLoc(), /*isDirectInit=*/false, E); + if (!HandleInitializedEntity(SubEntity, SubKind, E)) + return; + } else { + // We've processed all of the args, but there are still base classes + // that have to be initialized. + // C++ [dcl.init]p17.6.2.2 + // The remaining elements...otherwise are value initialzed + InitializationKind SubKind = InitializationKind::CreateValue( + Kind.getLocation(), Kind.getLocation(), Kind.getLocation(), + /*IsImplicit=*/true); + if (!HandleInitializedEntity(SubEntity, SubKind, nullptr)) + return; + } + EntityIndexToProcess++; + } + } - if (!ProcessEntities(BaseRange)) - return; + for (FieldDecl *FD : RD->fields()) { + // Unnamed bitfields should not be initialized at all, either with an arg + // or by default. + if (FD->isUnnamedBitfield()) + continue; - if (!ProcessEntities(FieldRange)) - return; + InitializedEntity SubEntity = + InitializedEntity::InitializeMemberFromParenAggInit(FD); + if (EntityIndexToProcess < Args.size()) { + // ...The element ei is copy-initialized with xi for 1 <= i <= k. + Expr *E = Args[EntityIndexToProcess]; + + // Incomplete array types indicate flexible array members. Do not allow + // paren list initializations of structs with these members, as GCC + // doesn't either. + if (FD->getType()->isIncompleteArrayType()) { + if (!VerifyOnly) { + S.Diag(E->getBeginLoc(), diag::err_flexible_array_init) + << SourceRange(E->getBeginLoc(), E->getEndLoc()); + S.Diag(FD->getLocation(), diag::note_flexible_array_member) << FD; + } + Sequence.SetFailed( + InitializationSequence::FK_ParenthesizedListInitFailed); + return; + } + + InitializationKind SubKind = InitializationKind::CreateForInit( + E->getExprLoc(), /*isDirectInit=*/false, E); + if (!HandleInitializedEntity(SubEntity, SubKind, E)) + return; + + // Unions should have only one initializer expression, so we bail out + // after processing the first field. If there are more initializers then + // it will be caught when we later check whether EntityIndexToProcess is + // less than Args.size(); + if (IsUnion) { + InitializedFieldInUnion = FD; + EntityIndexToProcess = 1; + break; + } + } else { + // We've processed all of the args, but there are still members that + // have to be initialized. + if (FD->hasInClassInitializer()) { + if (!VerifyOnly) { + // C++ [dcl.init]p16.6.2.2 + // The remaining elements are initialized with their default + // member initializers, if any + ExprResult DIE = S.BuildCXXDefaultInitExpr(FD->getLocation(), FD); + if (DIE.isInvalid()) + return; + S.checkInitializerLifetime(SubEntity, DIE.get()); + InitExprs.push_back(DIE.get()); + } + } else { + // C++ [dcl.init]p17.6.2.2 + // The remaining elements...otherwise are value initialzed + if (FD->getType()->isReferenceType()) { + Sequence.SetFailed( + InitializationSequence::FK_ParenthesizedListInitFailed); + if (!VerifyOnly) { + SourceRange SR = Kind.getParenOrBraceRange(); + S.Diag(SR.getEnd(), diag::err_init_reference_member_uninitialized) + << FD->getType() << SR; + S.Diag(FD->getLocation(), diag::note_uninit_reference_member); + } + return; + } + InitializationKind SubKind = InitializationKind::CreateValue( + Kind.getLocation(), Kind.getLocation(), Kind.getLocation(), true); + if (!HandleInitializedEntity(SubEntity, SubKind, nullptr)) + return; + } + } + EntityIndexToProcess++; + } ResultType = Entity.getType(); } // Not all of the args have been processed, so there must've been more args - // then were required to initialize the element. - if (ArgIndexToProcess < Args.size()) { + // than were required to initialize the element. + if (EntityIndexToProcess < Args.size()) { Sequence.SetFailed(InitializationSequence::FK_ParenthesizedListInitFailed); if (!VerifyOnly) { QualType T = Entity.getType(); int InitKind = T->isArrayType() ? 0 : T->isUnionType() ? 3 : 4; - SourceRange ExcessInitSR(Args[ArgIndexToProcess]->getBeginLoc(), + SourceRange ExcessInitSR(Args[EntityIndexToProcess]->getBeginLoc(), Args.back()->getEndLoc()); S.Diag(Kind.getLocation(), diag::err_excess_initializers) << InitKind << ExcessInitSR; @@ -6412,6 +6464,7 @@ getAssignmentAction(const InitializedEntity &Entity, bool Diagnose = false) { return Sema::AA_Converting; case InitializedEntity::EK_Member: + case InitializedEntity::EK_ParenAggInitMember: case InitializedEntity::EK_Binding: case InitializedEntity::EK_ArrayElement: case InitializedEntity::EK_VectorElement: @@ -6432,6 +6485,7 @@ static bool shouldBindAsTemporary(const InitializedEntity &Entity) { switch (Entity.getKind()) { case InitializedEntity::EK_ArrayElement: case InitializedEntity::EK_Member: + case InitializedEntity::EK_ParenAggInitMember: case InitializedEntity::EK_Result: case InitializedEntity::EK_StmtExprResult: case InitializedEntity::EK_New: @@ -6476,6 +6530,7 @@ static bool shouldDestroyEntity(const InitializedEntity &Entity) { return false; case InitializedEntity::EK_Member: + case InitializedEntity::EK_ParenAggInitMember: case InitializedEntity::EK_Binding: case InitializedEntity::EK_Variable: case InitializedEntity::EK_Parameter: @@ -6512,6 +6567,7 @@ static SourceLocation getInitializationLoc(const InitializedEntity &Entity, case InitializedEntity::EK_ArrayElement: case InitializedEntity::EK_Member: + case InitializedEntity::EK_ParenAggInitMember: case InitializedEntity::EK_Parameter: case InitializedEntity::EK_Parameter_CF_Audited: case InitializedEntity::EK_TemplateParameter: @@ -7080,7 +7136,15 @@ static LifetimeResult getEntityLifetime( case InitializedEntity::EK_Exception: // FIXME: Can we diagnose lifetime problems with exceptions? return {nullptr, LK_FullExpression}; + + case InitializedEntity::EK_ParenAggInitMember: + // -- A temporary object bound to a reference element of an aggregate of + // class type initialized from a parenthesized expression-list + // [dcl.init, 9.3] persists until the completion of the full-expression + // containing the expression-list. + return {nullptr, LK_FullExpression}; } + llvm_unreachable("unknown entity kind"); } @@ -9196,7 +9260,9 @@ ExprResult InitializationSequence::Perform(Sema &S, S.checkInitializerLifetime(Entity, Init); // Diagnose non-fatal problems with the completed initialization. - if (Entity.getKind() == InitializedEntity::EK_Member && + if (InitializedEntity::EntityKind EK = Entity.getKind(); + (EK == InitializedEntity::EK_Member || + EK == InitializedEntity::EK_ParenAggInitMember) && cast(Entity.getDecl())->isBitField()) S.CheckBitFieldInitialization(Kind.getLocation(), cast(Entity.getDecl()), @@ -9650,7 +9716,8 @@ bool InitializationSequence::Diagnose(Sema &S, case OR_No_Viable_Function: if (Kind.getKind() == InitializationKind::IK_Default && (Entity.getKind() == InitializedEntity::EK_Base || - Entity.getKind() == InitializedEntity::EK_Member) && + Entity.getKind() == InitializedEntity::EK_Member || + Entity.getKind() == InitializedEntity::EK_ParenAggInitMember) && isa(S.CurContext)) { // This is implicit default initialization of a member or // base within a constructor. If no viable function was diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 9009b9014abb..d7ba71906e26 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -38,7 +38,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 160004 +# define _LIBCPP_VERSION 160005 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/contrib/llvm-project/lld/docs/WebAssembly.rst b/contrib/llvm-project/lld/docs/WebAssembly.rst index c40d4b322080..dad3177e2c7d 100644 --- a/contrib/llvm-project/lld/docs/WebAssembly.rst +++ b/contrib/llvm-project/lld/docs/WebAssembly.rst @@ -75,6 +75,11 @@ WebAssembly-specific options: flag which corresponds to ``--unresolve-symbols=ignore`` + ``--import-undefined``. +.. option:: --allow-undefined-file= + + Like ``--allow-undefined``, but the filename specified a flat list of + symbols, one per line, which are allowed to be undefined. + .. option:: --unresolved-symbols= This is a more full featured version of ``--allow-undefined``. @@ -182,11 +187,39 @@ Imports By default no undefined symbols are allowed in the final binary. The flag ``--allow-undefined`` results in a WebAssembly import being defined for each undefined symbol. It is then up to the runtime to provide such symbols. +``--allow-undefined-file`` is the same but allows a list of symbols to be +specified. Alternatively symbols can be marked in the source code as with the ``import_name`` and/or ``import_module`` clang attributes which signals that they are expected to be undefined at static link time. +Stub Libraries +~~~~~~~~~~~~~~ + +Another way to specify imports and exports is via a "stub library". This +feature is inspired by the ELF stub objects which are supported by the Solaris +linker. Stub libraries are text files that can be passed as normal linker +inputs, similar to how linker scripts can be passed to the ELF linker. The stub +library is a stand-in for a set of symbols that will be available at runtime, +but doesn't contain any actual code or data. Instead it contains just a list of +symbols, one per line. Each symbol can specify zero or more dependencies. +These dependencies are symbols that must be defined, and exported, by the output +module if the symbol is question is imported/required by the output module. + +For example, imagine the runtime provides an external symbol ``foo`` that +depends on the ``malloc`` and ``free``. This can be expressed simply as:: + + #STUB + foo: malloc,free + +Here we are saying that ``foo`` is allowed to be imported (undefined) but that +if it is imported, then the output module must also export ``malloc`` and +``free`` to the runtime. If ``foo`` is imported (undefined), but the output +module does not define ``malloc`` and ``free`` then the link will fail. + +Stub libraries must begin with ``#STUB`` on a line by itself. + Garbage Collection ~~~~~~~~~~~~~~~~~~ diff --git a/contrib/llvm-project/llvm/include/llvm/Analysis/AliasAnalysis.h b/contrib/llvm-project/llvm/include/llvm/Analysis/AliasAnalysis.h index 953e15e358f1..8ac6e7dac63e 100644 --- a/contrib/llvm-project/llvm/include/llvm/Analysis/AliasAnalysis.h +++ b/contrib/llvm-project/llvm/include/llvm/Analysis/AliasAnalysis.h @@ -116,6 +116,15 @@ public: operator Kind() const { return static_cast(Alias); } + bool operator==(const AliasResult &Other) const { + return Alias == Other.Alias && HasOffset == Other.HasOffset && + Offset == Other.Offset; + } + bool operator!=(const AliasResult &Other) const { return !(*this == Other); } + + bool operator==(Kind K) const { return Alias == K; } + bool operator!=(Kind K) const { return !(*this == K); } + constexpr bool hasOffset() const { return HasOffset; } constexpr int32_t getOffset() const { assert(HasOffset && "No offset!"); diff --git a/contrib/llvm-project/llvm/include/llvm/Analysis/TargetLibraryInfo.h b/contrib/llvm-project/llvm/include/llvm/Analysis/TargetLibraryInfo.h index 8fcfbdbd6665..951945f7b765 100644 --- a/contrib/llvm-project/llvm/include/llvm/Analysis/TargetLibraryInfo.h +++ b/contrib/llvm-project/llvm/include/llvm/Analysis/TargetLibraryInfo.h @@ -408,14 +408,14 @@ public: ShouldExtI32Param = true; ShouldExtI32Return = true; } - // Mips and riscv64, on the other hand, needs signext on i32 parameters - // corresponding to both signed and unsigned ints. - if (T.isMIPS() || T.isRISCV64()) { + // LoongArch, Mips, and riscv64, on the other hand, need signext on i32 + // parameters corresponding to both signed and unsigned ints. + if (T.isLoongArch() || T.isMIPS() || T.isRISCV64()) { ShouldSignExtI32Param = true; } - // riscv64 needs signext on i32 returns corresponding to both signed and - // unsigned ints. - if (T.isRISCV64()) { + // LoongArch and riscv64 need signext on i32 returns corresponding to both + // signed and unsigned ints. + if (T.isLoongArch() || T.isRISCV64()) { ShouldSignExtI32Return = true; } } diff --git a/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp index 202fc473f9e4..609a383426d6 100644 --- a/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp @@ -1628,7 +1628,7 @@ HexagonTargetLowering::HexagonTargetLowering(const TargetMachine &TM, ISD::UADDO, ISD::SSUBO, ISD::USUBO, ISD::SMUL_LOHI, ISD::UMUL_LOHI, // Logical/bit: ISD::AND, ISD::OR, ISD::XOR, ISD::ROTL, ISD::ROTR, - ISD::CTPOP, ISD::CTLZ, ISD::CTTZ, + ISD::CTPOP, ISD::CTLZ, ISD::CTTZ, ISD::BSWAP, ISD::BITREVERSE, // Floating point arithmetic/math functions: ISD::FADD, ISD::FSUB, ISD::FMUL, ISD::FMA, ISD::FDIV, ISD::FREM, ISD::FNEG, ISD::FABS, ISD::FSQRT, ISD::FSIN, @@ -1701,8 +1701,11 @@ HexagonTargetLowering::HexagonTargetLowering(const TargetMachine &TM, setOperationAction(ISD::OR, NativeVT, Legal); setOperationAction(ISD::XOR, NativeVT, Legal); - if (NativeVT.getVectorElementType() != MVT::i1) + if (NativeVT.getVectorElementType() != MVT::i1) { setOperationAction(ISD::SPLAT_VECTOR, NativeVT, Legal); + setOperationAction(ISD::BSWAP, NativeVT, Legal); + setOperationAction(ISD::BITREVERSE, NativeVT, Legal); + } } for (MVT VT : {MVT::v8i8, MVT::v4i16, MVT::v2i32}) { diff --git a/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonPatterns.td b/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonPatterns.td index a75ac0e1378e..375e519a6848 100644 --- a/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonPatterns.td +++ b/contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonPatterns.td @@ -117,8 +117,8 @@ def usat: PatFrag<(ops node:$V, node:$Ty), (HexagonUSAT node:$V, node:$Ty)>; // Pattern fragments to extract the low and high subregisters from a // 64-bit value. -def LoReg: OutPatFrag<(ops node:$Rs), (EXTRACT_SUBREG (i64 $Rs), isub_lo)>; -def HiReg: OutPatFrag<(ops node:$Rs), (EXTRACT_SUBREG (i64 $Rs), isub_hi)>; +def LoReg: OutPatFrag<(ops node:$Rs), (EXTRACT_SUBREG $Rs, isub_lo)>; +def HiReg: OutPatFrag<(ops node:$Rs), (EXTRACT_SUBREG $Rs, isub_hi)>; def IsOrAdd: PatFrag<(ops node:$A, node:$B), (or node:$A, node:$B), [{ return isOrEquivalentToAdd(N); @@ -1123,6 +1123,12 @@ def: Pat<(bswap I32:$Rs), (A2_swiz I32:$Rs)>; def: Pat<(bswap I64:$Rss), (Combinew (A2_swiz (LoReg $Rss)), (A2_swiz (HiReg $Rss)))>; +def: Pat<(bswap V2I16:$Rs), (A2_combine_lh (A2_swiz $Rs), (A2_swiz $Rs))>; +def: Pat<(bswap V2I32:$Rs), (Combinew (A2_swiz (HiReg $Rs)), + (A2_swiz (LoReg $Rs)))>; +def: Pat<(bswap V4I16:$Rs), (A2_orp (S2_lsr_i_vh $Rs, 8), + (S2_asl_i_vh $Rs, 8))>; + def: Pat<(shl s6_0ImmPred:$s6, I32:$Rt), (S4_lsli imm:$s6, I32:$Rt)>; def: Pat<(shl I32:$Rs, (i32 16)), (A2_aslh I32:$Rs)>; def: Pat<(sra I32:$Rs, (i32 16)), (A2_asrh I32:$Rs)>; @@ -1854,6 +1860,20 @@ def: Pat<(i32 (ctpop I32:$Rs)), (S5_popcountp (A4_combineir 0, I32:$Rs))>; def: Pat<(bitreverse I32:$Rs), (S2_brev I32:$Rs)>; def: Pat<(bitreverse I64:$Rss), (S2_brevp I64:$Rss)>; +def: Pat<(bitreverse V4I8:$Rs), (A2_swiz (S2_brev $Rs))>; +def: Pat<(bitreverse V8I8:$Rs), (Combinew (A2_swiz (LoReg (S2_brevp $Rs))), + (A2_swiz (HiReg (S2_brevp $Rs))))>; +def: Pat<(bitreverse V2I16:$Rs), (A2_combine_lh (S2_brev $Rs), + (S2_brev $Rs))>; +def: Pat<(bitreverse V4I16:$Rs), + (Combinew (A2_combine_lh (LoReg (S2_brevp $Rs)), + (LoReg (S2_brevp $Rs))), + (A2_combine_lh (HiReg (S2_brevp $Rs)), + (HiReg (S2_brevp $Rs))))>; +def: Pat<(bitreverse V2I32:$Rs), + (Combinew (i32 (LoReg (S2_brevp $Rs))), + (i32 (HiReg (S2_brevp $Rs))))>; + let AddedComplexity = 20 in { // Complexity greater than and/or/xor def: Pat<(and I32:$Rs, IsNPow2_32:$V), (S2_clrbit_i IntRegs:$Rs, (LogN2_32 $V))>; diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp index cf17c51b04fc..e43b33eed470 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -499,7 +499,7 @@ X86TargetLowering::X86TargetLowering(const X86TargetMachine &TM, } if (Subtarget.hasSSEPrefetch() || Subtarget.hasThreeDNow()) - setOperationAction(ISD::PREFETCH , MVT::Other, Legal); + setOperationAction(ISD::PREFETCH , MVT::Other, Custom); setOperationAction(ISD::ATOMIC_FENCE , MVT::Other, Custom); @@ -2195,6 +2195,7 @@ X86TargetLowering::X86TargetLowering(const X86TargetMachine &TM, setOperationAction(ISD::FMUL, VT, Expand); setOperationAction(ISD::FDIV, VT, Expand); setOperationAction(ISD::BUILD_VECTOR, VT, Custom); + setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom); } addLegalFPImmediate(APFloat::getZero(APFloat::BFloat())); } @@ -2207,6 +2208,7 @@ X86TargetLowering::X86TargetLowering(const X86TargetMachine &TM, setOperationAction(ISD::FMUL, MVT::v32bf16, Expand); setOperationAction(ISD::FDIV, MVT::v32bf16, Expand); setOperationAction(ISD::BUILD_VECTOR, MVT::v32bf16, Custom); + setOperationAction(ISD::VECTOR_SHUFFLE, MVT::v32bf16, Custom); } if (!Subtarget.useSoftFloat() && Subtarget.hasVLX()) { @@ -18773,11 +18775,11 @@ static SDValue lower256BitShuffle(const SDLoc &DL, ArrayRef Mask, MVT VT, return DAG.getBitcast(VT, DAG.getVectorShuffle(FpVT, DL, V1, V2, Mask)); } - if (VT == MVT::v16f16) { - V1 = DAG.getBitcast(MVT::v16i16, V1); - V2 = DAG.getBitcast(MVT::v16i16, V2); - return DAG.getBitcast(MVT::v16f16, - DAG.getVectorShuffle(MVT::v16i16, DL, V1, V2, Mask)); + if (VT == MVT::v16f16 || VT.getVectorElementType() == MVT::bf16) { + MVT IVT = VT.changeVectorElementTypeToInteger(); + V1 = DAG.getBitcast(IVT, V1); + V2 = DAG.getBitcast(IVT, V2); + return DAG.getBitcast(VT, DAG.getVectorShuffle(IVT, DL, V1, V2, Mask)); } switch (VT.SimpleTy) { @@ -33093,6 +33095,18 @@ static SDValue LowerCVTPS2PH(SDValue Op, SelectionDAG &DAG) { return DAG.getNode(ISD::CONCAT_VECTORS, dl, VT, Lo, Hi); } +static SDValue LowerPREFETCH(SDValue Op, const X86Subtarget &Subtarget, + SelectionDAG &DAG) { + unsigned IsData = cast(Op.getOperand(4))->getZExtValue(); + + // We don't support non-data prefetch without PREFETCHI. + // Just preserve the chain. + if (!IsData && !Subtarget.hasPREFETCHI()) + return Op.getOperand(0); + + return Op; +} + static StringRef getInstrStrFromOpNo(const SmallVectorImpl &AsmStrs, unsigned OpNo) { const APInt Operand(32, OpNo); @@ -33294,6 +33308,7 @@ SDValue X86TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const { case ISD::GC_TRANSITION_END: return LowerGC_TRANSITION(Op, DAG); case ISD::ADDRSPACECAST: return LowerADDRSPACECAST(Op, DAG); case X86ISD::CVTPS2PH: return LowerCVTPS2PH(Op, DAG); + case ISD::PREFETCH: return LowerPREFETCH(Op, Subtarget, DAG); } *** 188 LINES SKIPPED *** From nobody Sun Jul 23 18:27:11 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 4R8BbM6Mfjz4p6Kl; Sun, 23 Jul 2023 18:27:11 +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 4R8BbM4csYz3h0P; Sun, 23 Jul 2023 18:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136831; 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=mp79A7If9NlfmAvZshoi2mEqSYM9cFTolT4QPdkRlGI=; b=vSfE8SjJ/Zv4bC/+Ard1PYRoIobJQ/gDbGX22u2bTztN5vYVRxSyvU4LNPtGs8MCDv1x23 DzXxI33IZNlDuA+/zYH9MgmwAG3B6hnT54s8iJMjUUBjXwQcrMO+bXRl3Tmrfs13anSo4+ 6Uhq98JGKiGsrr4G9fD+69nlK1eKng8Smu0emxNdo+1Vv8fZGpUsUvdCwbpsebqlDC9d/v Dtfvz/dH52PoWOCTJfNJ3TCDGmaSv4/oVV4Kp7Wnxo3DgKV27ndB9dTjq6mim//dTmiwg+ prBE6jrrcOg15U7QzqeAovnx+XAGZ/hAwwleoeOqfG9o9iFJ8zhb/VuHzd4vog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136831; 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=mp79A7If9NlfmAvZshoi2mEqSYM9cFTolT4QPdkRlGI=; b=FmlilCY6RxBtzupFrrYy/Vf64Qz6gpyhQSYCQgLfO/2SlX2lJ//xJ/anw+RiAt6ALGy0pe G1jgtkK5BYD/NnOdO+nUMbx2wAW27EbD6DK/y2X+MBC4CnZKrVwTYLEJ8rHfZ50GxLkB8n /uYVLV2yVbEMaKkUYl3lf/a5lIoAmR7yjpRRKTePtfuqP4irviEdtuGUJ74w1jUssIUDnA aPo+RrbWvfN4tbAl6BSns5fQf1h6FEB8zCv/kCfsX0kzavPNqHdcg3F2ZDy8JWhKehc1XB WsVR9p0VDtRSoRS1X8VTtVpHZ9LzlmchAVEEsjdLIH0EExTYa8B6Opbsfgr3AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136831; a=rsa-sha256; cv=none; b=Bj0PuJ2mi53v87M0nFoS+bHfV880dTztTvuPxx03E8iCDI8jSQ1ynyhzau3f4GZ715TVQG 3XoQ933rkNSQhq04gYsTmsi29yFPdNVF7XAvuOTBZeT8of1LbQlKG+wssWdsrpoqasjERz xGGdv8/8EGHbO9tn+Aqn2b9w1jpvUmsV7+QVyeSqhXZtuv6YvwByax1oNBIABpE8CUZwbu f4p67Ok970+UlQdaFo4PPebSqQvcgiDgtPvmzyEqlfzevaLawXwHC91tPEXoH3smGyoACL cJHTVTudL7Bu/vBrtSN0o+6zy1XnMYFFpyaOVbQKGpWyEK0IUtjbbFsdHOPCKA== 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 4R8BbM31FjzmVS; Sun, 23 Jul 2023 18:27:11 +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 36NIRBtS058812; Sun, 23 Jul 2023 18:27:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRB9i058811; Sun, 23 Jul 2023 18:27:11 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:11 GMT Message-Id: <202307231827.36NIRB9i058811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e0c3c6130c9b - stable/13 - Merge commit 69d42eef4bec from llvm-project (by Dimitry Andric): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0c3c6130c9bf6d1fa66061b49ee4fb6c3572d55 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c3c6130c9bf6d1fa66061b49ee4fb6c3572d55 commit e0c3c6130c9bf6d1fa66061b49ee4fb6c3572d55 Author: Dimitry Andric AuthorDate: 2023-06-14 18:49:59 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:10 +0000 Merge commit 69d42eef4bec from llvm-project (by Dimitry Andric): [Clang] Show type in enum out of range diagnostic When the diagnostic for an out of range enum value is printed, it currently does not show the actual enum type in question, for example: v8/src/base/bit-field.h:43:29: error: integer value 7 is outside the valid range of values [0, 3] for this enumeration type [-Wenum-constexpr-conversion] static constexpr T kMax = static_cast(kNumValues - 1); ^ This can make it cumbersome to find the cause for the problem. Add the enum type to the diagnostic message, to make it easier. Reviewed By: aaron.ballman Differential Revision: https://reviews.llvm.org/D152788 PR: 271047 MFC after: 1 month (cherry picked from commit cf24393421ca807899c599a53ddc5dcedb7c71dc) --- .../llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td | 4 ++-- contrib/llvm-project/clang/lib/AST/ExprConstant.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td index 28120d13fd9e..4e2e0bd3079c 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td @@ -393,8 +393,8 @@ def warn_fixedpoint_constant_overflow : Warning< "overflow in expression; result is %0 with type %1">, InGroup>; def warn_constexpr_unscoped_enum_out_of_range : Warning< - "integer value %0 is outside the valid range of values [%1, %2] for this " - "enumeration type">, DefaultError, InGroup>; + "integer value %0 is outside the valid range of values [%1, %2] for the " + "enumeration type %3">, DefaultError, InGroup>; // This is a temporary diagnostic, and shall be removed once our // implementation is complete, and like the preceding constexpr notes belongs diff --git a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp index 464104139cb2..db6c07d4ab7f 100644 --- a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp +++ b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp @@ -13682,12 +13682,13 @@ bool IntExprEvaluator::VisitCastExpr(const CastExpr *E) { Info.Ctx.getDiagnostics().Report( E->getExprLoc(), diag::warn_constexpr_unscoped_enum_out_of_range) << llvm::toString(Result.getInt(), 10) << Min.getSExtValue() - << Max.getSExtValue(); + << Max.getSExtValue() << ED; else if (!ED->getNumNegativeBits() && ConstexprVar && Max.ult(Result.getInt().getZExtValue())) - Info.Ctx.getDiagnostics().Report(E->getExprLoc(), - diag::warn_constexpr_unscoped_enum_out_of_range) - << llvm::toString(Result.getInt(),10) << Min.getZExtValue() << Max.getZExtValue(); + Info.Ctx.getDiagnostics().Report( + E->getExprLoc(), diag::warn_constexpr_unscoped_enum_out_of_range) + << llvm::toString(Result.getInt(), 10) << Min.getZExtValue() + << Max.getZExtValue() << ED; } } From nobody Sun Jul 23 18:27:12 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 4R8BbQ0wsPz4p6Rh; Sun, 23 Jul 2023 18:27:14 +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 4R8BbP4y3mz3hFt; Sun, 23 Jul 2023 18:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136833; 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=PWzZ6Ev4UWlF4l2affDu5UBOlelfLI5eTUwEHTZzssA=; b=ZDykJLigg+QdsSw844GE4iTNtg/m0wfh8dwVyxXITTTOSTtNGkfnMZj6QWigQjXEAi8+wP LjJoUlvFuRrUXmshYnGIgb1Vm0NsuyGoEozgcEzIS9IpbfAKWtgTOKhNN5/DTpzt9AQpQx 1g8pz2u/piCsduDBMphfRheXxkEJuW5aRWjMg+7PYaSAwqfiP82jN5/rJnDaUxJOnNJRzK XxTrTQAJMqMyrtou1PE7+3aTq/5UBgXGJfvBE/Yfo3KIqBwRmJZuNfPDknbvEo+EvTMOfa tJVRSBSAY2q5pcMOUCT7/G/NvnmKXqwckyb793n34ZmSUVP8G4J99uCEtA3DqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136833; 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=PWzZ6Ev4UWlF4l2affDu5UBOlelfLI5eTUwEHTZzssA=; b=jOXKIFvp3sUxzPg2JiFgurVDr7eTAb+XvUO52lQBY9jytNqhO7plOZUye8plxXAxbp4/Zi YTWEqrgOSSK5hekyNz/tN5xGC+SIhoSF1rpgt4PHYoF745Z0HOOxVtkMxJfpDPK8eGE0qd cAHAIdutrbyGyZn4d7UaeZrykp90lS6NAKN8kOLa4er3wpJlFU9ononzYZbadN1nnwcjoh sznycA0VHRnJgAiFFq4TJe/+piNjl7M77a1tx9NeZHpdb9MVuHjSe2azoK3oaIJLGWUmNN Os3Li/q69GxNmc7OGcHDhZH4Fo8KFuY/26GbPuwF5OJSsIZ8shBL4ey79yH6Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136833; a=rsa-sha256; cv=none; b=Tfojd4sACHpycfB2g5z82YXJafSwjH7wXAx0uHLg18ctJ6EquRySO+9Z3tXCQjtBYNTXaC ajCzBWT//7GT1xiT7jbB/fPf7spsqIhj3kmCU/UyDHVJuvFNu+kIrj1k3ow07nVlcDdN/L sto5pbKVn6ezLHTS9dX5ejcWWPI/3HJar9ghW+84LdoMoTrAjMeMyFFBPIiWaI0zc7PlFy SXgSoeYbjVzT1hnOWaHm78igqW7n+SN7Q3j18UdA4jeFhFwT0zwssFsQ20cTZl9PcGlBb0 nzCVTN7DE0OIw4EqL4FifEHYmDtqOtW4eMKtZUzTuOYKLIj1+Y6bzv1LkfrLbA== 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 4R8BbP4367zmVT; Sun, 23 Jul 2023 18:27:13 +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 36NIRDuS058838; Sun, 23 Jul 2023 18:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRCAp058835; Sun, 23 Jul 2023 18:27:12 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:12 GMT Message-Id: <202307231827.36NIRCAp058835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2e7b90a28f69 - stable/13 - Merge llvm-project release/16.x llvmorg-16.0.6-0-g7cbf1a259152 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e7b90a28f695ee74a8eeb7cccb0fcf281184407 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2e7b90a28f695ee74a8eeb7cccb0fcf281184407 commit 2e7b90a28f695ee74a8eeb7cccb0fcf281184407 Author: Dimitry Andric AuthorDate: 2023-06-22 17:47:54 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:11 +0000 Merge llvm-project release/16.x llvmorg-16.0.6-0-g7cbf1a259152 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.6-0-g7cbf1a259152 (aka 16.0.6 release). PR: 271047 MFC after: 1 month (cherry picked from commit e048f78b21438144bab781f2ba9ee33a2aae6772) --- contrib/llvm-project/libcxx/include/__config | 2 +- lib/clang/freebsd_cc_version.h | 2 - lib/clang/include/Plugins/Plugins.def | 1 - lib/clang/include/VCSVersion.inc | 8 +- lib/clang/include/clang/Basic/Version.inc | 8 +- lib/clang/include/clang/Config/config.h | 1 - lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Host/Config.h | 1 - lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/AsmParsers.def | 2 - lib/clang/include/llvm/Config/AsmPrinters.def | 2 - lib/clang/include/llvm/Config/Disassemblers.def | 2 - lib/clang/include/llvm/Config/TargetMCAs.def | 2 - lib/clang/include/llvm/Config/Targets.def | 2 - lib/clang/include/llvm/Config/abi-breaking.h | 1 - lib/clang/include/llvm/Config/config.h | 5 +- lib/clang/include/llvm/Config/llvm-config.h | 5 +- lib/clang/include/llvm/Support/Extension.def | 1 - lib/clang/include/llvm/Support/VCSRevision.h | 3 +- lib/clang/liblldb/LLDBWrapLua.cpp | 82074 +++++++++++----------- lib/clang/llvm.pre.mk | 1 - 21 files changed, 41074 insertions(+), 41057 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index d7ba71906e26..10815388389a 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -38,7 +38,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 160005 +# define _LIBCPP_VERSION 160006 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h index 37777d586b6d..e0441ae866f5 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1,3 +1 @@ -/* $FreeBSD$ */ - #define FREEBSD_CC_VERSION 1300012 diff --git a/lib/clang/include/Plugins/Plugins.def b/lib/clang/include/Plugins/Plugins.def index 55ff6eae7c07..a1224b71fc75 100644 --- a/lib/clang/include/Plugins/Plugins.def +++ b/lib/clang/include/Plugins/Plugins.def @@ -1,4 +1,3 @@ -// $FreeBSD$ /*===- lldb/source/Plugin/Plugins.def ---------------------------*- C++ -*-===*\ |* *| |* Part of the LLVM Project, under the Apache License v2.0 with LLVM *| diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 1daa9c25ab45..598871260c01 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,8 @@ -// $FreeBSD$ - -#define LLVM_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define LLVM_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define CLANG_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define LLDB_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index e99bc8fb4f95..d5aa1ce51f33 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,10 +1,8 @@ -/* $FreeBSD$ */ - -#define CLANG_VERSION 16.0.5 -#define CLANG_VERSION_STRING "16.0.5" +#define CLANG_VERSION 16.0.6 +#define CLANG_VERSION_STRING "16.0.6" #define CLANG_VERSION_MAJOR 16 #define CLANG_VERSION_MAJOR_STRING "16" #define CLANG_VERSION_MINOR 0 -#define CLANG_VERSION_PATCHLEVEL 5 +#define CLANG_VERSION_PATCHLEVEL 6 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h index 0cd1e12a4108..b2c85aa23d19 100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* This generated file is for internal use. Do not include it from headers. */ #ifdef CLANG_CONFIG_H diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index f6061c3e6784..20810f686dad 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "16.0.5 (FreeBSD llvmorg-16.0.5-0-g185b81e034ba-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "16.0.6 (FreeBSD llvmorg-16.0.6-0-g7cbf1a259152-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Host/Config.h b/lib/clang/include/lldb/Host/Config.h index 0e855b6b09c6..8f6bdf58790e 100644 --- a/lib/clang/include/lldb/Host/Config.h +++ b/lib/clang/include/lldb/Host/Config.h @@ -1,4 +1,3 @@ -// $FreeBSD$ //===-- Config.h -----------------------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 982e4714b182..99f8a8e09dea 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 16.0.5 -#define LLDB_VERSION_STRING "16.0.5" +#define LLDB_VERSION 16.0.6 +#define LLDB_VERSION_STRING "16.0.6" #define LLDB_VERSION_MAJOR 16 #define LLDB_VERSION_MINOR 0 -#define LLDB_VERSION_PATCH 5 +#define LLDB_VERSION_PATCH 6 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/AsmParsers.def b/lib/clang/include/llvm/Config/AsmParsers.def index d0924c0914f3..e37ea136a87b 100644 --- a/lib/clang/include/llvm/Config/AsmParsers.def +++ b/lib/clang/include/llvm/Config/AsmParsers.def @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - #ifndef LLVM_ASM_PARSER # error Please define the macro LLVM_ASM_PARSER(TargetName) #endif diff --git a/lib/clang/include/llvm/Config/AsmPrinters.def b/lib/clang/include/llvm/Config/AsmPrinters.def index 2a335aa93b42..819a52bc29e2 100644 --- a/lib/clang/include/llvm/Config/AsmPrinters.def +++ b/lib/clang/include/llvm/Config/AsmPrinters.def @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - #ifndef LLVM_ASM_PRINTER # error Please define the macro LLVM_ASM_PRINTER(TargetName) #endif diff --git a/lib/clang/include/llvm/Config/Disassemblers.def b/lib/clang/include/llvm/Config/Disassemblers.def index 756ff37b4bf8..90ab73d82294 100644 --- a/lib/clang/include/llvm/Config/Disassemblers.def +++ b/lib/clang/include/llvm/Config/Disassemblers.def @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - #ifndef LLVM_DISASSEMBLER # error Please define the macro LLVM_DISASSEMBLER(TargetName) #endif diff --git a/lib/clang/include/llvm/Config/TargetMCAs.def b/lib/clang/include/llvm/Config/TargetMCAs.def index be6edaf3dd69..e7d4e60c0098 100644 --- a/lib/clang/include/llvm/Config/TargetMCAs.def +++ b/lib/clang/include/llvm/Config/TargetMCAs.def @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - #ifndef LLVM_TARGETMCA # error Please define the macro LLVM_TARGETMCA(TargetName) #endif diff --git a/lib/clang/include/llvm/Config/Targets.def b/lib/clang/include/llvm/Config/Targets.def index b6cb6fee9dce..a9a64ccd4202 100644 --- a/lib/clang/include/llvm/Config/Targets.def +++ b/lib/clang/include/llvm/Config/Targets.def @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - #ifndef LLVM_TARGET # error Please define the macro LLVM_TARGET(TargetName) #endif diff --git a/lib/clang/include/llvm/Config/abi-breaking.h b/lib/clang/include/llvm/Config/abi-breaking.h index 1254d6218db3..eb90be1fe37b 100644 --- a/lib/clang/include/llvm/Config/abi-breaking.h +++ b/lib/clang/include/llvm/Config/abi-breaking.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*===------- llvm/Config/abi-breaking.h - llvm configuration -------*- C -*-===*/ /* */ /* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index d97252910e45..78af3cbddcd1 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef CONFIG_H #define CONFIG_H @@ -348,10 +347,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 16.0.5" +#define PACKAGE_STRING "LLVM 16.0.6" /* Define to the version of this package. */ -#define PACKAGE_VERSION "16.0.5" +#define PACKAGE_VERSION "16.0.6" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 82d246c949f0..cdf493029a3a 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ /* */ /* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ @@ -74,10 +73,10 @@ #define LLVM_VERSION_MINOR 0 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 5 +#define LLVM_VERSION_PATCH 6 /* LLVM version string */ -#define LLVM_VERSION_STRING "16.0.5" +#define LLVM_VERSION_STRING "16.0.6" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/Extension.def b/lib/clang/include/llvm/Support/Extension.def index 07fb3782b6c3..afb3240cecc2 100644 --- a/lib/clang/include/llvm/Support/Extension.def +++ b/lib/clang/include/llvm/Support/Extension.def @@ -1,3 +1,2 @@ -// $FreeBSD$ //extension handlers #undef HANDLE_EXTENSION diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 95353f30f7ec..02b970068e71 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,2 @@ -/* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define LLVM_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/liblldb/LLDBWrapLua.cpp b/lib/clang/liblldb/LLDBWrapLua.cpp index ed5bec8c61da..73bd6373845b 100644 --- a/lib/clang/liblldb/LLDBWrapLua.cpp +++ b/lib/clang/liblldb/LLDBWrapLua.cpp @@ -1,45 +1,17 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.0.2 + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1 * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ -#ifndef SWIGLUA +#define SWIG_VERSION 0x040101 #define SWIGLUA -#endif - #define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_LUA #define SWIG_LUA_MODULE_GLOBAL - -#ifdef __cplusplus -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigMovePointer { - T *ptr; - SwigMovePointer(T *p) : ptr(p) { } - ~SwigMovePointer() { delete ptr; } - SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; } - operator T&() const { return *pointer.ptr; } - T *operator&() { return pointer.ptr; } -}; - -template T SwigValueInit() { - return T(); -} -#endif - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -210,6 +182,8 @@ template T SwigValueInit() { #define SWIG_POINTER_DISOWN 0x1 #define SWIG_CAST_NEW_MEMORY 0x2 #define SWIG_POINTER_NO_NULL 0x4 +#define SWIG_POINTER_CLEAR 0x8 +#define SWIG_POINTER_RELEASE (SWIG_POINTER_CLEAR | SWIG_POINTER_DISOWN) /* Flags for new pointer objects */ #define SWIG_POINTER_OWN 0x1 @@ -281,7 +255,7 @@ template T SwigValueInit() { SWIG errors code. Finally, if the SWIG_CASTRANK_MODE is enabled, the result code - allows to return the 'cast rank', for example, if you have this + allows returning the 'cast rank', for example, if you have this int food(double) int fooi(int); @@ -295,7 +269,13 @@ template T SwigValueInit() { */ #define SWIG_OK (0) +/* Runtime errors are < 0 */ #define SWIG_ERROR (-1) +/* Errors in range -1 to -99 are in swigerrors.swg (errors for all languages including those not using the runtime) */ +/* Errors in range -100 to -199 are language specific errors defined in *errors.swg */ +/* Errors < -200 are generic runtime specific errors */ +#define SWIG_ERROR_RELEASE_NOT_OWNED (-200) + #define SWIG_IsOK(r) (r >= 0) #define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) @@ -310,7 +290,7 @@ template T SwigValueInit() { #define SWIG_OLDOBJ (SWIG_OK) #define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) #define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) -/* Check, add and del mask methods */ +/* Check, add and del object mask methods */ #define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) #define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) #define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) @@ -456,7 +436,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) { Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison */ SWIGRUNTIME swig_cast_info * -SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) { +SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty) { if (ty) { swig_cast_info *iter = ty->cast; while (iter) { @@ -516,9 +496,9 @@ SWIG_TypeName(const swig_type_info *ty) { SWIGRUNTIME const char * SWIG_TypePrettyName(const swig_type_info *type) { /* The "str" field contains the equivalent pretty names of the - type, separated by vertical-bar characters. We choose - to print the last name, as it is often (?) the most - specific. */ + type, separated by vertical-bar characters. Choose the last + name. It should be the most specific; a fully resolved name + but not necessarily with default template parameters expanded. */ if (!type) return NULL; if (type->str != NULL) { const char *last_name = type->str; @@ -738,7 +718,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { } #endif -/* Errors in SWIG */ +/* SWIG Errors applicable to all language modules, values are reserved from -1 to -99 */ #define SWIG_UnknownError -1 #define SWIG_IOError -2 #define SWIG_RuntimeError -3 @@ -754,7 +734,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #define SWIG_NullReferenceError -13 - /* ----------------------------------------------------------------------------- * luarun.swg * @@ -1064,7 +1043,7 @@ typedef struct { /* Contract support */ #define SWIG_contract_assert(expr, msg) \ - if (!(expr)) { SWIG_Lua_pusherrstring(L, (char *) msg); goto fail; } else + do { if (!(expr)) { SWIG_Lua_pusherrstring(L, (char *) msg); goto fail; } } while (0) /* helper #defines */ @@ -1583,7 +1562,7 @@ SWIGINTERN int SWIG_Lua_class_do_get_item(lua_State *L, swig_type_info *type, i /* NEW: looks for the __getitem() fn this is a user provided get fn */ SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ - if (lua_iscfunction(L,-1)) /* if its there */ + if (lua_iscfunction(L,-1)) /* if it's there */ { /* found it so call the fn & return its value */ lua_pushvalue(L,substack_start+1); /* the userdata */ lua_pushvalue(L,substack_start+2); /* the parameter */ @@ -1640,7 +1619,7 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int SW lua_pushvalue(L,substack_start+2); /* key */ lua_rawget(L,-2); /* look for the fn */ lua_remove(L,-2); /* stack tidy, remove .fn table */ - if (lua_isfunction(L,-1)) /* note: if its a C function or lua function */ + if (lua_isfunction(L,-1)) /* note: if it's a C function or lua function */ { /* found it so return the fn & let lua call it */ lua_remove(L,-2); /* stack tidy, remove metatable */ if(ret) @@ -1723,7 +1702,7 @@ SWIGINTERN int SWIG_Lua_class_do_set(lua_State *L, swig_type_info *type, int fi /* NEW: looks for the __setitem() fn this is a user provided set fn */ SWIG_Lua_get_table(L,"__setitem"); /* find the fn */ - if (lua_iscfunction(L,-1)) /* if its there */ + if (lua_iscfunction(L,-1)) /* if it's there */ { /* found it so call the fn & return its value */ lua_pushvalue(L,substack_start+1); /* the userdata */ lua_pushvalue(L,substack_start+2); /* the parameter */ @@ -2100,15 +2079,15 @@ SWIGINTERN void SWIG_Lua_add_class_instance_details(lua_State *L, swig_lua_clas SWIGRUNTIME int SWIG_Lua_resolve_metamethod(lua_State *L); /*forward declaration*/ /* The real function that resolves a metamethod. - * Function searches given class and all it's bases(recursively) for first instance of something that is - * not equal to SWIG_Lua_resolve_metatmethod. (Almost always this 'something' is actual metamethod implementation + * Function searches given class and all its bases (recursively) for first instance of something that is + * not equal to SWIG_Lua_resolve_metamethod. (Almost always this 'something' is actual metamethod implementation * and it is a SWIG-generated C function.). It returns value on the top of the L and there is no garbage below the * answer. * Returns 1 if found, 0 otherwise. * clss is class which metatable we will search for method * metamethod_name_idx is index in L where metamethod name (as string) lies - * skip_check allows to skip searching metamethod in givel clss and immideatelly go to searching in bases. skip_check - * is not caried to subsequent recursive calls - false is always passed. It is set to true only at first call from + * skip_check allows skipping searching metamethod in the given class and immediately going to searching in bases. skip_check + * is not carried to subsequent recursive calls - false is always passed. It is set to true only at first call from * SWIG_Lua_resolve_metamethod * */ SWIGINTERN int SWIG_Lua_do_resolve_metamethod(lua_State *L, const swig_lua_class *clss, int metamethod_name_idx, @@ -2254,7 +2233,7 @@ SWIGINTERN void SWIG_Lua_add_class_user_metamethods(lua_State *L, swig_lua_class } } - lua_pop(L,1); /* remove inheritable metatmethods table */ + lua_pop(L,1); /* remove inheritable metamethods table */ /* Special handling for __tostring method */ lua_pushstring(L, "__tostring"); @@ -2514,6 +2493,7 @@ SWIGRUNTIME void SWIG_Lua_NewPointerObj(lua_State *L,void *ptr,swig_type_info *t (if possible) */ SWIGRUNTIME int SWIG_Lua_ConvertPtr(lua_State *L,int index,void **ptr,swig_type_info *type,int flags) { + int ret = SWIG_ERROR; swig_lua_userdata *usr; swig_cast_info *cast; /* special case: lua nil => NULL pointer */ @@ -2530,30 +2510,41 @@ SWIGRUNTIME int SWIG_Lua_ConvertPtr(lua_State *L,int index,void **ptr,swig_type usr=(swig_lua_userdata*)lua_touserdata(L,index); /* get data */ if (usr) { + if (((flags & SWIG_POINTER_RELEASE) == SWIG_POINTER_RELEASE) && !usr->own) + { + return SWIG_ERROR_RELEASE_NOT_OWNED; + } if (flags & SWIG_POINTER_DISOWN) /* must disown the object */ { - usr->own=0; + usr->own = 0; } if (!type) /* special cast void*, no casting fn */ { *ptr=usr->ptr; - return SWIG_OK; /* ok */ + ret = SWIG_OK; } - cast=SWIG_TypeCheckStruct(usr->type,type); /* performs normal type checking */ - if (cast) + else { - int newmemory = 0; - *ptr=SWIG_TypeCast(cast,usr->ptr,&newmemory); - assert(!newmemory); /* newmemory handling not yet implemented */ - return SWIG_OK; /* ok */ + cast=SWIG_TypeCheck(usr->type->name,type); /* performs normal type checking */ + if (cast) + { + int newmemory = 0; + *ptr=SWIG_TypeCast(cast,usr->ptr,&newmemory); + assert(!newmemory); /* newmemory handling not yet implemented */ + ret = SWIG_OK; + } + } + if ((ret == SWIG_OK) && (flags & SWIG_POINTER_CLEAR)) + { + usr->ptr = 0; } } - return SWIG_ERROR; /* error */ + return ret; } SWIGRUNTIME void* SWIG_Lua_MustGetPtr(lua_State *L,int index,swig_type_info *type,int flags, int argnum,const char *func_name){ - void *result; + void *result = 0; if (!SWIG_IsOK(SWIG_ConvertPtr(L,index,&result,type,flags))){ luaL_error (L,"Error in %s, expected a %s at argument number %d\n", func_name,(type && type->str)?type->str:"void*",argnum); @@ -2946,6 +2937,54 @@ static swig_module_info swig_module = {swig_types, 236, 0, 0, 0, 0}; #define SWIG_LUACODE luaopen_lldb_luacode +#ifdef __cplusplus +#include +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigSmartPointer { + T *ptr; + SwigSmartPointer(T *p) : ptr(p) { } + ~SwigSmartPointer() { delete ptr; } + SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } +#if __cplusplus >=201103L + SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } + operator T&&() const { return std::move(*pointer.ptr); } +#else + operator T&() const { return *pointer.ptr; } +#endif + T *operator&() const { return pointer.ptr; } + static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } +}; + +/* + * SwigValueInit() is a generic initialisation solution as the following approach: + * + * T c_result = T(); + * + * doesn't compile for all types for example: + * + * unsigned int c_result = unsigned int(); + */ +template T SwigValueInit() { + return T(); +} + +#if __cplusplus >=201103L +# define SWIG_STD_MOVE(OBJ) std::move(OBJ) +#else +# define SWIG_STD_MOVE(OBJ) OBJ +#endif + +#endif + + namespace swig { typedef struct{} LANGUAGE_OBJ; } @@ -3747,39 +3786,39 @@ static int LLDBSwigLuaCloseFileHandle(lua_State * L) { extern "C" { #endif static int _wrap_new_string__SWIG_0(lua_State* L) { - int SWIG_arg = 0; - std::string *result = 0 ; - - SWIG_check_num_args("std::string::string",0,0) - result = (std::string *)new std::string(); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_std__string,1); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: + { + int SWIG_arg = 0; + std::string *result = 0 ; + + SWIG_check_num_args("std::string::string",0,0) + result = (std::string *)new std::string(); + SWIG_NewPointerObj(L,result,SWIGTYPE_p_std__string,1); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; + } lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_new_string__SWIG_1(lua_State* L) { - int SWIG_arg = 0; - char *arg1 = (char *) 0 ; - std::string *result = 0 ; - - SWIG_check_num_args("std::string::string",1,1) - if(!SWIG_lua_isnilstring(L,1)) SWIG_fail_arg("std::string::string",1,"char const *"); - arg1 = (char *)lua_tostring(L, 1); - result = (std::string *)new std::string((char const *)arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_std__string,1); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: + { + int SWIG_arg = 0; + char *arg1 = (char *) 0 ; + std::string *result = 0 ; + + SWIG_check_num_args("std::string::string",1,1) + if(!SWIG_lua_isnilstring(L,1)) SWIG_fail_arg("std::string::string",1,"char const *"); + arg1 = (char *)lua_tostring(L, 1); + result = (std::string *)new std::string((char const *)arg1); + SWIG_NewPointerObj(L,result,SWIGTYPE_p_std__string,1); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; + } lua_error(L); - return SWIG_arg; + return 0; } @@ -3794,7 +3833,7 @@ static int _wrap_new_string(lua_State* L) { return _wrap_new_string__SWIG_0(L); } if (argc == 1) { - int _v; + int _v = 0; { _v = SWIG_lua_isnilstring(L,argv[0]); } @@ -3812,148 +3851,148 @@ static int _wrap_new_string(lua_State* L) { static int _wrap_string_size(lua_State* L) { - int SWIG_arg = 0; - std::string *arg1 = (std::string *) 0 ; - unsigned int result; - - SWIG_check_num_args("std::string::size",1,1) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::size",1,"std::string const *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ - SWIG_fail_ptr("string_size",1,SWIGTYPE_p_std__string); + { + int SWIG_arg = 0; + std::string *arg1 = (std::string *) 0 ; + unsigned int result; + + SWIG_check_num_args("std::string::size",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::size",1,"std::string const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ + SWIG_fail_ptr("string_size",1,SWIGTYPE_p_std__string); + } + + result = (unsigned int)((std::string const *)arg1)->size(); + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; } - - result = (unsigned int)((std::string const *)arg1)->size(); - lua_pushnumber(L, (lua_Number) result); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_string_length(lua_State* L) { - int SWIG_arg = 0; - std::string *arg1 = (std::string *) 0 ; - unsigned int result; - - SWIG_check_num_args("std::string::length",1,1) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::length",1,"std::string const *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ - SWIG_fail_ptr("string_length",1,SWIGTYPE_p_std__string); + { + int SWIG_arg = 0; + std::string *arg1 = (std::string *) 0 ; + unsigned int result; + + SWIG_check_num_args("std::string::length",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::length",1,"std::string const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ + SWIG_fail_ptr("string_length",1,SWIGTYPE_p_std__string); + } + + result = (unsigned int)((std::string const *)arg1)->length(); + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; } - - result = (unsigned int)((std::string const *)arg1)->length(); - lua_pushnumber(L, (lua_Number) result); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_string_empty(lua_State* L) { - int SWIG_arg = 0; - std::string *arg1 = (std::string *) 0 ; - bool result; - - SWIG_check_num_args("std::string::empty",1,1) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::empty",1,"std::string const *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ - SWIG_fail_ptr("string_empty",1,SWIGTYPE_p_std__string); + { + int SWIG_arg = 0; + std::string *arg1 = (std::string *) 0 ; + bool result; + + SWIG_check_num_args("std::string::empty",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::empty",1,"std::string const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ + SWIG_fail_ptr("string_empty",1,SWIGTYPE_p_std__string); + } + + result = (bool)((std::string const *)arg1)->empty(); + lua_pushboolean(L,(int)(result!=0)); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; } - - result = (bool)((std::string const *)arg1)->empty(); - lua_pushboolean(L,(int)(result!=0)); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_string_c_str(lua_State* L) { - int SWIG_arg = 0; - std::string *arg1 = (std::string *) 0 ; - char *result = 0 ; - - SWIG_check_num_args("std::string::c_str",1,1) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::c_str",1,"std::string const *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ - SWIG_fail_ptr("string_c_str",1,SWIGTYPE_p_std__string); + { + int SWIG_arg = 0; + std::string *arg1 = (std::string *) 0 ; + char *result = 0 ; + + SWIG_check_num_args("std::string::c_str",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::c_str",1,"std::string const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ + SWIG_fail_ptr("string_c_str",1,SWIGTYPE_p_std__string); + } + + result = (char *)((std::string const *)arg1)->c_str(); + lua_pushstring(L,(const char *)result); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; } - - result = (char *)((std::string const *)arg1)->c_str(); - lua_pushstring(L,(const char *)result); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_string_data(lua_State* L) { - int SWIG_arg = 0; - std::string *arg1 = (std::string *) 0 ; - char *result = 0 ; - - SWIG_check_num_args("std::string::data",1,1) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::data",1,"std::string const *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ - SWIG_fail_ptr("string_data",1,SWIGTYPE_p_std__string); + { + int SWIG_arg = 0; + std::string *arg1 = (std::string *) 0 ; + char *result = 0 ; + + SWIG_check_num_args("std::string::data",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::data",1,"std::string const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ + SWIG_fail_ptr("string_data",1,SWIGTYPE_p_std__string); + } + + result = (char *)((std::string const *)arg1)->data(); + lua_pushstring(L,(const char *)result); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; } - - result = (char *)((std::string const *)arg1)->data(); - lua_pushstring(L,(const char *)result); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_string_assign(lua_State* L) { - int SWIG_arg = 0; - std::string *arg1 = (std::string *) 0 ; - char *arg2 = (char *) 0 ; - - SWIG_check_num_args("std::string::assign",2,2) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::assign",1,"std::string *"); - if(!SWIG_lua_isnilstring(L,2)) SWIG_fail_arg("std::string::assign",2,"char const *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ - SWIG_fail_ptr("string_assign",1,SWIGTYPE_p_std__string); + { + int SWIG_arg = 0; + std::string *arg1 = (std::string *) 0 ; + char *arg2 = (char *) 0 ; + + SWIG_check_num_args("std::string::assign",2,2) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("std::string::assign",1,"std::string *"); + if(!SWIG_lua_isnilstring(L,2)) SWIG_fail_arg("std::string::assign",2,"char const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_std__string,0))){ + SWIG_fail_ptr("string_assign",1,SWIGTYPE_p_std__string); + } + + arg2 = (char *)lua_tostring(L, 2); + (arg1)->assign((char const *)arg2); + + return SWIG_arg; + + fail: SWIGUNUSED; } - - arg2 = (char *)lua_tostring(L, 2); - (arg1)->assign((char const *)arg2); - - return SWIG_arg; - - if(0) SWIG_fail; - -fail: lua_error(L); - return SWIG_arg; + return 0; } @@ -4011,99 +4050,99 @@ static const char *swig_string_base_names[] = {0}; static swig_lua_class _wrap_class_string = { "string", "string", &SWIGTYPE_p_std__string,_proxy__wrap_new_string, swig_delete_string, swig_string_methods, swig_string_attributes, &swig_string_Sf_SwigStatic, swig_string_meta, swig_string_bases, swig_string_base_names }; static int _wrap_new_SBAddress__SWIG_0(lua_State* L) { - int SWIG_arg = 0; - lldb::SBAddress *result = 0 ; - - SWIG_check_num_args("lldb::SBAddress::SBAddress",0,0) - result = (lldb::SBAddress *)new lldb::SBAddress(); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_lldb__SBAddress,1); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: + { + int SWIG_arg = 0; + lldb::SBAddress *result = 0 ; + + SWIG_check_num_args("lldb::SBAddress::SBAddress",0,0) + result = (lldb::SBAddress *)new lldb::SBAddress(); + SWIG_NewPointerObj(L,result,SWIGTYPE_p_lldb__SBAddress,1); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; + } lua_error(L); - return SWIG_arg; + return 0; } static int _wrap_new_SBAddress__SWIG_1(lua_State* L) { - int SWIG_arg = 0; - lldb::SBAddress *arg1 = 0 ; - lldb::SBAddress *result = 0 ; - - SWIG_check_num_args("lldb::SBAddress::SBAddress",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("lldb::SBAddress::SBAddress",1,"lldb::SBAddress const &"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_lldb__SBAddress,0))){ - SWIG_fail_ptr("new_SBAddress",1,SWIGTYPE_p_lldb__SBAddress); + { + int SWIG_arg = 0; + lldb::SBAddress *arg1 = 0 ; + lldb::SBAddress *result = 0 ; + + SWIG_check_num_args("lldb::SBAddress::SBAddress",1,1) + if(!lua_isuserdata(L,1)) SWIG_fail_arg("lldb::SBAddress::SBAddress",1,"lldb::SBAddress const &"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_lldb__SBAddress,0))){ + SWIG_fail_ptr("new_SBAddress",1,SWIGTYPE_p_lldb__SBAddress); + } + + result = (lldb::SBAddress *)new lldb::SBAddress((lldb::SBAddress const &)*arg1); + SWIG_NewPointerObj(L,result,SWIGTYPE_p_lldb__SBAddress,1); SWIG_arg++; + return SWIG_arg; + + fail: SWIGUNUSED; } - - result = (lldb::SBAddress *)new lldb::SBAddress((lldb::SBAddress const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_lldb__SBAddress,1); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; *** 96857 LINES SKIPPED *** From nobody Sun Jul 23 18:27:14 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 4R8BbR0lKjz4p6Rm; Sun, 23 Jul 2023 18:27:15 +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 4R8BbQ67Xxz3h5T; Sun, 23 Jul 2023 18:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136835; 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=MKQQCEkccWqje4DtWdj/veZYKsh9a5pQUbbeDEjgIGg=; b=jWay97TjbyWtKr4IvSkpYao66IXBLjr1Put++3ZHVZ8unbI8dZDYzjHPf9qj/eHYCvRIcs vmbxWC4Cz+7QXzPbRYQ7kJ/q+F05wOdH2Ze+CGfHmKatMBN24tFBHmM92rg0rnhVbinmRD qs6xYL6wlbHvgnw07qcbVUneCUzz625TB69POlDL2s/2e36r/jb78IfXMtOKx+7mhdwKhh NYUaW+4ourGk/e4FFUezUqj9TnfiV0eprNfbIV0w5NVdFgzBwN5ZrBHw3r9f04xqpEhj2j QVwLwFEd0mrZRnRMkEKbwa6OSysBwuXCQQkHkqlTRKOLuw01vbxeJG31omY80g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136835; 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=MKQQCEkccWqje4DtWdj/veZYKsh9a5pQUbbeDEjgIGg=; b=E3TZy0NWrBF5ZE9IQ2geNv+e+BxeZrlWoemFlcmZJh2q/+tae9eohGEspZAjfZC3F+cjle weY+Yx4UMVn0YoVdrecjBRJauceXmhdbQdtCIky9q0zlDga5eQVafyO9qHlYqG6NlOH7l6 UarhnZifl5BJ3EVdOl7BoRv5WFk0K7ErNxzA0QHMtkuaUfI8IH9pSxtXA5ovw354q65RnY t0CDVFtKuyk/1KL9CuXMr6XPZsqQqSaBoW3YlJ8Yl/SSk0R/CzdiNcme0/X0W3qJpuFmmu rOHA2mXAHOXw9456eR/lhd+v68r7aa2TDGxMxyDYZJScGJdnkhFRttsv/UXeug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136835; a=rsa-sha256; cv=none; b=M49OjxQsmOVdLMqe0BTQd+Ao5ue2Gea40CQt7pTG54NQ0jZKffWQYDbPLRavHz/Nli1rzD /5tR2MbQvctwFdouVUGhWBXmFIpe8n2mkpfDbbIBoVFn8ka9CWWQ0oaL8mW/6TXa74Rtsa 4ziCweDJAGIQs0OHUahDqRJiZmVJBtVVb9lHStkoTLQPQ/kU9xGcK7gha7sH4a8hPnsr6q Oc/voc57TB06o1OPb0H2tGtcXT6UsjK+JfJY1Doq4g24sy/RK2Cy2bs9b1X2I1T84DeYyQ 0IUgAmCY8GJtxcYHQUygMUZ3L72aNvKeqzsyYnbAfc7rwjwfg6WPwuSMNsAMYg== 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 4R8BbQ4zxSzmVV; Sun, 23 Jul 2023 18:27:14 +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 36NIRE1W058862; Sun, 23 Jul 2023 18:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIREob058861; Sun, 23 Jul 2023 18:27:14 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:14 GMT Message-Id: <202307231827.36NIREob058861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b2acc21dfbd6 - stable/13 - Bump __FreeBSD_version for llvm 16.0.6 merge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b2acc21dfbd6fab28b1715c775b43d4914b75e0c Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b2acc21dfbd6fab28b1715c775b43d4914b75e0c commit b2acc21dfbd6fab28b1715c775b43d4914b75e0c Author: Dimitry Andric AuthorDate: 2023-06-22 18:24:04 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:11 +0000 Bump __FreeBSD_version for llvm 16.0.6 merge PR: 271047 MFC after: 1 month (cherry picked from commit a681cba16d8967651a2146385ce44a2bfeb1c4c3) --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 6a0328d8aa45..3feedc5c5ca8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1302506 /* Master, propagated to newvers */ +#define __FreeBSD_version 1302507 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Jul 23 18:27:15 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 4R8BbS2GFDz4p6L0; Sun, 23 Jul 2023 18:27:16 +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 4R8BbS0dSrz3hGS; Sun, 23 Jul 2023 18:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136836; 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=gLKwc5RWuSxiQ1NRMMbp5cj+SrbZ2J6bOMajpN6Aukw=; b=shb0d+AihSqawDMi+DYxbY7IF0a16gtD/jFT8S9iKDrbTc37YzApEAS15u4WZPK2KJTyXw JX+G+UEFWOxMU9SmMN3KUeDcSgqASjQdqAUIQMXwuvs6FkKwYkymRWDHo5e1mt+2EqkmpW 1v1PLkHZODdYWr3JQeVagpd//XCPcnw02IXWv7+zCXNPIgWfmUPHRsL/LqTofqhq7pncwD WNoHOtNI9g34falbhyc/TA1tpRjgNIl8wRQdTXK68w1T/J8FC6MJlExqWNzzfp2s5ZrrqH lzz8m3JWtOcLczdA8pPTWFwbNZ1eAoOZ7Z8OWKTpIWst5jdY+l1jCAEPJDMOAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136836; 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=gLKwc5RWuSxiQ1NRMMbp5cj+SrbZ2J6bOMajpN6Aukw=; b=gKUw3k+bois7lW2pbUqb9m8ixE5mkROhwLJZQmUalUtJjiuSDweK4+Wh9Y7h1zBarPj/VQ TXvMcMD/XgFiTgXZgH5alIorn/n1OdSbV0IDSsrFC6NBTqSkc3JE1pEG4luYp5fB+T/bYt DjVXGTLyADyz9OuIE5U1ga1XKVUH5DKNVMoEXUbOX8ETvzs9N7p2I9JeuuacfVmqBCHBo4 N6chVyKKnlMsEY/8Om8UsvKESVAgoY13h+xGcxPMvVc+SrETQfvmgSYKrR+qhtAHgzq2QM gtHlgZLp42oUUfn/fhWe2L7kofpceLmuTpZbgpt1oCtiIXXpvyYl2+iSr+d5bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136836; a=rsa-sha256; cv=none; b=In0Idb7dom2s7kOHHLUBN3ZH3cWViu1Sbhj09pkDcCoeaD5O6CO7d3dOFwMuNuNUgw7LFJ Iyz5bY4c0MpXQtDTlzdHRBxzNOAAtIX5/wF46ONXe71iPR+nXepV8Ur0E5ljAhxA6VsNDb mpwJ1QmuYRqbw/ZmPjJjXdW9CIwGZogh1CZ8JeZcWrzpo6X2NU+9/xsIeORHDDvSIKDODr dUW1jpVzdFaRimMNUZac/s65GY9JCtxQpxubmVmpGO6HKLeYsJoCU8P44iBf5KESSMgrgC PCbP2E9iWSN23WlNemiEABIHYG7DyKx6JVRMrNEUepu+FN1kDY+sVP3JJAj5qw== 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 4R8BbR5xSLzmhk; Sun, 23 Jul 2023 18:27:15 +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 36NIRFN7058882; Sun, 23 Jul 2023 18:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRF8X058881; Sun, 23 Jul 2023 18:27:15 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:15 GMT Message-Id: <202307231827.36NIRF8X058881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 95955fb872c6 - stable/13 - Merge commit fde5924dcc69 from llvm-project (by Serge Pavlov): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95955fb872c6a51ff18804b93a2065185955c2a0 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=95955fb872c6a51ff18804b93a2065185955c2a0 commit 95955fb872c6a51ff18804b93a2065185955c2a0 Author: Dimitry Andric AuthorDate: 2023-07-13 18:57:22 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:12 +0000 Merge commit fde5924dcc69 from llvm-project (by Serge Pavlov): [clang] Reset FP options before template instantiation AST nodes that may depend on FP options keep them as a difference relative to the options outside the AST node. At the moment of instantiation the FP options may be different from the default values, defined by command-line option. In such case FP attributes would have unexpected values. For example, the code: template void func_01(int last, C) { func_01(last, int()); } void func_02() { func_01(0, 1); } #pragma STDC FENV_ACCESS ON caused compiler crash, because template instantiation takes place at the end of translation unit, where pragma STDC FENV_ACCESS is in effect. As a result, code in the template instantiation would use constrained intrinsics while the function does not have StrictFP attribute. To solve this problem, FP attributes in Sema must be set to default values, defined by command line options. This change resolves https://github.com/llvm/llvm-project/issues/63542. Differential Revision: https://reviews.llvm.org/D154359 Requested by: pkubaj PR: 265755, 265758 MFC after: 1 month (cherry picked from commit 1cd9788408aa9ea4fd0fbc3e06bd9a4eaf8d8d22) --- contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 7a0da8d08333..bed5237749c5 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -5057,6 +5057,10 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation, // PushDeclContext because we don't have a scope. Sema::ContextRAII savedContext(*this, Function); + FPFeaturesStateRAII SavedFPFeatures(*this); + CurFPFeatures = FPOptions(getLangOpts()); + FpPragmaStack.CurrentValue = FPOptionsOverride(); + if (addInstantiatedParametersToScope(Function, PatternDecl, Scope, TemplateArgs)) return; From nobody Sun Jul 23 18:27:16 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 4R8BbT3Nbcz4p6Fc; Sun, 23 Jul 2023 18:27:17 +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 4R8BbT12zHz3hJZ; Sun, 23 Jul 2023 18:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136837; 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=Q8aujw4Zmj9WsfGnznLeShKjz0SEOKRPgoorR1Y2T6I=; b=XQYoT4VfWF8nbr/goG/idakG+QNzeGqCHAcC7L49RMAuSYDBSu1L10lECpxoME44Bui+7B HPiKnjUJxbmI3I1LpQ60/xRbr7F4UJb2xBST3dVFoZCzy8qfXyX110cBchiWXbeuGW6ReI NFrbudlBVilMdKTadfJr8NhiZX9GppzQMTS68WF/24w+FvSB4kYgcm7Fs5mvVB5PLlVP4X g84IQmpd4jf9I+Vk4fBM8+h1SzQe0xAOxFscG/V2arvW3bQp1FmU5rqvbdKLjKjsKOXsiF ZbUn3AYjLJYgu6S884M5C+b9cAVgjAJMyfHzPWiMqqSRJwNv6dCZuiwV+XeZuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136837; 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=Q8aujw4Zmj9WsfGnznLeShKjz0SEOKRPgoorR1Y2T6I=; b=lOCzkvWLurmYJMXtsXa79JYHRJ6ZcASg9sKfXQ3tODqy0pG2irQLHaGKfKe4tnH+HIyYfJ BuxxasA+PRWtTVnXJFLI4GKbDGlr99XXvsSrP7au9vYdWZXOjXifKSfPOopdInrffnXbCW 2Sb3Ed0CpUE0IJqgNJT8g9kcUwoi6k4YOb1PwsSs1Rq9ZhfBM66q8bID6vkvGI8Jfnx/lQ Luvx0rOoQOHXCTyufjyVC6eq34imMI64h1aA6LvucakubQaAkqWNEQ//ESq+l+F/+0vBwz OTWkEfg+8Hn/v2PGDHZq3/Y8I1yIR05+OCSxOZ8L12iKsFkvU3nVzNv9exg3KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136837; a=rsa-sha256; cv=none; b=K5qGX2+D5x1makwiFyseRPiV4P652TJPfNlDUD2w5WUmu73avsDPVvpY5ooCXuZ5WwsUxy gGhr5jYT4c0kyf8w9UOwoUgS0tnKLB03hDfKmHx9aotiXAss+ltZrhXMs74Ov6Hk/cKJSj /OeyXZc9D+3jIjaoJuBaLBYtRoXQvHfXcUWDtUOuEpdrfUmHVZtdrXSwm0PVJlKdykjaXz nJ9YV+4jkNFIOQ0Kd/x4qUjuAIY6NfqDmx+toyCEyVaHgQz9MB9C4cDR61ciSKIif9FEb4 IJ8heEo+j/+0iVgYYbFxIj5lHrkTYKKMnX1dedufsG41ar4gQbLAJMKOR6vpYA== 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 4R8BbS6q5zzmyR; Sun, 23 Jul 2023 18:27:16 +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 36NIRGpr058905; Sun, 23 Jul 2023 18:27:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRGgj058904; Sun, 23 Jul 2023 18:27:16 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:16 GMT Message-Id: <202307231827.36NIRGgj058904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5a9c8bd8e730 - stable/13 - Merge commit 8757ce490130 from llvm-project (by Simon Pilgrim): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a9c8bd8e730f74aa774ceef5ee8d3aa95f715d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5a9c8bd8e730f74aa774ceef5ee8d3aa95f715d1 commit 5a9c8bd8e730f74aa774ceef5ee8d3aa95f715d1 Author: Dimitry Andric AuthorDate: 2023-07-16 18:45:29 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:12 +0000 Merge commit 8757ce490130 from llvm-project (by Simon Pilgrim): [PowerPC] Replace PPCISD::VABSD cases with generic ISD::ABDU(X,Y) node A move towards using the generic ISD::ABDU nodes on more backends Also support ISD::ABDS for v4i32 types using the existing signbit flip trick PowerPC has a select(icmp_ugt(x,y),sub(x,y),sub(y,x)) -> abdu(x,y) combine that I intend to move to DAGCombiner in a future patch. The ABS(SUB(X,Y)) -> PPCISD::VABSD(X,Y,1) v4i32 combine wasn't legal (https://alive2.llvm.org/ce/z/jc2hLU) - so I've removed it, having already added the legal sub nsw tests equivalent. Differential Revision: https://reviews.llvm.org/D142313 This fixes a "Wasn't expecting to be able to lower this!" fatal error when compiling graphics/opencv for PowerPC. Requested by: pkubaj PR: 271047 MFC after: 1 month (cherry picked from commit 881fc203567e85648f2f591a75c4674be2bee0ed) --- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 85 ++++------------------ .../llvm/lib/Target/PowerPC/PPCISelLowering.h | 16 ---- .../llvm/lib/Target/PowerPC/PPCInstrVSX.td | 23 +++--- 3 files changed, 24 insertions(+), 100 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index 77630cf027fa..cf1cdad3fee6 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -1299,6 +1299,11 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM, setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v2i16, Legal); setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v2i32, Legal); setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::v2i64, Legal); + + setOperationAction(ISD::ABDU, MVT::v16i8, Legal); + setOperationAction(ISD::ABDU, MVT::v8i16, Legal); + setOperationAction(ISD::ABDU, MVT::v4i32, Legal); + setOperationAction(ISD::ABDS, MVT::v4i32, Legal); } if (Subtarget.hasP10Vector()) { @@ -1386,7 +1391,7 @@ PPCTargetLowering::PPCTargetLowering(const PPCTargetMachine &TM, } if (Subtarget.hasP9Altivec()) { - setTargetDAGCombine({ISD::ABS, ISD::VSELECT}); + setTargetDAGCombine({ISD::VSELECT}); } setLibcallName(RTLIB::LOG_F128, "logf128"); @@ -1743,7 +1748,6 @@ const char *PPCTargetLowering::getTargetNodeName(unsigned Opcode) const { case PPCISD::RFEBB: return "PPCISD::RFEBB"; case PPCISD::XXSWAPD: return "PPCISD::XXSWAPD"; case PPCISD::SWAP_NO_CHAIN: return "PPCISD::SWAP_NO_CHAIN"; - case PPCISD::VABSD: return "PPCISD::VABSD"; case PPCISD::BUILD_FP128: return "PPCISD::BUILD_FP128"; case PPCISD::BUILD_SPE64: return "PPCISD::BUILD_SPE64"; case PPCISD::EXTRACT_SPE: return "PPCISD::EXTRACT_SPE"; @@ -16008,8 +16012,6 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N, } case ISD::BUILD_VECTOR: return DAGCombineBuildVector(N, DCI); - case ISD::ABS: - return combineABS(N, DCI); case ISD::VSELECT: return combineVSelect(N, DCI); } @@ -17437,24 +17439,6 @@ SDValue PPCTargetLowering::combineTRUNCATE(SDNode *N, SDLoc dl(N); SDValue Op0 = N->getOperand(0); - // fold (truncate (abs (sub (zext a), (zext b)))) -> (vabsd a, b) - if (Subtarget.hasP9Altivec() && Op0.getOpcode() == ISD::ABS) { - EVT VT = N->getValueType(0); - if (VT != MVT::v4i32 && VT != MVT::v8i16 && VT != MVT::v16i8) - return SDValue(); - SDValue Sub = Op0.getOperand(0); - if (Sub.getOpcode() == ISD::SUB) { - SDValue SubOp0 = Sub.getOperand(0); - SDValue SubOp1 = Sub.getOperand(1); - if ((SubOp0.getOpcode() == ISD::ZERO_EXTEND) && - (SubOp1.getOpcode() == ISD::ZERO_EXTEND)) { - return DCI.DAG.getNode(PPCISD::VABSD, dl, VT, SubOp0.getOperand(0), - SubOp1.getOperand(0), - DCI.DAG.getTargetConstant(0, dl, MVT::i32)); - } - } - } - // Looking for a truncate of i128 to i64. if (Op0.getValueType() != MVT::i128 || N->getValueType(0) != MVT::i64) return SDValue(); @@ -17664,54 +17648,12 @@ isMaskAndCmp0FoldingBeneficial(const Instruction &AndI) const { return true; } -// Transform (abs (sub (zext a), (zext b))) to (vabsd a b 0) -// Transform (abs (sub (zext a), (zext_invec b))) to (vabsd a b 0) -// Transform (abs (sub (zext_invec a), (zext_invec b))) to (vabsd a b 0) -// Transform (abs (sub (zext_invec a), (zext b))) to (vabsd a b 0) -// Transform (abs (sub a, b) to (vabsd a b 1)) if a & b of type v4i32 -SDValue PPCTargetLowering::combineABS(SDNode *N, DAGCombinerInfo &DCI) const { - assert((N->getOpcode() == ISD::ABS) && "Need ABS node here"); - assert(Subtarget.hasP9Altivec() && - "Only combine this when P9 altivec supported!"); - EVT VT = N->getValueType(0); - if (VT != MVT::v4i32 && VT != MVT::v8i16 && VT != MVT::v16i8) - return SDValue(); - - SelectionDAG &DAG = DCI.DAG; - SDLoc dl(N); - if (N->getOperand(0).getOpcode() == ISD::SUB) { - // Even for signed integers, if it's known to be positive (as signed - // integer) due to zero-extended inputs. - unsigned SubOpcd0 = N->getOperand(0)->getOperand(0).getOpcode(); - unsigned SubOpcd1 = N->getOperand(0)->getOperand(1).getOpcode(); - if ((SubOpcd0 == ISD::ZERO_EXTEND || - SubOpcd0 == ISD::ZERO_EXTEND_VECTOR_INREG) && - (SubOpcd1 == ISD::ZERO_EXTEND || - SubOpcd1 == ISD::ZERO_EXTEND_VECTOR_INREG)) { - return DAG.getNode(PPCISD::VABSD, dl, N->getOperand(0).getValueType(), - N->getOperand(0)->getOperand(0), - N->getOperand(0)->getOperand(1), - DAG.getTargetConstant(0, dl, MVT::i32)); - } - - // For type v4i32, it can be optimized with xvnegsp + vabsduw - if (N->getOperand(0).getValueType() == MVT::v4i32 && - N->getOperand(0).hasOneUse()) { - return DAG.getNode(PPCISD::VABSD, dl, N->getOperand(0).getValueType(), - N->getOperand(0)->getOperand(0), - N->getOperand(0)->getOperand(1), - DAG.getTargetConstant(1, dl, MVT::i32)); - } - } - - return SDValue(); -} - // For type v4i32/v8ii16/v16i8, transform -// from (vselect (setcc a, b, setugt), (sub a, b), (sub b, a)) to (vabsd a, b) -// from (vselect (setcc a, b, setuge), (sub a, b), (sub b, a)) to (vabsd a, b) -// from (vselect (setcc a, b, setult), (sub b, a), (sub a, b)) to (vabsd a, b) -// from (vselect (setcc a, b, setule), (sub b, a), (sub a, b)) to (vabsd a, b) +// from (vselect (setcc a, b, setugt), (sub a, b), (sub b, a)) to (abdu a, b) +// from (vselect (setcc a, b, setuge), (sub a, b), (sub b, a)) to (abdu a, b) +// from (vselect (setcc a, b, setult), (sub b, a), (sub a, b)) to (abdu a, b) +// from (vselect (setcc a, b, setule), (sub b, a), (sub a, b)) to (abdu a, b) +// TODO: Move this to DAGCombiner? SDValue PPCTargetLowering::combineVSelect(SDNode *N, DAGCombinerInfo &DCI) const { assert((N->getOpcode() == ISD::VSELECT) && "Need VSELECT node here"); @@ -17762,9 +17704,8 @@ SDValue PPCTargetLowering::combineVSelect(SDNode *N, TrueOpnd.getOperand(1) == CmpOpnd2 && FalseOpnd.getOperand(0) == CmpOpnd2 && FalseOpnd.getOperand(1) == CmpOpnd1) { - return DAG.getNode(PPCISD::VABSD, dl, N->getOperand(1).getValueType(), - CmpOpnd1, CmpOpnd2, - DAG.getTargetConstant(0, dl, MVT::i32)); + return DAG.getNode(ISD::ABDU, dl, N->getOperand(1).getValueType(), CmpOpnd1, + CmpOpnd2, DAG.getTargetConstant(0, dl, MVT::i32)); } return SDValue(); diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.h b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.h index b80479427c2e..1a01cadbeedb 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.h +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.h @@ -440,21 +440,6 @@ namespace llvm { /// and thereby have no chain. SWAP_NO_CHAIN, - /// An SDNode for Power9 vector absolute value difference. - /// operand #0 vector - /// operand #1 vector - /// operand #2 constant i32 0 or 1, to indicate whether needs to patch - /// the most significant bit for signed i32 - /// - /// Power9 VABSD* instructions are designed to support unsigned integer - /// vectors (byte/halfword/word), if we want to make use of them for signed - /// integer vectors, we have to flip their sign bits first. To flip sign bit - /// for byte/halfword integer vector would become inefficient, but for word - /// integer vector, we can leverage XVNEGSP to make it efficiently. eg: - /// abs(sub(a,b)) => VABSDUW(a+0x80000000, b+0x80000000) - /// => VABSDUW((XVNEGSP a), (XVNEGSP b)) - VABSD, - /// FP_EXTEND_HALF(VECTOR, IDX) - Custom extend upper (IDX=0) half or /// lower (IDX=1) half of v4f32 to v2f64. FP_EXTEND_HALF, @@ -1422,7 +1407,6 @@ namespace llvm { SDValue combineFMALike(SDNode *N, DAGCombinerInfo &DCI) const; SDValue combineTRUNCATE(SDNode *N, DAGCombinerInfo &DCI) const; SDValue combineSetCC(SDNode *N, DAGCombinerInfo &DCI) const; - SDValue combineABS(SDNode *N, DAGCombinerInfo &DCI) const; SDValue combineVSelect(SDNode *N, DAGCombinerInfo &DCI) const; SDValue combineVectorShuffle(ShuffleVectorSDNode *SVN, SelectionDAG &DAG) const; diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrVSX.td b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrVSX.td index 3c742075b111..2e52fbd3c333 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrVSX.td +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstrVSX.td @@ -76,9 +76,6 @@ def SDT_PPCxxswapd : SDTypeProfile<1, 1, [ def SDTVecConv : SDTypeProfile<1, 2, [ SDTCisVec<0>, SDTCisVec<1>, SDTCisPtrTy<2> ]>; -def SDTVabsd : SDTypeProfile<1, 3, [ - SDTCisVec<0>, SDTCisSameAs<0, 1>, SDTCisSameAs<0, 2>, SDTCisVT<3, i32> -]>; def SDT_PPCld_vec_be : SDTypeProfile<1, 1, [ SDTCisVec<0>, SDTCisPtrTy<1> ]>; @@ -105,7 +102,6 @@ def PPCmtvsrz : SDNode<"PPCISD::MTVSRZ", SDTUnaryOp, []>; def PPCsvec2fp : SDNode<"PPCISD::SINT_VEC_TO_FP", SDTVecConv, []>; def PPCuvec2fp: SDNode<"PPCISD::UINT_VEC_TO_FP", SDTVecConv, []>; def PPCswapNoChain : SDNode<"PPCISD::SWAP_NO_CHAIN", SDT_PPCxxswapd>; -def PPCvabsd : SDNode<"PPCISD::VABSD", SDTVabsd, []>; def PPCfpexth : SDNode<"PPCISD::FP_EXTEND_HALF", SDT_PPCfpexth, []>; def PPCldvsxlh : SDNode<"PPCISD::LD_VSX_LH", SDT_PPCldvsxlh, @@ -4808,20 +4804,23 @@ def : Pat<(f128 (uint_to_fp (i32 (PPCmfvsr f64:$src)))), // Any Power9 VSX subtarget that supports Power9 Altivec. let Predicates = [HasVSX, HasP9Altivec] in { -// Put this P9Altivec related definition here since it's possible to be -// selected to VSX instruction xvnegsp, avoid possible undef. -def : Pat<(v4i32 (PPCvabsd v4i32:$A, v4i32:$B, (i32 0))), +// Unsigned absolute-difference. +def : Pat<(v4i32 (abdu v4i32:$A, v4i32:$B)), (v4i32 (VABSDUW $A, $B))>; -def : Pat<(v8i16 (PPCvabsd v8i16:$A, v8i16:$B, (i32 0))), +def : Pat<(v8i16 (abdu v8i16:$A, v8i16:$B)), (v8i16 (VABSDUH $A, $B))>; -def : Pat<(v16i8 (PPCvabsd v16i8:$A, v16i8:$B, (i32 0))), +def : Pat<(v16i8 (abdu v16i8:$A, v16i8:$B)), (v16i8 (VABSDUB $A, $B))>; -// As PPCVABSD description, the last operand indicates whether do the -// sign bit flip. -def : Pat<(v4i32 (PPCvabsd v4i32:$A, v4i32:$B, (i32 1))), +// Signed absolute-difference. +// Power9 VABSD* instructions are designed to support unsigned integer +// vectors (byte/halfword/word), if we want to make use of them for signed +// integer vectors, we have to flip their sign bits first. To flip sign bit +// for byte/halfword integer vector would become inefficient, but for word +// integer vector, we can leverage XVNEGSP to make it efficiently. +def : Pat<(v4i32 (abds v4i32:$A, v4i32:$B)), (v4i32 (VABSDUW (XVNEGSP $A), (XVNEGSP $B)))>; } // HasVSX, HasP9Altivec From nobody Sun Jul 23 18:27:17 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 4R8BbW0LR0z4p6S2; Sun, 23 Jul 2023 18:27:19 +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 4R8BbV2jDgz3hRm; Sun, 23 Jul 2023 18:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136838; 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=rqV3DkKaiBsSI7PhL1Ijl7qQXHihMIkKZEDQ6y94cgQ=; b=vx45YMT5fd6xv3zb5WeYHHOTEyXQlO7/gNfOTnCk5AJDh8cfOoC2EDaa63vjiwGaP3XIKk 7pG8usOo1ZR4pBDHpNftJCyrtH3jSOrNapfgYLrbWGnR/yoCNHSAeyn2co3XYODTpNH+cj WPszDvjBYViz3o4v2/J/B24I6XkQJPhF8SLzXG4yfBegW5Ju7hD+ykFYLlqboM2oUP59xI eKi5WX55NI+IyNRQnV/f3cCUKHUCq0ToR5RDFeq+3IH4mqKuQXDSOfUe/foe+ZnpXU/5m+ 5zzzD2c8QQOhRv1HcpHc2piIhOgea1OQeMpnNTnbh0XWgIx9c4E2LsIEYCkhnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136838; 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=rqV3DkKaiBsSI7PhL1Ijl7qQXHihMIkKZEDQ6y94cgQ=; b=NonZ79D8bbDzJLvXlg13cS82Tb5MGZxsGgUpWuTeErGd4Hzky1up/7CphQTbDspb7hVbxc pMe+hFR1GCbuqGc/y1koKTDZxmwgm3BYgoFW22HjNW++cDAM8gZcO0qUkSyUpo4TcbPoP0 HwAEFjGGb6I2GfHFffvEdPlY9PWbhT2GAnwr8mqMGUkhqNDK9eakI6m1k5cDVdo2IA0tkc H9PsLJ2uZEWUTed92Zz7cbX5LPkDlBikLmchPC80uHDy8rxR7n4xXnUP4wt3kKHdtzaO8r CpAlaZ/3co9s6to/4mzG9PHtNpP+Cmm83q+PtLj5SRt4ZA5UQSQTHCad0/ACLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136838; a=rsa-sha256; cv=none; b=r7YVNk7hesea79aFLRY3Qv2O5WXXe8g+Rjdf/rGv1usO+z/PUmZZsZzI24v97zkprDAeGW P6i4lLQoeKEQg7UaPQoczYcbFYNAK6hqQHt2k+TfFWPu7v+JTE6ERzSH3zHKWhIGyBsz7Y 7501fUKMN4Y/Wcrc4a0Wz0EuDWdyLdJzOVTZryyIbqEtx277y6GmJalwm9SPsEp+3aB6ux wVrxrGwwWwYYj+VXZW+4vcmRvt43nZ5QpSsQw03cXn+rYyrFewwrotpUhsCHLNQdeMxm1h wF1tWvjV1mde6Hcslt5gsSelXVIuU0jgN7sae4FslJTYXqU+Fjb1AtbYRF4xnw== 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 4R8BbV0dn2zmhl; Sun, 23 Jul 2023 18:27:18 +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 36NIRHEA058928; Sun, 23 Jul 2023 18:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRHkC058927; Sun, 23 Jul 2023 18:27:17 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:17 GMT Message-Id: <202307231827.36NIRHkC058927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 784ed70844eb - stable/13 - Merge commit 9ca395b5ade1 from llvm-project (by Haojian Wu): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 784ed70844eb12f3b62dfc9e9f03b9bef97bee54 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=784ed70844eb12f3b62dfc9e9f03b9bef97bee54 commit 784ed70844eb12f3b62dfc9e9f03b9bef97bee54 Author: Dimitry Andric AuthorDate: 2023-07-19 09:18:50 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:12 +0000 Merge commit 9ca395b5ade1 from llvm-project (by Haojian Wu): [clang][AST] Propagate the contains-errors bit to DeclRefExpr from VarDecl's initializer. Similar to the https://reviews.llvm.org/D86048 (it only sets the bit for C++ code), we propagate the contains-errors bit for C-code path. Fixes https://github.com/llvm/llvm-project/issues/50236 Fixes https://github.com/llvm/llvm-project/issues/50243 Fixes https://github.com/llvm/llvm-project/issues/48636 Fixes https://github.com/llvm/llvm-project/issues/50320 Differential Revision: https://reviews.llvm.org/D154861 This fixes an assertion ('Assertion failed: ((LHSExpr->containsErrors() || RHSExpr->containsErrors()) && "Should only occur in error-recovery path."), function BuildBinOp') when building parts of dtrace in certain scenarios. Reported by: dstolfa PR: 271047 MFC after: 1 month (cherry picked from commit 8d0cab8800e19cddc56d4a532abdbe9f0ac6c620) --- contrib/llvm-project/clang/lib/AST/ComputeDependence.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/llvm-project/clang/lib/AST/ComputeDependence.cpp b/contrib/llvm-project/clang/lib/AST/ComputeDependence.cpp index eb9afbdb1c87..b5c783b07d92 100644 --- a/contrib/llvm-project/clang/lib/AST/ComputeDependence.cpp +++ b/contrib/llvm-project/clang/lib/AST/ComputeDependence.cpp @@ -489,7 +489,7 @@ ExprDependence clang::computeDependence(DeclRefExpr *E, const ASTContext &Ctx) { // more bullets here that we handle by treating the declaration as having a // dependent type if they involve a placeholder type that can't be deduced.] if (Type->isDependentType()) - return Deps | ExprDependence::TypeValueInstantiation; + Deps |= ExprDependence::TypeValueInstantiation; else if (Type->isInstantiationDependentType()) Deps |= ExprDependence::Instantiation; @@ -525,13 +525,13 @@ ExprDependence clang::computeDependence(DeclRefExpr *E, const ASTContext &Ctx) { // - it names a potentially-constant variable that is initialized with an // expression that is value-dependent if (const auto *Var = dyn_cast(Decl)) { - if (Var->mightBeUsableInConstantExpressions(Ctx)) { - if (const Expr *Init = Var->getAnyInitializer()) { - if (Init->isValueDependent()) - Deps |= ExprDependence::ValueInstantiation; - if (Init->containsErrors()) - Deps |= ExprDependence::Error; - } + if (const Expr *Init = Var->getAnyInitializer()) { + if (Init->containsErrors()) + Deps |= ExprDependence::Error; + + if (Var->mightBeUsableInConstantExpressions(Ctx) && + Init->isValueDependent()) + Deps |= ExprDependence::ValueInstantiation; } // - it names a static data member that is a dependent member of the From nobody Sun Jul 23 18:27:19 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 4R8BbW6CJKz4p6MP; Sun, 23 Jul 2023 18:27:19 +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 4R8BbW2c25z3hRw; Sun, 23 Jul 2023 18:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136839; 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=EYlxF6EH9WlgH/g9KyJXNOdy3bBmA9Wpy/uIgq7E3mE=; b=EQVl2GiB4aeWPwQXaRuASx+Qx2X2CDi4FnBV1jkpqNR7f/OKQD1ujb1182DW/iDcgtIYIi BTq3tMaJpZKv99iWKCLHURhy+sNofvimVrhkoT8VhAxuSVyOslSe4MTpZlpteOpmPVtXI7 bLvpj8kkWjXkjMG1G1lyI+CWt3Bj0iOakdaOOU6zRcOgqQ/XRQ4aWa8h6YfjZaLANlyNZA NFGWXsgWHr0Hpl3tW5nYkK/nW2lc6VWKXJeM6mnHAzZcXW/RCaBxTV+bcC5cXba2WGE5/Q dpMElsTXrQrCOWXAQnHTyZdI4R80APLRrT6fxbtfyRsOMM4LN1ppHVhie0ME1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136839; 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=EYlxF6EH9WlgH/g9KyJXNOdy3bBmA9Wpy/uIgq7E3mE=; b=obUmolUQOIqw0j7ZC/w+5ZgJRSLa3SGEg1TPAzd0+wO5bz/nAUbZrp2EiFJZvlYLGwHHgg loONE157UfxxatSwcxy+3wKc74ZtIt9XU5WdoCcI4O3re+HLiPAk22/UuSRTl6rV9ZxcwB R/YwX6rxfRj25yZAP0KnYK7wlMtMOV40fBXWInJ1qBPxGkbR6Tc5NLYUXA3YLoASg4Iztn hoifHcFxjRUSbF1+hepWNk/4Vb/fU9lVB4XbVn2PqierqdDdkScEecCUT/Q7DqKwugm/mC MMSuimB/pP+z0j+UiZrMD8bbg+Z5CLbKQ/L0EFSJ050jW/zAicBkUJND8Qr0aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136839; a=rsa-sha256; cv=none; b=Llh7VMzPS2SvS46zgn21HpZzFzNoSfl86DuGXYQPuO092blzivNU5b3HLgvtTIrEOa4M2C 7a4fcaZy9354JPuxEuIIezRXc0EFlPLGaPJ8VAWotUg3a4gsCr19UcaDofXADszCP19BrM HJ4FAMdS52AEMykdWU54b0POf9ihKJN9/kbuAJpql+xaxkSnYeLn5k66bzkDGscE2XTyVp xLFxEIUQuSv2uq9fKfoVdr+WEDTTpokw8d8lmlZXRHSrBwZQXqdmb6rSgVnyPdLJGZjqPY 9TLktb3IJ/D9x4ivmJW+g76oFdATuZI2sSgrEBKbnVRGIf3Nu0wc2kkpmHbG9w== 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 4R8BbW1YzXzmKr; Sun, 23 Jul 2023 18:27:19 +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 36NIRJSF058947; Sun, 23 Jul 2023 18:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRJfw058946; Sun, 23 Jul 2023 18:27:19 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:19 GMT Message-Id: <202307231827.36NIRJfw058946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3ea609f7d794 - stable/13 - Merge commit 2b0f5df7b4e0 from llvm-project (by Jessica Clarke): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ea609f7d794675ff74194a36125a1201dabc8fb Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea609f7d794675ff74194a36125a1201dabc8fb commit 3ea609f7d794675ff74194a36125a1201dabc8fb Author: Dimitry Andric AuthorDate: 2023-07-23 11:01:42 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:13 +0000 Merge commit 2b0f5df7b4e0 from llvm-project (by Jessica Clarke): [builtins][Mips] Un-break FreeBSD build of __clear_cache Commit 674a17e9bbe8 ("MIPS/compiler_rt: use synci to flush icache on r6") completely removed the OS-specific guards under the guise of "For pre-r6, we can use cacheflush libc function, which is same on Linux and FreeBSD." However, the code in question had guards for Linux and OpenBSD, not Linux and FreeBSD, and FreeBSD does not have a cacheflush libc function as claimed, so this was neither the statement they intended to make nor was it sufficient justification for making the code completely unconditional. Whilst the upcoming FreeBSD 14 release has dropped support for MIPS, FreeBSD 13 has support for it. Fix this by only calling cacheflush on the OSes where it was previously called, and not on other OSes where it either definitely isn't available (FreeBSD) or is unknown (any other OS than the three mentioned in this commit). This is only needed for MFC'ing, as mips has been removed from 14-CURRENT. PR: 271047 MFC after: immediately (cherry picked from commit b8f1c9dd9b3dd9b91e6999b28ab941a2af142702) --- contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c b/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c index 8993761eb3d4..54cbda059315 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c +++ b/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c @@ -110,10 +110,14 @@ void __clear_cache(void *start, void *end) { "jr.hb $at\n" "move $at, $0\n" ".set at"); -#else +#elif defined(__linux__) || defined(__OpenBSD__) // Pre-R6 may not be globalized. And some implementations may give strange // synci_step. So, let's use libc call for it. cacheflush(start, end_int - start_int, BCACHE); +#else + (void)start_int; + (void)end_int; + compilerrt_abort(); #endif } #elif defined(__aarch64__) && !defined(__APPLE__) From nobody Sun Jul 23 18:27:20 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 4R8BbX6NvZz4p6Vf; Sun, 23 Jul 2023 18:27:20 +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 4R8BbX3hdlz3hHK; Sun, 23 Jul 2023 18:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136840; 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=OK1ozfHHHyJxvR1xRyOQ4fIqQuoEfQW2FzHaKAzWuz8=; b=M4KOC5dnEGdE5bHxTzf/RMKrEBUPa9p1YRuccxnyyre+DeA7WHaxGbiHq5O+MtKvF1O4UF DIk950bl3RT6St6gNIH/nmH0LROVz8KbDZe7Ar/tognUN8QGzE9/XCWbwDS0fHWQix6PIU P7Vf3Z0xs6OTUWx/rNwvJVL2vC+NnbSJRSi1MmOVUJ1en2olNiOO3wQFpNO/h5k68zvUw7 jWHPAdoTr13L9quLsiYF7QmY6TDWtfKXdOYBy8GUhqFOELvytvlv5piG49WoIX6LTP0HBF qwUmIsXD+lFNryD8ena+1lJdeofp+ebWaVHCwRxXGdqFhOOjVLrZrgeNjuEssw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136840; 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=OK1ozfHHHyJxvR1xRyOQ4fIqQuoEfQW2FzHaKAzWuz8=; b=NbchqSxIQx3MKq9tTn4Tb/ISAaXGY2SfrGi2Q0odbgGZK4+okRz+7Lfz0wvxX1aY7yksBz OFTvU7yR4RDo/nl+fVgLQ507GEVtif7q9WrNn90BnU+sh3tTctIFyJNmOQfzv/eOs5yq9K 6ZVhbAWW5meOtMcI20SSO1MJSkKPWyC58P5mlEHuEMOHY6dUdar9cdX0gMz/5OCY2Ib0z2 WaCg7CpJ95JhyotuOaQQllJJWjzM4nJ3RnBSN3cPTu24/AlJrYHxwhdXtYRc9mRoQIqCDF 11BejtkigPFEWpPXHwii1FwODkL5bl1BT0k9i6QjZ/YY1W8IcXSnBJ+0Psvbiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136840; a=rsa-sha256; cv=none; b=tebPLsXKIK5D4zUo7DL3e5eopUAQqChVT7DjtT4kGjLr767RXPgYc8buDEXiUW59DcSC0T ocVOg1gE1aewhu5gWqDx8Z7/FtdvRMo/IaP+l2yzT0MCBXEV212j5wfCkQUbo9/C0jaOjX FoXpzr209CsWGQnWT+TXcZ4ixTNd4jrLtQPGAudVv+BOd6l1HXJwwJVbKrH5MOxmAZJndH fd8LIMRnrW9MQLY2VjgqPdv6lM/QHHOhdlNOn4sDDIJAkzv1ODwfPSpQ2t2xLfS8SpFZzG +GSDgXmQptIFHPj0GJhBIC0GLQQ1OpDWZhC05vnkgGrVTiDYaAOf8oJEOdbQ3Q== 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 4R8BbX2G0KzmfG; Sun, 23 Jul 2023 18:27:20 +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 36NIRKIt058966; Sun, 23 Jul 2023 18:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIRKx9058965; Sun, 23 Jul 2023 18:27:20 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:20 GMT Message-Id: <202307231827.36NIRKx9058965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 254cdd5b2214 - stable/13 - Apply build fix for powerpc64-specific llvm-ar and llvm-nm link error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 254cdd5b2214112fb78462919433024589b2bcac Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=254cdd5b2214112fb78462919433024589b2bcac commit 254cdd5b2214112fb78462919433024589b2bcac Author: Dimitry Andric AuthorDate: 2023-07-23 18:26:01 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 18:26:01 +0000 Apply build fix for powerpc64-specific llvm-ar and llvm-nm link error Only on powerpc64, llvm-ar and llvm-nm could fail to link due to a "undefined symbol: ZSTD_compressBound" error. This does not happen on -CURRENT, so directly apply a specific build fix on stable/13. --- usr.bin/clang/llvm-ar/Makefile | 1 + usr.bin/clang/llvm-nm/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index 3718248f5de9..dd58fb18c417 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -11,6 +11,7 @@ SRCS+= llvm-ar.cpp CFLAGS.llvm-ar.cpp+= -Dllvm_ar_main=main LIBADD+= z +LIBADD+= zstd LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 30071da0e7dc..2c19f02e49de 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -26,6 +26,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z +LIBADD+= zstd .if ${MK_LLVM_BINUTILS} != "no" LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm From nobody Mon Jul 24 02:02:51 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 4R8Nj736Xgz4p3Nn; Mon, 24 Jul 2023 02:02:51 +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 4R8Nj72gWbz3QBw; Mon, 24 Jul 2023 02:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690164171; 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=kHj6Kldi/Ha9Krr0/VOpdQ8y5J+xlSRFFHRL3Zynq9I=; b=NOV3ENTYawhc35Dc3FkpwAOQYIyBatr/RULD3vkA1IArAvd+Ey+qM4o/QrUJSeaCjzBn7M UGzV+qcAsTmtYY2HS9Z9EdqGIfC96ptjJpPRz6E2oxwNs/BXJPM1ZOq/nAydT0l118IXYd 0C5enYCV1AGEEjIMcynaJarR320OguORF9L/lOncRx5N7/cy1+NdGd3pgLYfUNsDwnipYn OjQN/RL79pcXeSd0gsQa6hXvJaSi94j/+64fxPSwRN9Jyjo6zzzkpljGoctS2qBAX8bj79 xVAm7CsaxnKKFeC9CiHq0sXpNkf4lSOC8XsiHg/xonna2/+Ts+QCNwq69bpx1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690164171; 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=kHj6Kldi/Ha9Krr0/VOpdQ8y5J+xlSRFFHRL3Zynq9I=; b=TX8xtkoYJrtwBzNwB+2AyI/3LkyHgZFwT7DuDcIxPWV6mSOmtzQFFq/lr+sQui1NiR4Az6 LBmB1GDKgCrN3HzC11E3HDIDpdMii9Rpg3+v9J3ABbbcsq9qs0cHok/27SqSIBhzPtjegU sW+fuy4DP0yX3u1krBX3BDtHXlmNsDULdecUaN7pbdsw2fk8Bca0n2u2u1NU5LajfghuCF BBlxE25XCklUzySXifzUSD/8Z3Ac272NOh7gUYwwiIKUgmcSpQ7SGQWmVjk8Ny+2uchJj8 T/N7YTk739YJHImfF526BKxG6RBOKw6fDqufIcCapvdgJHZOSV/vU2n+Xf0WjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690164171; a=rsa-sha256; cv=none; b=ckJCu10MEA9jRON6LEK9YtOkp4YHbsJZxciNZkR9KOzB5qJme0MAx8a2fgU0xH744vKTmj BI6k/XcEhpTdBAFWIASfUJ5bRg0xBsIQbsqGX5oXTkNYKImRvOLTMPOdvDxElHlFPCzXz+ YxMmdqyP0CgkUSNjGD31AUlx5mNRQkwXJUJcxNt684MJpWPUbWRWY8Aw2kx5HEbhIUvt0p jyYntZRb6K8CvOgJ6fiBqvqRRFdhWYkt4jBTGvmiYFUv+hKdidR1Tp5WvJ6DYJWJl62OCu ZP3P77+6+x7xcvQESPuDJE1+ehu/Io3IaXiqY8ceyI499IGfX/1ClqLMlT6o4w== 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 4R8Nj71kBKz10gW; Mon, 24 Jul 2023 02:02:51 +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 36O22pZd021457; Mon, 24 Jul 2023 02:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36O22pFX021456; Mon, 24 Jul 2023 02:02:51 GMT (envelope-from git) Date: Mon, 24 Jul 2023 02:02:51 GMT Message-Id: <202307240202.36O22pFX021456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 7938d643d227 - stable/13 - modules: fix freebsd32_modstat on big endian platforms List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7938d643d2275cf95d5734f5895b7e9d00fcb448 Auto-Submitted: auto-generated The branch stable/13 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=7938d643d2275cf95d5734f5895b7e9d00fcb448 commit 7938d643d2275cf95d5734f5895b7e9d00fcb448 Author: Ka Ho Ng AuthorDate: 2023-07-07 04:21:01 +0000 Commit: Ka Ho Ng CommitDate: 2023-07-24 02:01:40 +0000 modules: fix freebsd32_modstat on big endian platforms The layout of modspecific_t on both little endian and big endian are as follows: |0|1|2|3|4|5|6|7| +-------+-------+ |uintval| | +-------+-------+ |ulongval | +-------+-------+ For the following code snippet: CP(mod->data, data32, longval); CP(mod->data, data32, ulongval); It only takes care of little endian platforms that it truncates the highest 32bit automatically. However on big endian platforms it takes the highest 32bit instead. This eventually returns a garbage syscall number to the 32bit userland. Since modspecific_t's usage currently is for the use of syscall modules, we only initialize modspecific32_t with uintval. Now on both BE and LE 64-bit platforms it always pick up the first 4 bytes. Sponsored by: Juniper Networks, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40814 MFC after: 1 week (cherry picked from commit 034c0856018ccf73c0f2d6140825f3edf43f47b2) --- sys/kern/kern_module.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 1798a834dcec..7128525ddb66 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -520,10 +520,9 @@ freebsd32_modstat(struct thread *td, struct freebsd32_modstat_args *uap) id = mod->id; refs = mod->refs; name = mod->name; - CP(mod->data, data32, intval); + _Static_assert(sizeof(data32) == sizeof(data32.uintval), + "bad modspecific32_t size"); CP(mod->data, data32, uintval); - CP(mod->data, data32, longval); - CP(mod->data, data32, ulongval); MOD_SUNLOCK; stat32 = uap->stat; From nobody Mon Jul 24 14:08:09 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 4R8hp15M0tz4mdpd; Mon, 24 Jul 2023 14:08:09 +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 4R8hp13Y9lz4MB5; Mon, 24 Jul 2023 14:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690207689; 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=78t+Zj/lCHndlGzj/pEUww0IYHBNMj4OqaImawqHulk=; b=aONRtOlecZDNg5cEQ7C3eb4spUVLu26ShGVFme3YRfRUxIcUY5oGV0Bvul0RADNV2/ZjZm eRAA+02gl50AftBExCZ+9+Wf+qkO+baDkjb+dc8Tcdrd7gJmFNIU1He0vViIdNZy37WFi6 EHVVAcyD7UPz9/vo+q1caqkuueRBOe/cxNQcMOM7ZRcVRNWby5ZJWdoJS1yQsEq71UkIFi BRgCPbpdMFB2/3lk8u81NuSNBVPNzQEEQouHb4rOacijPcSyAmAHP8WG6/KMOYa3BXNqOh R7GxufyLiLKOw7E6zo2zwv6sxZOKSwdXl7sP7EZmBef9aXMNjrsoiFW7Tq849Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690207689; 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=78t+Zj/lCHndlGzj/pEUww0IYHBNMj4OqaImawqHulk=; b=QS2rshGwpK+R6o8PyOjfDuimV3HNisoXOXUe8GKhguoi7XlRmyulzzoGgGLX/VXmqCq/XJ hn/4EvV1JnlT3nOP+eIz4WHMHejgUZV2dIG3EIXmxmKyOC6a6TmJ4+SlnBA/qqtquC0N07 uEI+wSMLPNdX953UJt+JkYgiYazkqJ11QTV5FPWfrNKXnvVd13nwzzozwfaMfEe/QhFpCZ zE6Aakgo1GIiE7JeW2LnYYiJ0A8H043BiGCylQXoYDPK56xdBgfiGes9yYWdmOrYJaoSac 2WCEkKzyR2qaXxtfBBaon7rl6uWki/WdBiKBA7EO24JltTOTfwYkrfvQ6t0ZiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690207689; a=rsa-sha256; cv=none; b=dqkStGk/yk5dinn2e9VjdUJVeKC8dw0VS/u2Va9Dd62NYrfg8HaFQ4UeHxLkugGb41scQ9 hG2/qhr9nSflfJtyQj/poKn8EKBF2F4yWzv+t23cPdsKfHjpKNUhogsi0/7d6Cdl1XvDRh 4Ld6dtUU7u12exEaKjAzCl3vXQJl6iP/TJ0S5pw1PL1wxEFt/e4zs4Y7dDJjwc1TRz1sw9 a4Jpgjj8Arqq7apV+ILwLHX/PFJq/dG+9n4U3IeZtzbJnvk3pG8iffL9XjC9ixe0+c4mJ3 M+ShnUmwPeaxvZhdKkL61UZB0z816Ht2e+emf5GGzThNBVZtgAeiBcpd8XTyrA== 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 4R8hp12bh6zKw7; Mon, 24 Jul 2023 14:08:09 +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 36OE89LD014724; Mon, 24 Jul 2023 14:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OE89fe014723; Mon, 24 Jul 2023 14:08:09 GMT (envelope-from git) Date: Mon, 24 Jul 2023 14:08:09 GMT Message-Id: <202307241408.36OE89fe014723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 77c2e52a1742 - stable/13 - Cirrus-CI: add amd64 and arm64 Clang/LLVM 16 jobs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77c2e52a17424e275807980cdbdf2f62527aefe3 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=77c2e52a17424e275807980cdbdf2f62527aefe3 commit 77c2e52a17424e275807980cdbdf2f62527aefe3 Author: Ed Maste AuthorDate: 2023-05-26 12:14:51 +0000 Commit: Ed Maste CommitDate: 2023-07-24 13:14:57 +0000 Cirrus-CI: add amd64 and arm64 Clang/LLVM 16 jobs Reviewed by: lwhsu (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40286 (cherry picked from commit df042dcf268c7f5ab9ca5d090a682af76070b919) --- .cirrus.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 6b588d05e551..57f27180e2c7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -22,6 +22,14 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm15 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite + - name: amd64-llvm16 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: llvm16 + TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: arm64-llvm15 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -30,6 +38,14 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm15 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: arm64-llvm16 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: llvm16 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual From nobody Mon Jul 24 14:08:10 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 4R8hp25Xxlz4mdsX; Mon, 24 Jul 2023 14:08:10 +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 4R8hp24dzkz4MK5; Mon, 24 Jul 2023 14:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690207690; 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=OLCDUVpL6+qisXWqmDhAx+ffiELzD9kOOpVxsb1gdUw=; b=RO6xQEtI1S+Fw9bUilMf4iLdHJeXrK1WIBUK4hHZ9j4fOkBeFIVV+t4hvTvLugL9Xl9TYB 1DbveuKKM10gsU2zCAgNstQEUKhEJMgtntAQDvROQfkRUsY314N59T55syL7yEHRWIIub8 zME2l6Pt4WUmra+UvLdJWgfTxeEjvXxFnU0SEY8/wj8DzreAsM2+iIj5bj3lHyQHI2Yo4x g8zRLOfFasJmE/THwnMaC0J7CehSJxOHC5XuKyBCDp1O8PqUJt9GQF2oxRjYKIMB8KbuLm Fcycm+chwVN4RhUwKLyzc762au0KSfsFpghIj/EA7UNv9YRE03bL4ctgj9IAhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690207690; 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=OLCDUVpL6+qisXWqmDhAx+ffiELzD9kOOpVxsb1gdUw=; b=A5y1SivTWo/+I8CWkLWDTysEwBY5ORgITJTHKyu11iU3+nXdmoKrFoq9BQ2lh6XjpIv+Hg Bg6tYr5orVvzDM+5dTANUP6vvT0gQ4i7vCjeAZ94Z4bLTpIiWvxME3pU1GHDr3knTxUEBF bOEP8al1W8ANEY9HEttpz3+uitp/j514zAw8blO5KuUD4idl+wWAqcak3V7/R//wrhjOVZ P4e6wxNzZA0e8/EFeku1uS2060L5ukY+hC0VW0CVQXZlvEe8fBQW4jrmHBTNt7xxdrUrLM SSn1HGO7fgDqTL424znk3DJe/Z6Jj93yWZr5NtfEAb27VS8FJiGNf513Sr3weQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690207690; a=rsa-sha256; cv=none; b=e1vYXp7rLw9wTN+jEzpBmNOHa1tpyFlkucQXUES2NcAQ8kg/0KEKwXIpszVl/U7IqTMcEF eVY/BB4Iqe0F3QypAcUyTsQf8+Mletk20HW1KwuewbvnPC44QZhhvL9NaftWSLcm/C01kD WDZNHE5MYPr5/h9qbCekRCPPB+c/HCZfdD96m0ahOclTLgR4yyFieGAzpQayA0gRyyK/rx HO6/+ILr9FDgeA3Y6uYxkpgh9ZDR9/1235xsemOv0hiKC3c+Gl8toLWTxkUV4VSZ9VAZEL TMymUawxhfHGOEBKe/GL4zGdU6dQplSbdHFl9HEEa7SkpMhZ/G8cqtnj1VtMPQ== 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 4R8hp23V1NzLHD; Mon, 24 Jul 2023 14:08:10 +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 36OE8A6u014743; Mon, 24 Jul 2023 14:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OE8Axb014742; Mon, 24 Jul 2023 14:08:10 GMT (envelope-from git) Date: Mon, 24 Jul 2023 14:08:10 GMT Message-Id: <202307241408.36OE8Axb014742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5a0cbb8a5006 - stable/13 - Cirrus-CI: add a manually triggered aarch64-gcc12 task List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a0cbb8a5006f9e8aae0d4b286862b4e03fb4e60 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5a0cbb8a5006f9e8aae0d4b286862b4e03fb4e60 commit 5a0cbb8a5006f9e8aae0d4b286862b4e03fb4e60 Author: Ed Maste AuthorDate: 2023-06-09 15:19:42 +0000 Commit: Ed Maste CommitDate: 2023-07-24 13:14:57 +0000 Cirrus-CI: add a manually triggered aarch64-gcc12 task Sponsored by: The FreeBSD Foundation (cherry picked from commit 5ad6c907f99443ebbe9e152d4e68a18b7fa01fff) --- .cirrus.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 57f27180e2c7..158aca04ca49 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -54,6 +54,14 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: amd64-gcc12 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: aarch64-gcc12 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: aarch64-gcc12 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' env: From nobody Mon Jul 24 14:08:11 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 4R8hp364JNz4mf1C; Mon, 24 Jul 2023 14:08:11 +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 4R8hp357X2z4MN7; Mon, 24 Jul 2023 14:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690207691; 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=BnIEghes3RAFQ6o10Bt4n7og7dpKEG/2pCnbucFXBUs=; b=gNYpkiLwsSK+mbk/y2RuqfD9CUdO18EVx+nzQ0sZfuA82V9wegpn1rKvRhQdWW3LkEyfZR vUYT1Uw6AvtjxVIad7kT2pFujhPUgXInwuS+eJpV4ct8/dlQpaOU4yUyzZEQSehz2Tnunl 4OtLuOy49UrDkouAriYnzYNeUTVODmVhKl7d/0JqWveBqsqrxOXYraSgVyRNkBbx/7Kash lCMpt5+P+Tw4MSeEHRE5n1XhLJAC3FGFJLx5DnTlduxdG9zmVWcOgLO2ovxWu+Lc7QB/ys vcDaJO2KJPcRZ9rfxdkkIjj6leBEET1TOAhg46uvS/DBQQxjdBA39ca180jZ+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690207691; 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=BnIEghes3RAFQ6o10Bt4n7og7dpKEG/2pCnbucFXBUs=; b=BPFYVRJ1A691ntJSVI3Zio4DhlHzJBX7OrVI3QkCnFShpWs1mz0lFnsIXEMg8Df1bh13CB CwXMCbCiwfdcm1jy3w1xJstCjzx00UItRLHp2cjx4PzZblv8Idp/7ueotOAv4+ce0NonoY REExIf4+R4ZErE+032zuXf6NJzuLapmP+4N/2W1ZoPjXkFJvVUyAiyFNqfZZya3LHr27NP s+aAZITsa5MCeJtZyLbkmJv0xHWkQ3mDE3NmrToU67Z7CgLZ7Bxj7kOrXMuLaeWEqw4ElH Fg0HYXW24d3BDOLNAKsfRZvk1mFKPNGosTYw41xDkTt3nSzIdHJJx+ZoF6CLGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690207691; a=rsa-sha256; cv=none; b=qW1L374MpoVStlzdxN/tPUbKravHZdno/5qV71kkQNpYMq1jVvQ0jnMnSXBJld88R2PbA4 22ACOO9i70ku0vCODqqfdGv6nPlBF5PllsrKngCrkI4Guxz+vLf6KyCq0Rjc9lhxz+3J5f +H1i9C85KBWDVhU02JP+3snHJUHvD0VBhfkU1/cI4GhhSMFCz73B4zWtJRC3n4hH4Dvfs7 ljKS2IEN9ALA25BFeuvSts7ecLqYaTbLYeR7aPxkkeLUPxmT4CUQTCzc74VKAocXY94Xvy p+tFT1MyZaxum5ispTqxbErby9gQg9KVVgoJr1g4bYr/tMXTnx52yVE/BrsZUA== 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 4R8hp347TwzKw8; Mon, 24 Jul 2023 14:08:11 +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 36OE8BhT014763; Mon, 24 Jul 2023 14:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OE8Bvl014762; Mon, 24 Jul 2023 14:08:11 GMT (envelope-from git) Date: Mon, 24 Jul 2023 14:08:11 GMT Message-Id: <202307241408.36OE8Bvl014762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8557b8ba15b9 - stable/13 - Cirrus-CI: use llvm16 job by default and make llvm15 manual List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8557b8ba15b9d332000a17a73b752b6ec35d0903 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8557b8ba15b9d332000a17a73b752b6ec35d0903 commit 8557b8ba15b9d332000a17a73b752b6ec35d0903 Author: Ed Maste AuthorDate: 2023-06-22 23:20:34 +0000 Commit: Ed Maste CommitDate: 2023-07-24 14:06:57 +0000 Cirrus-CI: use llvm16 job by default and make llvm15 manual With commit e048f78b2143 (head) / 2e7b90a28f69 (stable/13) the default tool chain is Clang/LLVM 16, so follow along in the llvm pkg used by Cirrus-CI. Sponsored by: The FreeBSD Foundation (cherry picked from commit 171f1c1b4f0e9ec5b77a2dabdd4fcbf9baaa02df) --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 158aca04ca49..fb0149a5d91b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,14 +17,14 @@ env: task: matrix: - name: amd64-llvm15 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm15 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm16 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' - trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Tue Jul 25 20:48:38 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 4R9Tdj3tGdz4nZ9h; Tue, 25 Jul 2023 20:48:41 +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 4R9Tdj2d5kz3kf3; Tue, 25 Jul 2023 20:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318121; 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=41HyWAIio/kDEQz8TznYqUGHBlSaIV+cqRxyHoPz+zQ=; b=anITOBGqutdz79iTVqr/SYKd4PxwB6tdfbj8Y/bWAS/b9f+Jg2En0kRKXUjhMrmWCnD8in VNsWUhoOgV1hp0IFNxiYXm8D5zhR8oyM1fZncHpKXjT2be8jEqg30kTfQdqgn9mRdugbfM 5xG1LI5NRFpFDjAqLAiGrEaJUXsxsP6zNImThwS7alhxP/e6FZMUX43z+ViVmlnYVnbwhp M4qbyeSONHtvsu/V/3c/ZNIhePGnT/5Ccgm8LStmI6R7esUUt0VBW3JOSQvW2ZRbL7DAnM 3x8FAeH4w7F1/M3Q5R+++/1DSgeaG6uSGyJJ7a3ciDnjT2VXoBwJMItCayWB9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318121; 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=41HyWAIio/kDEQz8TznYqUGHBlSaIV+cqRxyHoPz+zQ=; b=p8++TbkpXiY/Fna89e13Mic6G/YhKFJswNs3oxEI6UhYkXEbmoz4n5HgAgxrGefkm5UoAH 5Z0UtA0+uwqRvS/+C1+bAZsYBf3i75200siEusn2YMb3XaEAZl5Vlki/0eMe3mPtLlHew4 Spy+C2J505wtni23KwcuorLerlwVc0IThdoRk5nqG8Ka+n6Hk4cZBGqBZLyjuH4bM7FRyJ vOH/5sQ7Q0KTVUVZRBk+A1QiRzuPTWA6FMX66MppQe5beTCvyCq5iVQMhibvugMTfMGREI qULUflwN8OKvkRBCJI1eDoriraJxwRNjdQuVPK6loFXurNqmhf789S+YgZpzTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318121; a=rsa-sha256; cv=none; b=fPFMNa580ug+wJ+po1NWbU+ZCHukO9kF1bqQhZnfzlMPV/XptMEIRqLOUxQXbQk+2XXtWq jUBUe5TRpnJ/KCaRoamMBE+9xSx2hxGZ8uwWolJY445KD+ODq8513k1LiJNZV/t8Cl9AmT VkSogmxVEpO9XF7kRf0XyotKSdqjiqqamN1nefVqxD+1E3edfG9jP/6iftRyrMylZRl5YE sPCMVNlsT+pXr4+V9Pu17LR7hG+iR9rBhVPQTTQ6mLkGwUAwv0isnXvi5BxSVvyfu570DV 8qT509exx5ZOWTq7LBm24xev3zjHcbCDWiTD8wR7VYBU66ks78Mc5ukN1NDNkg== 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 4R9Tdj1g72zFxS; Tue, 25 Jul 2023 20:48:41 +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 36PKmf4k063600; Tue, 25 Jul 2023 20:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmcZZ063581; Tue, 25 Jul 2023 20:48:38 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:38 GMT Message-Id: <202307252048.36PKmcZZ063581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: caa41f641755 - stable/13 - spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: caa41f641755c935b036e17440a3b49329c904ed Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=caa41f641755c935b036e17440a3b49329c904ed commit caa41f641755c935b036e17440a3b49329c904ed Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:13:49 +0000 spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b) --- bin/cp/tests/cp_test.sh | 2 +- bin/timeout/timeout.1 | 2 +- include/bitstring.h | 2 +- include/complex.h | 2 +- include/cpio.h | 2 +- include/elf-hints.h | 2 +- include/elf.h | 2 +- include/fmtmsg.h | 2 +- include/inttypes.h | 2 +- include/iso646.h | 2 +- include/kenv.h | 2 +- include/langinfo.h | 2 +- include/malloc_np.h | 2 +- include/mk-osreldate.sh | 2 +- include/monetary.h | 2 +- include/mqueue.h | 2 +- include/nss.h | 2 +- include/printf.h | 2 +- include/proc_service.h | 2 +- include/rpc/rpcsec_gss.h | 2 +- include/semaphore.h | 2 +- include/spawn.h | 2 +- include/stdalign.h | 2 +- include/stdbool.h | 2 +- include/stdnoreturn.h | 2 +- include/strings.h | 2 +- include/tgmath.h | 2 +- include/uchar.h | 2 +- include/ulimit.h | 2 +- include/utmpx.h | 2 +- include/uuid.h | 2 +- include/varargs.h | 2 +- include/wordexp.h | 2 +- include/xlocale.h | 2 +- include/xlocale/_ctype.h | 2 +- include/xlocale/_inttypes.h | 2 +- include/xlocale/_langinfo.h | 2 +- include/xlocale/_locale.h | 2 +- include/xlocale/_monetary.h | 2 +- include/xlocale/_stdio.h | 2 +- include/xlocale/_stdlib.h | 2 +- include/xlocale/_string.h | 2 +- include/xlocale/_time.h | 2 +- include/xlocale/_uchar.h | 2 +- include/xlocale/_wchar.h | 2 +- kerberos5/lib/libgssapi_krb5/gss_krb5.c | 2 +- kerberos5/lib/libgssapi_krb5/pname_to_uid.c | 2 +- kerberos5/lib/libgssapi_krb5/prefix.c | 2 +- kerberos5/lib/libgssapi_ntlm/prefix.c | 2 +- kerberos5/lib/libgssapi_spnego/freebsd_compat.c | 2 +- lib/csu/amd64/crt1_c.c | 2 +- lib/csu/common/crtbrand.S | 2 +- lib/csu/common/feature_note.S | 2 +- lib/flua/libjail/jail.3lua | 2 +- lib/geom/cache/geom_cache.c | 2 +- lib/geom/concat/geom_concat.c | 2 +- lib/geom/eli/geom_eli.c | 2 +- lib/geom/journal/geom_journal.c | 2 +- lib/geom/journal/geom_journal.h | 2 +- lib/geom/journal/geom_journal_ufs.c | 2 +- lib/geom/label/geom_label.c | 2 +- lib/geom/mirror/geom_mirror.c | 2 +- lib/geom/mountver/geom_mountver.c | 2 +- lib/geom/multipath/geom_multipath.c | 2 +- lib/geom/nop/geom_nop.c | 2 +- lib/geom/part/geom_part.c | 2 +- lib/geom/raid/geom_raid.c | 2 +- lib/geom/raid3/geom_raid3.c | 2 +- lib/geom/shsec/geom_shsec.c | 2 +- lib/geom/stripe/geom_stripe.c | 2 +- lib/geom/virstor/geom_virstor.c | 2 +- lib/libarchive/config_freebsd.h | 2 +- lib/libbe/be.c | 2 +- lib/libbe/be.h | 2 +- lib/libbe/be_access.c | 2 +- lib/libbe/be_error.c | 2 +- lib/libbe/be_impl.h | 2 +- lib/libbe/be_info.c | 2 +- lib/libbe/libbe.3 | 2 +- lib/libbe/tests/be_create.sh | 2 +- lib/libbe/tests/target_prog.c | 2 +- lib/libbluetooth/bluetooth.c | 2 +- lib/libbluetooth/bluetooth.h | 2 +- lib/libbluetooth/dev.c | 2 +- lib/libbluetooth/hci.c | 2 +- lib/libbsdstat/bsdstat.c | 2 +- lib/libbsdstat/bsdstat.h | 2 +- lib/libc/aarch64/gen/_get_tp.c | 2 +- lib/libc/aarch64/static_tls.h | 2 +- lib/libc/amd64/_fpmath.h | 2 +- lib/libc/amd64/gen/_get_tp.c | 2 +- lib/libc/amd64/gen/_set_tp.c | 2 +- lib/libc/amd64/gen/makecontext.c | 2 +- lib/libc/amd64/gen/signalcontext.c | 2 +- lib/libc/amd64/static_tls.h | 2 +- lib/libc/amd64/string/strcpy.c | 2 +- lib/libc/amd64/sys/amd64_get_fsbase.c | 2 +- lib/libc/amd64/sys/amd64_get_gsbase.c | 2 +- lib/libc/amd64/sys/amd64_set_fsbase.c | 2 +- lib/libc/amd64/sys/amd64_set_gsbase.c | 2 +- lib/libc/arm/_fpmath.h | 2 +- lib/libc/arm/aeabi/aeabi_atexit.c | 2 +- lib/libc/arm/aeabi/aeabi_double.c | 2 +- lib/libc/arm/aeabi/aeabi_float.c | 2 +- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 2 +- lib/libc/arm/gen/_get_tp.c | 2 +- lib/libc/arm/gen/_set_tp.c | 2 +- lib/libc/arm/gen/flt_rounds.c | 2 +- lib/libc/arm/gen/getcontextx.c | 2 +- lib/libc/arm/gen/signalcontext.c | 2 +- lib/libc/arm/static_tls.h | 2 +- lib/libc/arm/sys/__vdso_gettc.c | 2 +- lib/libc/db/mpool/mpool-compat.c | 2 +- lib/libc/gdtoa/_hdtoa.c | 2 +- lib/libc/gdtoa/_hldtoa.c | 2 +- lib/libc/gdtoa/_ldtoa.c | 2 +- lib/libc/gdtoa/machdep_ldisQ.c | 2 +- lib/libc/gdtoa/machdep_ldisd.c | 2 +- lib/libc/gdtoa/machdep_ldisx.c | 2 +- lib/libc/gen/__getosreldate.c | 2 +- lib/libc/gen/_once_stub.c | 2 +- lib/libc/gen/_pthread_stubs.c | 2 +- lib/libc/gen/_thread_init.c | 2 +- lib/libc/gen/arc4random-compat.c | 2 +- lib/libc/gen/auxv.c | 2 +- lib/libc/gen/cap_sandboxed.c | 2 +- lib/libc/gen/clock_getcpuclockid.c | 2 +- lib/libc/gen/ctermid.c | 2 +- lib/libc/gen/dirfd.c | 2 +- lib/libc/gen/dlfcn.c | 2 +- lib/libc/gen/dup3.c | 2 +- lib/libc/gen/elf_utils.c | 2 +- lib/libc/gen/errno.c | 2 +- lib/libc/gen/fdevname.c | 2 +- lib/libc/gen/fmtmsg.c | 2 +- lib/libc/gen/fpclassify.c | 2 +- lib/libc/gen/frexp.c | 2 +- lib/libc/gen/ftok.c | 2 +- lib/libc/gen/getentropy.c | 2 +- lib/libc/gen/getgrent.c | 2 +- lib/libc/gen/getpagesizes.c | 2 +- lib/libc/gen/getpeereid.c | 2 +- lib/libc/gen/getpwent.c | 2 +- lib/libc/gen/getutxent.c | 2 +- lib/libc/gen/isinf.c | 2 +- lib/libc/gen/isnan.c | 2 +- lib/libc/gen/libc_dlopen.c | 2 +- lib/libc/gen/posix_spawn.c | 2 +- lib/libc/gen/pututxline.c | 2 +- lib/libc/gen/sem.c | 2 +- lib/libc/gen/sem_new.c | 2 +- lib/libc/gen/semctl.c | 2 +- lib/libc/gen/sysctlnametomib.c | 2 +- lib/libc/gen/tls.c | 2 +- lib/libc/gen/ulimit.c | 2 +- lib/libc/gen/unvis-compat.c | 2 +- lib/libc/gen/utxdb.c | 2 +- lib/libc/gen/utxdb.h | 2 +- lib/libc/gen/waitid.c | 2 +- lib/libc/gen/wordexp.c | 2 +- lib/libc/i386/_fpmath.h | 2 +- lib/libc/i386/gen/_get_tp.c | 2 +- lib/libc/i386/gen/_set_tp.c | 2 +- lib/libc/i386/gen/makecontext.c | 2 +- lib/libc/i386/gen/signalcontext.c | 2 +- lib/libc/i386/static_tls.h | 2 +- lib/libc/i386/sys/i386_clr_watch.c | 2 +- lib/libc/i386/sys/i386_get_fsbase.c | 2 +- lib/libc/i386/sys/i386_get_gsbase.c | 2 +- lib/libc/i386/sys/i386_get_ioperm.c | 2 +- lib/libc/i386/sys/i386_set_fsbase.c | 2 +- lib/libc/i386/sys/i386_set_gsbase.c | 2 +- lib/libc/i386/sys/i386_set_ioperm.c | 2 +- lib/libc/i386/sys/i386_set_watch.c | 2 +- lib/libc/i386/sys/i386_vm86.c | 2 +- lib/libc/iconv/__iconv.c | 2 +- lib/libc/iconv/__iconv_free_list.c | 2 +- lib/libc/iconv/__iconv_get_list.c | 2 +- lib/libc/iconv/citrus_lock.h | 2 +- lib/libc/iconv/iconv-internal.h | 2 +- lib/libc/iconv/iconv.c | 2 +- lib/libc/iconv/iconv_canonicalize.c | 2 +- lib/libc/iconv/iconv_close.c | 2 +- lib/libc/iconv/iconv_compat.c | 2 +- lib/libc/iconv/iconv_open.c | 2 +- lib/libc/iconv/iconv_open_into.c | 2 +- lib/libc/iconv/iconv_set_relocation_prefix.c | 2 +- lib/libc/iconv/iconvctl.c | 2 +- lib/libc/iconv/iconvlist.c | 2 +- lib/libc/include/compat.h | 2 +- lib/libc/include/errlst.h | 2 +- lib/libc/include/fpmath.h | 2 +- lib/libc/include/namespace.h | 2 +- lib/libc/include/nscache.h | 2 +- lib/libc/include/nscachedcli.h | 2 +- lib/libc/include/nss_tls.h | 2 +- lib/libc/include/reentrant.h | 2 +- lib/libc/include/un-namespace.h | 2 +- lib/libc/locale/btowc.c | 2 +- lib/libc/locale/c16rtomb.c | 2 +- lib/libc/locale/c32rtomb.c | 2 +- lib/libc/locale/cXXrtomb_iconv.h | 2 +- lib/libc/locale/collate.c | 2 +- lib/libc/locale/collate.h | 2 +- lib/libc/locale/collcmp.c | 2 +- lib/libc/locale/ctype.c | 2 +- lib/libc/locale/fix_grouping.c | 2 +- lib/libc/locale/gb18030.c | 2 +- lib/libc/locale/gb2312.c | 2 +- lib/libc/locale/ldpart.c | 2 +- lib/libc/locale/ldpart.h | 2 +- lib/libc/locale/lmessages.c | 2 +- lib/libc/locale/lmessages.h | 2 +- lib/libc/locale/lmonetary.c | 2 +- lib/libc/locale/lmonetary.h | 2 +- lib/libc/locale/lnumeric.c | 2 +- lib/libc/locale/lnumeric.h | 2 +- lib/libc/locale/mblen.c | 2 +- lib/libc/locale/mblocal.h | 2 +- lib/libc/locale/mbrlen.c | 2 +- lib/libc/locale/mbrtoc16.c | 2 +- lib/libc/locale/mbrtoc32.c | 2 +- lib/libc/locale/mbrtocXX_iconv.h | 2 +- lib/libc/locale/mbrtowc.c | 2 +- lib/libc/locale/mbsinit.c | 2 +- lib/libc/locale/mbsnrtowcs.c | 2 +- lib/libc/locale/mbsrtowcs.c | 2 +- lib/libc/locale/mbstowcs.c | 2 +- lib/libc/locale/mbtowc.c | 2 +- lib/libc/locale/nextwctype.c | 2 +- lib/libc/locale/nl_langinfo.c | 2 +- lib/libc/locale/rpmatch.c | 2 +- lib/libc/locale/runefile.h | 2 +- lib/libc/locale/setlocale.h | 2 +- lib/libc/locale/utf8.c | 2 +- lib/libc/locale/wcrtomb.c | 2 +- lib/libc/locale/wcsftime.c | 2 +- lib/libc/locale/wcsnrtombs.c | 2 +- lib/libc/locale/wcsrtombs.c | 2 +- lib/libc/locale/wcstod.c | 2 +- lib/libc/locale/wcstof.c | 2 +- lib/libc/locale/wcstold.c | 2 +- lib/libc/locale/wcstombs.c | 2 +- lib/libc/locale/wctob.c | 2 +- lib/libc/locale/wctomb.c | 2 +- lib/libc/locale/wctrans.c | 2 +- lib/libc/locale/wctype.c | 2 +- lib/libc/locale/xlocale.c | 2 +- lib/libc/locale/xlocale_private.h | 2 +- lib/libc/mips/_fpmath.h | 2 +- lib/libc/mips/gen/_get_tp.c | 2 +- lib/libc/mips/gen/_set_tp.c | 2 +- lib/libc/mips/gen/signalcontext.c | 2 +- lib/libc/mips/static_tls.h | 2 +- lib/libc/net/gethostbynis.c | 2 +- lib/libc/net/gethostnamadr.c | 2 +- lib/libc/net/getifmaddrs.c | 2 +- lib/libc/net/getnetbynis.c | 2 +- lib/libc/net/getnetnamadr.c | 2 +- lib/libc/net/netdb_private.h | 2 +- lib/libc/net/nscache.c | 2 +- lib/libc/net/nscachedcli.c | 2 +- lib/libc/net/nss_backends.h | 2 +- lib/libc/net/nss_compat.c | 2 +- lib/libc/net/ntoh.c | 2 +- lib/libc/net/sockatmark.c | 2 +- lib/libc/net/sourcefilter.c | 2 +- lib/libc/posix1e/acl_branding.c | 2 +- lib/libc/posix1e/acl_calc_mask.c | 2 +- lib/libc/posix1e/acl_compat.c | 2 +- lib/libc/posix1e/acl_copy.c | 2 +- lib/libc/posix1e/acl_delete.c | 2 +- lib/libc/posix1e/acl_delete_entry.c | 2 +- lib/libc/posix1e/acl_entry.c | 2 +- lib/libc/posix1e/acl_flag.c | 2 +- lib/libc/posix1e/acl_free.c | 2 +- lib/libc/posix1e/acl_from_text.c | 2 +- lib/libc/posix1e/acl_from_text_nfs4.c | 2 +- lib/libc/posix1e/acl_get.c | 2 +- lib/libc/posix1e/acl_id_to_name.c | 2 +- lib/libc/posix1e/acl_init.c | 2 +- lib/libc/posix1e/acl_perm.c | 2 +- lib/libc/posix1e/acl_set.c | 2 +- lib/libc/posix1e/acl_strip.c | 2 +- lib/libc/posix1e/acl_support.c | 2 +- lib/libc/posix1e/acl_support.h | 2 +- lib/libc/posix1e/acl_support_nfs4.c | 2 +- lib/libc/posix1e/acl_to_text.c | 2 +- lib/libc/posix1e/acl_to_text_nfs4.c | 2 +- lib/libc/posix1e/acl_valid.c | 2 +- lib/libc/posix1e/extattr.c | 2 +- lib/libc/posix1e/mac.c | 2 +- lib/libc/posix1e/mac_exec.c | 2 +- lib/libc/powerpc/_fpmath.h | 2 +- lib/libc/powerpc/gen/_get_tp.c | 2 +- lib/libc/powerpc/gen/_set_tp.c | 2 +- lib/libc/powerpc/gen/makecontext.c | 2 +- lib/libc/powerpc/gen/signalcontext.c | 2 +- lib/libc/powerpc/static_tls.h | 2 +- lib/libc/powerpc/sys/__vdso_gettc.c | 2 +- lib/libc/powerpc64/_fpmath.h | 2 +- lib/libc/powerpc64/gen/_get_tp.c | 2 +- lib/libc/powerpc64/gen/_set_tp.c | 2 +- lib/libc/powerpc64/gen/fpsetround.c | 2 +- lib/libc/powerpc64/gen/makecontext.c | 2 +- lib/libc/powerpc64/gen/signalcontext.c | 2 +- lib/libc/powerpc64/static_tls.h | 2 +- lib/libc/powerpc64/sys/__vdso_gettc.c | 2 +- lib/libc/resolv/h_errno.c | 2 +- lib/libc/resolv/res_state.c | 2 +- lib/libc/riscv/gen/_get_tp.c | 2 +- lib/libc/riscv/static_tls.h | 2 +- lib/libc/rpc/mt_misc.h | 2 +- lib/libc/rpc/rpcsec_gss_stub.c | 2 +- lib/libc/stdio/dprintf.c | 2 +- lib/libc/stdio/fcloseall.c | 2 +- lib/libc/stdio/fgetwc.c | 2 +- lib/libc/stdio/fgetwln.c | 2 +- lib/libc/stdio/fgetws.c | 2 +- lib/libc/stdio/fmemopen.c | 2 +- lib/libc/stdio/fputwc.c | 2 +- lib/libc/stdio/fputws.c | 2 +- lib/libc/stdio/fwide.c | 2 +- lib/libc/stdio/fwprintf.c | 2 +- lib/libc/stdio/fwscanf.c | 2 +- lib/libc/stdio/getdelim.c | 2 +- lib/libc/stdio/getline.c | 2 +- lib/libc/stdio/getwc.c | 2 +- lib/libc/stdio/getwchar.c | 2 +- lib/libc/stdio/open_memstream.c | 2 +- lib/libc/stdio/open_wmemstream.c | 2 +- lib/libc/stdio/putwc.c | 2 +- lib/libc/stdio/putwchar.c | 2 +- lib/libc/stdio/swprintf.c | 2 +- lib/libc/stdio/swscanf.c | 2 +- lib/libc/stdio/ungetwc.c | 2 +- lib/libc/stdio/vdprintf.c | 2 +- lib/libc/stdio/vwprintf.c | 2 +- lib/libc/stdio/vwscanf.c | 2 +- lib/libc/stdio/wprintf.c | 2 +- lib/libc/stdio/wscanf.c | 2 +- lib/libc/stdio/xprintf_errno.c | 2 +- lib/libc/stdio/xprintf_hexdump.c | 2 +- lib/libc/stdio/xprintf_quote.c | 2 +- lib/libc/stdio/xprintf_vis.c | 2 +- lib/libc/stdlib/getenv.c | 2 +- lib/libc/stdlib/hcreate.c | 2 +- lib/libc/stdlib/imaxabs.c | 2 +- lib/libc/stdlib/imaxdiv.c | 2 +- lib/libc/stdlib/llabs.c | 2 +- lib/libc/stdlib/lldiv.c | 2 +- lib/libc/stdlib/ptsname.c | 2 +- lib/libc/stdlib/quick_exit.c | 2 +- lib/libc/stdlib/reallocf.c | 2 +- lib/libc/stdlib/strfmon.c | 2 +- lib/libc/stdlib/strtold.c | 2 +- lib/libc/stdtime/strptime.c | 2 +- lib/libc/stdtime/timelocal.c | 2 +- lib/libc/stdtime/timelocal.h | 2 +- lib/libc/string/mempcpy.c | 2 +- lib/libc/string/stpncpy.c | 2 +- lib/libc/string/strcoll.c | 2 +- lib/libc/string/strcspn.c | 2 +- lib/libc/string/strlen.c | 2 +- lib/libc/string/strnlen.c | 2 +- lib/libc/string/strspn.c | 2 +- lib/libc/string/strxfrm.c | 2 +- lib/libc/string/wcpncpy.c | 2 +- lib/libc/string/wcscasecmp.c | 2 +- lib/libc/string/wcscat.c | 2 +- lib/libc/string/wcschr.c | 2 +- lib/libc/string/wcscoll.c | 2 +- lib/libc/string/wcsdup.c | 2 +- lib/libc/string/wcsncasecmp.c | 2 +- lib/libc/string/wcsnlen.c | 2 +- lib/libc/string/wcsrchr.c | 2 +- lib/libc/string/wcsxfrm.c | 2 +- lib/libc/string/wmempcpy.c | 2 +- lib/libc/sys/__vdso_gettimeofday.c | 2 +- lib/libc/sys/brk.c | 2 +- lib/libc/sys/clock_gettime.c | 2 +- lib/libc/sys/closefrom.c | 2 +- lib/libc/sys/fcntl.c | 2 +- lib/libc/sys/gettimeofday.c | 2 +- lib/libc/sys/shm_open.c | 2 +- lib/libc/sys/sigwait.c | 2 +- lib/libc/tests/gen/getentropy_test.c | 2 +- lib/libc/tests/gen/makecontext_test.c | 2 +- lib/libc/tests/gen/sigsetops_test.c | 2 +- lib/libc/tests/sys/brk_test.c | 2 +- lib/libc/uuid/uuid_compare.c | 2 +- lib/libc/uuid/uuid_create.c | 2 +- lib/libc/uuid/uuid_create_nil.c | 2 +- lib/libc/uuid/uuid_equal.c | 2 +- lib/libc/uuid/uuid_from_string.c | 2 +- lib/libc/uuid/uuid_hash.c | 2 +- lib/libc/uuid/uuid_is_nil.c | 2 +- lib/libc/uuid/uuid_stream.c | 2 +- lib/libc/uuid/uuid_to_string.c | 2 +- lib/libc/x86/gen/getcontextx.c | 2 +- lib/libc_nonshared/__stub.c | 2 +- lib/libcalendar/calendar.c | 2 +- lib/libcalendar/calendar.h | 2 +- lib/libcalendar/easter.c | 2 +- lib/libcam/camlib.c | 2 +- lib/libcam/camlib.h | 2 +- lib/libcasper/libcasper/libcasper.c | 2 +- lib/libcasper/libcasper/libcasper.h | 2 +- lib/libcasper/libcasper/libcasper_impl.c | 2 +- lib/libcasper/libcasper/libcasper_impl.h | 2 +- lib/libcasper/libcasper/libcasper_service.c | 2 +- lib/libcasper/libcasper/libcasper_service.h | 2 +- lib/libcasper/libcasper/service.c | 2 +- lib/libcasper/libcasper/zygote.c | 2 +- lib/libcasper/libcasper/zygote.h | 2 +- lib/libcasper/services/cap_dns/cap_dns.c | 2 +- lib/libcasper/services/cap_dns/tests/dns_test.c | 2 +- lib/libcasper/services/cap_fileargs/cap_fileargs.c | 2 +- lib/libcasper/services/cap_fileargs/cap_fileargs.h | 2 +- lib/libcasper/services/cap_grp/cap_grp.c | 2 +- lib/libcasper/services/cap_grp/tests/grp_test.c | 2 +- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/cap_net.h | 2 +- lib/libcasper/services/cap_pwd/cap_pwd.c | 2 +- lib/libcasper/services/cap_pwd/tests/pwd_test.c | 2 +- lib/libcasper/services/cap_sysctl/cap_sysctl.c | 2 +- lib/libcasper/services/cap_sysctl/tests/sysctl_test.c | 2 +- lib/libcasper/services/cap_syslog/cap_syslog.c | 2 +- lib/libcrypt/crypt-md5.c | 2 +- lib/libcrypt/crypt-nthash.c | 2 +- lib/libcrypt/crypt-sha256.c | 2 +- lib/libcrypt/crypt-sha512.c | 2 +- lib/libcrypt/crypt.c | 2 +- lib/libcrypt/crypt.h | 2 +- lib/libdevinfo/devinfo.c | 2 +- lib/libdevinfo/devinfo.h | 2 +- lib/libdevinfo/devinfo_var.h | 2 +- lib/libgeom/geom_util.c | 2 +- lib/libgssapi/context.h | 2 +- lib/libgssapi/cred.h | 2 +- lib/libgssapi/gss_accept_sec_context.c | 2 +- lib/libgssapi/gss_acquire_cred.c | 2 +- lib/libgssapi/gss_add_cred.c | 2 +- lib/libgssapi/gss_add_oid_set_member.c | 2 +- lib/libgssapi/gss_canonicalize_name.c | 2 +- lib/libgssapi/gss_compare_name.c | 2 +- lib/libgssapi/gss_context_time.c | 2 +- lib/libgssapi/gss_create_empty_oid_set.c | 2 +- lib/libgssapi/gss_decapsulate_token.c | 2 +- lib/libgssapi/gss_delete_sec_context.c | 2 +- lib/libgssapi/gss_display_name.c | 2 +- lib/libgssapi/gss_duplicate_name.c | 2 +- lib/libgssapi/gss_duplicate_oid.c | 2 +- lib/libgssapi/gss_encapsulate_token.c | 2 +- lib/libgssapi/gss_export_name.c | 2 +- lib/libgssapi/gss_export_sec_context.c | 2 +- lib/libgssapi/gss_get_mic.c | 2 +- lib/libgssapi/gss_import_name.c | 2 +- lib/libgssapi/gss_import_sec_context.c | 2 +- lib/libgssapi/gss_indicate_mechs.c | 2 +- lib/libgssapi/gss_init_sec_context.c | 2 +- lib/libgssapi/gss_inquire_context.c | 2 +- lib/libgssapi/gss_inquire_cred.c | 2 +- lib/libgssapi/gss_inquire_cred_by_mech.c | 2 +- lib/libgssapi/gss_inquire_mechs_for_name.c | 2 +- lib/libgssapi/gss_inquire_names_for_mech.c | 2 +- lib/libgssapi/gss_inquire_sec_context_by_oid.c | 2 +- lib/libgssapi/gss_krb5.c | 2 +- lib/libgssapi/gss_mech_switch.c | 2 +- lib/libgssapi/gss_names.c | 2 +- lib/libgssapi/gss_pname_to_uid.c | 2 +- lib/libgssapi/gss_process_context_token.c | 2 +- lib/libgssapi/gss_release_buffer.c | 2 +- lib/libgssapi/gss_release_cred.c | 2 +- lib/libgssapi/gss_release_name.c | 2 +- lib/libgssapi/gss_release_oid_set.c | 2 +- lib/libgssapi/gss_seal.c | 2 +- lib/libgssapi/gss_sign.c | 2 +- lib/libgssapi/gss_test_oid_set_member.c | 2 +- lib/libgssapi/gss_unseal.c | 2 +- lib/libgssapi/gss_unwrap.c | 2 +- lib/libgssapi/gss_utils.c | 2 +- lib/libgssapi/gss_verify.c | 2 +- lib/libgssapi/gss_verify_mic.c | 2 +- lib/libgssapi/gss_wrap.c | 2 +- lib/libgssapi/gss_wrap_size_limit.c | 2 +- lib/libgssapi/mech_switch.h | 2 +- lib/libgssapi/name.h | 2 +- lib/libgssapi/spnego.h | 2 +- lib/libgssapi/utils.h | 2 +- lib/libiscsiutil/chap.c | 2 +- lib/libiscsiutil/connection.c | 2 +- lib/libiscsiutil/keys.c | 2 +- lib/libiscsiutil/libiscsiutil.h | 2 +- lib/libiscsiutil/log.c | 2 +- lib/libiscsiutil/pdu.c | 2 +- lib/libiscsiutil/text.c | 2 +- lib/libiscsiutil/utils.c | 2 +- lib/libjail/jail.c | 2 +- lib/libjail/jail.h | 2 +- lib/libjail/jail_getid.c | 2 +- lib/libkiconv/kiconv_sysctl.c | 2 +- lib/libkiconv/quirks.c | 2 +- lib/libkiconv/quirks.h | 2 +- lib/libkiconv/xlat16_iconv.c | 2 +- lib/libkvm/kvm_getswapinfo.c | 2 +- lib/libkvm/kvm_minidump_amd64.c | 2 +- lib/libkvm/kvm_minidump_arm.c | 2 +- lib/libkvm/kvm_minidump_i386.c | 2 +- lib/libkvm/kvm_minidump_mips.c | 2 +- lib/libkvm/kvm_powerpc64.h | 2 +- lib/libkvm/kvm_vnet.c | 2 +- lib/libmemstat/memstat.c | 2 +- lib/libmemstat/memstat.h | 2 +- lib/libmemstat/memstat_all.c | 2 +- lib/libmemstat/memstat_internal.h | 2 +- lib/libmemstat/memstat_malloc.c | 2 +- lib/libmemstat/memstat_uma.c | 2 +- lib/libmp/mpasbn.c | 2 +- lib/libnetbsd/rmd160.h | 2 +- lib/libnetbsd/sha1.h | 2 +- lib/libnetbsd/sha2.h | 2 +- lib/libnetbsd/util.c | 2 +- lib/libnetmap/libnetmap.h | 2 +- lib/libnetmap/nmctx-pthreads.c | 2 +- lib/libnetmap/nmctx.c | 2 +- lib/libnetmap/nmport.c | 2 +- lib/libnetmap/nmreq.c | 2 +- lib/libnv/common_impl.h | 2 +- lib/libnv/msgio.c | 2 +- lib/libnv/msgio.h | 2 +- lib/libpam/libpam/security/pam_mod_misc.h | 2 +- lib/libpam/modules/pam_ksu/pam_ksu.c | 2 +- lib/libpam/modules/pam_permit/pam_permit.c | 2 +- lib/libpjdlog/pjdlog.c | 2 +- lib/libpjdlog/pjdlog.h | 2 +- lib/libpmc/libpmc.c | 2 +- lib/libpmc/libpmc_json.cc | 2 +- lib/libpmc/libpmc_pmu_util.c | 2 +- lib/libpmc/libpmcinternal.h | 2 +- lib/libpmc/pmc.h | 2 +- lib/libpmc/pmcformat.h | 2 +- lib/libpmc/pmclog.c | 2 +- lib/libpmc/pmclog.h | 2 +- lib/libproc/_libproc.h | 2 +- lib/libproc/libproc.h | 2 +- lib/libproc/proc_bkpt.c | 2 +- lib/libproc/proc_create.c | 2 +- lib/libproc/proc_regs.c | 2 +- lib/libproc/proc_rtld.c | 2 +- lib/libproc/proc_sym.c | 2 +- lib/libproc/proc_util.c | 2 +- lib/libprocstat/common_kvm.h | 2 +- lib/libprocstat/core.c | 2 +- lib/libprocstat/core.h | 2 +- lib/libprocstat/libprocstat.h | 2 +- lib/libprocstat/libprocstat_internal.h | 2 +- lib/libprocstat/smbfs.c | 2 +- lib/libprocstat/udf.c | 2 +- lib/libprocstat/zfs.c | 2 +- lib/libprocstat/zfs_defs.c | 2 +- lib/libprocstat/zfs_defs.h | 2 +- lib/libradius/radlib.c | 2 +- lib/libradius/radlib.h | 2 +- lib/libradius/radlib_private.h | 2 +- lib/libradius/radlib_vs.h | 2 +- lib/libregex/tests/libregex_test.sh | 2 +- lib/librpcsec_gss/rpcsec_gss_conf.c | 2 +- lib/librpcsec_gss/rpcsec_gss_misc.c | 2 +- lib/librt/aio.c | 2 +- lib/librt/mq.c | 2 +- lib/librt/sigev_thread.c | 2 +- lib/librt/sigev_thread.h | 2 +- lib/librt/timer.c | 2 +- lib/librtld_db/rtld_db.c | 2 +- lib/librtld_db/rtld_db.h | 2 +- lib/libsdp/sdp-int.h | 2 +- lib/libsdp/sdp.h | 2 +- lib/libsdp/search.c | 2 +- lib/libsdp/service.c | 2 +- lib/libsdp/session.c | 2 +- lib/libsdp/util.c | 2 +- lib/libstdbuf/stdbuf.c | 2 +- lib/libstdthreads/call_once.c | 2 +- lib/libstdthreads/cnd.c | 2 +- lib/libstdthreads/mtx.c | 2 +- lib/libstdthreads/thrd.c | 2 +- lib/libstdthreads/threads.h | 2 +- lib/libstdthreads/tss.c | 2 +- lib/libsysdecode/tests/sysdecode_test.c | 2 +- lib/libtacplus/taclib.c | 2 +- lib/libtacplus/taclib.h | 2 +- lib/libtacplus/taclib_private.h | 2 +- lib/libthr/arch/aarch64/include/pthread_tls.h | 2 +- lib/libthr/arch/amd64/include/pthread_md.h | 2 +- lib/libthr/arch/amd64/include/pthread_tls.h | 2 +- lib/libthr/arch/arm/include/pthread_md.h | 2 +- lib/libthr/arch/arm/include/pthread_tls.h | 2 +- lib/libthr/arch/i386/include/pthread_md.h | 2 +- lib/libthr/arch/i386/include/pthread_tls.h | 2 +- lib/libthr/arch/mips/include/pthread_md.h | 2 +- lib/libthr/arch/mips/include/pthread_tls.h | 2 +- lib/libthr/arch/powerpc/include/pthread_tls.h | 2 +- lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S | 2 +- lib/libthr/arch/riscv/include/pthread_tls.h | 2 +- lib/libthr/thread/thr_affinity.c | 2 +- lib/libthr/thread/thr_barrier.c | 2 +- lib/libthr/thread/thr_barrierattr.c | 2 +- lib/libthr/thread/thr_cancel.c | 2 +- lib/libthr/thread/thr_cond.c | 2 +- lib/libthr/thread/thr_create.c | 2 +- lib/libthr/thread/thr_detach.c | 2 +- lib/libthr/thread/thr_event.c | 2 +- lib/libthr/thread/thr_getcpuclockid.c | 2 +- lib/libthr/thread/thr_getthreadid_np.c | 2 +- lib/libthr/thread/thr_join.c | 2 +- lib/libthr/thread/thr_kern.c | 2 +- lib/libthr/thread/thr_list.c | 2 +- lib/libthr/thread/thr_main_np.c | 2 +- lib/libthr/thread/thr_malloc.c | 2 +- lib/libthr/thread/thr_once.c | 2 +- lib/libthr/thread/thr_printf.c | 2 +- lib/libthr/thread/thr_private.h | 2 +- lib/libthr/thread/thr_pspinlock.c | 2 +- lib/libthr/thread/thr_rtld.c | 2 +- lib/libthr/thread/thr_rwlock.c | 2 +- lib/libthr/thread/thr_rwlockattr.c | 2 +- lib/libthr/thread/thr_sem.c | 2 +- lib/libthr/thread/thr_sig.c | 2 +- lib/libthr/thread/thr_sleepq.c | 2 +- lib/libthr/thread/thr_stack.c | 2 +- lib/libthr/thread/thr_umtx.c | 2 +- lib/libthr/thread/thr_umtx.h | 2 +- lib/libthread_db/arch/amd64/libpthread_md.c | 2 +- lib/libthread_db/arch/arm/libpthread_md.c | 2 +- lib/libthread_db/arch/i386/libpthread_md.c | 2 +- lib/libthread_db/arch/powerpc/libpthread_md.c | 2 +- lib/libthread_db/kse.h | 2 +- lib/libthread_db/libpthread_db.c | 2 +- lib/libthread_db/libpthread_db.h | 2 +- lib/libthread_db/libthr_db.c | 2 +- lib/libthread_db/thread_db.c | 2 +- lib/libthread_db/thread_db.h | 2 +- lib/libthread_db/thread_db_int.h | 2 +- lib/libufs/block.c | 2 +- lib/libufs/cgroup.c | 2 +- lib/libufs/inode.c | 2 +- lib/libufs/libufs.h | 2 +- lib/libufs/sblock.c | 2 +- lib/libufs/type.c | 2 +- lib/libugidfw/ugidfw.c | 2 +- lib/libugidfw/ugidfw.h | 2 +- lib/libulog/ulog.h | 2 +- lib/libulog/ulog_login.c | 2 +- lib/libulog/ulog_login_pseudo.c | 2 +- lib/libulog/utempter.c | 2 +- lib/libulog/utempter.h | 2 +- lib/libusb/libusb.h | 2 +- lib/libusb/libusb01.c | 2 +- lib/libusb/libusb10.c | 2 +- lib/libusb/libusb10.h | 2 +- lib/libusb/libusb10_desc.c | 2 +- lib/libusb/libusb10_io.c | 2 +- lib/libusb/libusb20.c | 2 +- lib/libusb/libusb20.h | 2 +- lib/libusb/libusb20_desc.c | 2 +- lib/libusb/libusb20_desc.h | 2 +- lib/libusb/libusb20_int.h | 2 +- lib/libusb/libusb20_ugen20.c | 2 +- lib/libusb/libusb_global_linux.h | 2 +- lib/libusb/usb.h | 2 +- lib/libutil/auth.c | 2 +- lib/libutil/expand_number.c | 2 +- lib/libutil/flopen.c | 2 +- lib/libutil/getlocalbase.3 | 2 +- lib/libutil/gr_util.c | 2 +- lib/libutil/humanize_number.c | 2 +- lib/libutil/kinfo_getallproc.c | 2 +- lib/libutil/kinfo_getproc.c | 2 +- lib/libutil/kld.c | 2 +- lib/libutil/login_crypt.c | 2 +- lib/libutil/pidfile.c | 2 +- lib/libutil/property.c | 2 +- lib/libutil/quotafile.c | 2 +- lib/libutil/realhostname.c | 2 +- lib/libutil/stub.c | 2 +- lib/libutil/trimdomain.c | 2 +- lib/libvmmapi/vmmapi.c | 2 +- lib/libvmmapi/vmmapi.h | 2 +- lib/libvmmapi/vmmapi_freebsd.c | 2 +- lib/liby/yyerror.h | 2 +- lib/libypclnt/ypclnt_passwd.c | 2 +- lib/msun/amd64/fenv.c | 2 +- lib/msun/arm/fenv.c | 2 +- lib/msun/arm/fenv.h | 2 +- lib/msun/i387/fenv.c | 2 +- lib/msun/i387/invtrig.c | 2 +- lib/msun/ld128/invtrig.c | 2 +- lib/msun/ld128/invtrig.h | 2 +- lib/msun/ld128/k_expl.h | 2 +- lib/msun/ld128/s_cexpl.c | 2 +- lib/msun/ld128/s_exp2l.c | 2 +- lib/msun/ld128/s_expl.c | 2 +- lib/msun/ld128/s_logl.c | 2 +- lib/msun/ld128/s_nanl.c | 2 +- lib/msun/ld80/invtrig.c | 2 +- lib/msun/ld80/invtrig.h | 2 +- lib/msun/ld80/k_expl.h | 2 +- lib/msun/ld80/s_cexpl.c | 2 +- lib/msun/ld80/s_exp2l.c | 2 +- lib/msun/ld80/s_expl.c | 2 +- lib/msun/ld80/s_logl.c | 2 +- lib/msun/ld80/s_nanl.c | 2 +- lib/msun/mips/fenv.c | 2 +- lib/msun/mips/fenv.h | 2 +- lib/msun/powerpc/fenv.c | 2 +- lib/msun/powerpc/fenv.h | 2 +- lib/msun/src/catrig.c | 2 +- lib/msun/src/catrigf.c | 2 +- lib/msun/src/e_remainderl.c | 2 +- lib/msun/src/e_sqrtl.c | 2 +- lib/msun/src/fenv-softfloat.h | 2 +- lib/msun/src/imprecise.c | 2 +- lib/msun/src/k_exp.c | 2 +- lib/msun/src/k_expf.c | 2 +- lib/msun/src/s_carg.c | 2 +- lib/msun/src/s_cargf.c | 2 +- lib/msun/src/s_cargl.c | 2 +- lib/msun/src/s_ccosh.c | 2 +- lib/msun/src/s_ccoshf.c | 2 +- lib/msun/src/s_cexp.c | 2 +- lib/msun/src/s_cexpf.c | 2 +- lib/msun/src/s_cimag.c | 2 +- lib/msun/src/s_cimagf.c | 2 +- lib/msun/src/s_cimagl.c | 2 +- lib/msun/src/s_conj.c | 2 +- lib/msun/src/s_conjf.c | 2 +- lib/msun/src/s_conjl.c | 2 +- lib/msun/src/s_copysignl.c | 2 +- lib/msun/src/s_cosl.c | 2 +- lib/msun/src/s_cproj.c | 2 +- lib/msun/src/s_cprojf.c | 2 +- lib/msun/src/s_cprojl.c | 2 +- lib/msun/src/s_creal.c | 2 +- lib/msun/src/s_crealf.c | 2 +- lib/msun/src/s_creall.c | 2 +- lib/msun/src/s_csinh.c | 2 +- lib/msun/src/s_csinhf.c | 2 +- lib/msun/src/s_csqrt.c | 2 +- lib/msun/src/s_csqrtf.c | 2 +- lib/msun/src/s_csqrtl.c | 2 +- lib/msun/src/s_ctanh.c | 2 +- lib/msun/src/s_ctanhf.c | 2 +- lib/msun/src/s_exp2.c | 2 +- lib/msun/src/s_exp2f.c | 2 +- lib/msun/src/s_fdim.c | 2 +- lib/msun/src/s_fma.c | 2 +- lib/msun/src/s_fmaf.c | 2 +- lib/msun/src/s_fmal.c | 2 +- lib/msun/src/s_fmax.c | 2 +- lib/msun/src/s_fmaxf.c | 2 +- lib/msun/src/s_fmaxl.c | 2 +- lib/msun/src/s_fmin.c | 2 +- lib/msun/src/s_fminf.c | 2 +- lib/msun/src/s_fminl.c | 2 +- lib/msun/src/s_frexpl.c | 2 +- lib/msun/src/s_isfinite.c | 2 +- lib/msun/src/s_isnan.c | 2 +- lib/msun/src/s_isnormal.c | 2 +- lib/msun/src/s_lrint.c | 2 +- lib/msun/src/s_lround.c | 2 +- lib/msun/src/s_modfl.c | 2 +- lib/msun/src/s_nan.c | 2 +- lib/msun/src/s_nearbyint.c | 2 +- lib/msun/src/s_rintl.c | 2 +- lib/msun/src/s_round.c | 2 +- lib/msun/src/s_roundf.c | 2 +- lib/msun/src/s_roundl.c | 2 +- lib/msun/src/s_scalbln.c | 2 +- lib/msun/src/s_signbit.c | 2 +- lib/msun/src/s_sinl.c | 2 +- lib/msun/src/s_tanl.c | 2 +- lib/msun/src/s_tgammaf.c | 2 +- lib/msun/x86/fenv.h | 2 +- libexec/atrun/gloadavg.h | 2 +- libexec/phttpget/phttpget.c | 2 +- libexec/pppoed/pppoed.c | 2 +- libexec/rtld-elf/amd64/reloc.c | 2 +- libexec/rtld-elf/amd64/rtld_machdep.h | 2 +- libexec/rtld-elf/arm/rtld_machdep.h | 2 +- libexec/rtld-elf/debug.c | 2 +- libexec/rtld-elf/debug.h | 2 +- libexec/rtld-elf/i386/reloc.c | 2 +- libexec/rtld-elf/i386/rtld_machdep.h | 2 +- libexec/rtld-elf/map_object.c | 2 +- libexec/rtld-elf/mips/rtld_machdep.h | 2 +- libexec/rtld-elf/powerpc/rtld_machdep.h | 2 +- libexec/rtld-elf/powerpc64/rtld_machdep.h | 2 +- libexec/rtld-elf/rtld.c | 2 +- libexec/rtld-elf/rtld.h | 2 +- libexec/rtld-elf/rtld_lock.c | 2 +- libexec/rtld-elf/rtld_lock.h | 2 +- libexec/rtld-elf/rtld_malloc.h | 2 +- libexec/rtld-elf/rtld_printf.h | 2 +- libexec/rtld-elf/rtld_tls.h | 2 +- libexec/rtld-elf/tests/common.c | 2 +- libexec/rtld-elf/tests/common.h | 2 +- libexec/rtld-elf/tests/ld_preload_fds.c | 2 +- libexec/rtld-elf/xmalloc.c | 2 +- libexec/save-entropy/save-entropy.sh | 2 +- libexec/talkd/extern.h | 2 +- libexec/tftpd/tests/functional.c | 2 +- libexec/tftpd/tftp-file.c | 2 +- libexec/tftpd/tftp-file.h | 2 +- libexec/tftpd/tftp-io.c | 2 +- libexec/tftpd/tftp-io.h | 2 +- libexec/tftpd/tftp-options.c | 2 +- libexec/tftpd/tftp-options.h | 2 +- libexec/tftpd/tftp-transfer.c | 2 +- libexec/tftpd/tftp-transfer.h | 2 +- libexec/tftpd/tftp-utils.c | 2 +- libexec/tftpd/tftp-utils.h | 2 +- libexec/ulog-helper/ulog-helper.c | 2 +- sbin/adjkerntz/adjkerntz.c | 2 +- sbin/adjkerntz/pathnames.h | 2 +- sbin/bectl/bectl.8 | 2 +- sbin/bectl/bectl.c | 2 +- sbin/bectl/bectl.h | 2 +- sbin/bectl/bectl_jail.c | 2 +- sbin/bectl/bectl_list.c | 2 +- sbin/bectl/tests/bectl_test.sh | 2 +- sbin/camcontrol/fwdownload.c | 2 +- sbin/camcontrol/modeedit.c | 2 +- sbin/comcontrol/comcontrol.c | 2 +- sbin/conscontrol/conscontrol.c | 2 +- sbin/ddb/ddb.c | 2 +- sbin/ddb/ddb.h | 2 +- sbin/ddb/ddb_capture.c | 2 +- sbin/ddb/ddb_script.c | 2 +- sbin/devd/devd.cc | 2 +- sbin/devd/devd.h | 2 +- sbin/devd/devd.hh | 2 +- sbin/devd/parse.y | 2 +- sbin/devd/token.l | 2 +- sbin/devfs/devfs.c | 2 +- sbin/devfs/extern.h | 2 +- sbin/devfs/rule.c | 2 +- sbin/etherswitchcfg/etherswitchcfg.c | 2 +- sbin/fdisk/fdisk_mbr_enc.c | 2 +- sbin/fdisk/fdisk_mbr_enc.h | 2 +- sbin/fsck_ffs/fsck.h | 2 +- sbin/fsck_ffs/gjournal.c | 2 +- sbin/fsck_ffs/suj.c | 2 +- sbin/fsck_msdosfs/boot.c | 2 +- sbin/fsck_msdosfs/check.c | 2 +- sbin/fsck_msdosfs/dir.c | 2 +- sbin/fsck_msdosfs/dosfs.h | 2 +- sbin/fsck_msdosfs/ext.h | 2 +- sbin/fsirand/fsirand.c | 2 +- sbin/gbde/gbde.c | 2 +- sbin/geom/core/geom.c | 2 +- sbin/geom/core/geom.h | 2 +- sbin/geom/misc/subr.c | 2 +- sbin/geom/misc/subr.h | 2 +- sbin/ggate/ggatec/ggatec.c | 2 +- sbin/ggate/ggated/ggated.c | 2 +- sbin/ggate/ggatel/ggatel.c | 2 +- sbin/ggate/shared/ggate.c | 2 +- sbin/ggate/shared/ggate.h | 2 +- sbin/gvinum/gvinum.c | 2 +- sbin/hastctl/hastctl.c | 2 +- sbin/hastd/activemap.c | 2 +- sbin/hastd/activemap.h | 2 +- sbin/hastd/control.c | 2 +- sbin/hastd/control.h | 2 +- sbin/hastd/ebuf.c | 2 +- sbin/hastd/ebuf.h | 2 +- sbin/hastd/event.c | 2 +- sbin/hastd/event.h | 2 +- sbin/hastd/hast.h | 2 +- sbin/hastd/hast_checksum.c | 2 +- sbin/hastd/hast_checksum.h | 2 +- sbin/hastd/hast_compression.c | 2 +- sbin/hastd/hast_compression.h | 2 +- sbin/hastd/hast_proto.c | 2 +- sbin/hastd/hast_proto.h | 2 +- sbin/hastd/hastd.c | 2 +- sbin/hastd/hastd.h | 2 +- sbin/hastd/hooks.c | 2 +- sbin/hastd/hooks.h | 2 +- sbin/hastd/lzf.c | 2 +- sbin/hastd/lzf.h | 2 +- sbin/hastd/metadata.c | 2 +- sbin/hastd/metadata.h | 2 +- sbin/hastd/nv.c | 2 +- sbin/hastd/nv.h | 2 +- sbin/hastd/parse.y | 2 +- sbin/hastd/pjdlog.c | 2 +- sbin/hastd/pjdlog.h | 2 +- sbin/hastd/primary.c | 2 +- sbin/hastd/proto.c | 2 +- sbin/hastd/proto.h | 2 +- sbin/hastd/proto_common.c | 2 +- sbin/hastd/proto_impl.h | 2 +- sbin/hastd/proto_socketpair.c | 2 +- sbin/hastd/proto_tcp.c | 2 +- sbin/hastd/proto_uds.c | 2 +- sbin/hastd/rangelock.c | 2 +- sbin/hastd/rangelock.h | 2 +- sbin/hastd/refcnt.h | 2 +- sbin/hastd/secondary.c | 2 +- sbin/hastd/subr.c | 2 +- sbin/hastd/subr.h | 2 +- sbin/hastd/synch.h | 2 +- sbin/hastd/token.l | 2 +- sbin/ifconfig/af_nd6.c | 2 +- sbin/ifconfig/carp.c | 2 +- sbin/ifconfig/iffib.c | 2 +- sbin/ifconfig/ifgif.c | 2 +- sbin/ifconfig/ifgre.c | 2 +- sbin/ifconfig/ifgroup.c | 2 +- sbin/ifconfig/ifpfsync.c | 2 +- sbin/ipfw/nat64clat.c | 2 +- sbin/ipfw/nat64lsn.c | 2 +- sbin/ipfw/nat64stl.c | 2 +- sbin/iscontrol/auth_subr.c | 2 +- sbin/iscontrol/config.c | 2 +- sbin/iscontrol/fsm.c | 2 +- sbin/iscontrol/iscontrol.c | 2 +- sbin/iscontrol/iscontrol.h | 2 +- sbin/iscontrol/login.c | 2 +- sbin/iscontrol/misc.c | 2 +- sbin/iscontrol/pdu.c | 2 +- sbin/kldconfig/kldconfig.c | 2 +- sbin/kldload/kldload.c | 2 +- sbin/kldstat/kldstat.c | 2 +- sbin/kldunload/kldunload.c | 2 +- sbin/ldconfig/elfhints.c | 2 +- sbin/ldconfig/ldconfig.h | 2 +- sbin/mdconfig/mdconfig.c | 2 +- sbin/mdmfs/mdmfs.c | 2 +- sbin/mount/extern.h | 2 +- sbin/mount_fusefs/mount_fusefs.c | 2 +- sbin/newfs_msdos/newfs_msdos.c | 2 +- sbin/nos-tun/nos-tun.c | 2 +- sbin/nvmecontrol/comnd.c | 2 +- sbin/nvmecontrol/comnd.h | 2 +- sbin/nvmecontrol/devlist.c | 2 +- sbin/nvmecontrol/firmware.c | 2 +- sbin/nvmecontrol/format.c | 2 +- sbin/nvmecontrol/identify.c | 2 +- sbin/nvmecontrol/identify_ext.c | 2 +- sbin/nvmecontrol/logpage.c | 2 +- sbin/nvmecontrol/modules/intel/intel.c | 2 +- sbin/nvmecontrol/nc_util.c | 2 +- sbin/nvmecontrol/ns.c | 2 +- sbin/nvmecontrol/nsid.c | 2 +- sbin/nvmecontrol/nvmecontrol.c | 2 +- sbin/nvmecontrol/nvmecontrol.h | 2 +- sbin/nvmecontrol/nvmecontrol_ext.h | 2 +- sbin/nvmecontrol/passthru.c | 2 +- sbin/nvmecontrol/perftest.c | 2 +- sbin/nvmecontrol/reset.c | 2 +- sbin/nvmecontrol/resv.c | 2 +- sbin/nvmecontrol/sanitize.c | 2 +- sbin/nvmecontrol/selftest.c | 2 +- *** 65042 LINES SKIPPED *** From nobody Tue Jul 25 20:48:42 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 4R9Tdk5xmfz4nZJ6; Tue, 25 Jul 2023 20:48:42 +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 4R9Tdk4bssz3kq5; Tue, 25 Jul 2023 20:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318122; 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=vuyIl0ffcvMo8OsGU8pNuUOjPs3wXgejbiqKZ8zp8fI=; b=aQQnaNJdhRgx/vE/3/qFyFcthX51CXoxu2hSw8t2y4soDXmThyw/dfIxmCkqY8EHHO6nCN JsFBTUyNvzIqNDPJM4wz7i2pjv7sXVTjVfq+l74JGLoZoyQND+VbcphrnUI5HKhO423HXk sAL+dkWaY/X+WewnnqqJTY9Q2ZhU3sa0QFekC1lFhxzeoOVcabFynVPpvy7nGbVVJPND27 xCaicq77ta8BaeMtgAOkYz6aScvHUSrTxGKZj2/raLyF629le2UhbIVcdObGS4CabDnXtM MF9LmcNuNciNU8wr/CmEDhvplkomygWNBaWUrveXmlhiGJ9HjpzuVsTF228Omw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318122; 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=vuyIl0ffcvMo8OsGU8pNuUOjPs3wXgejbiqKZ8zp8fI=; b=c3C1ANuTMKf2p5XBPRiq0W7cZhut7jlXM+ICghiZ70IYv9pUwsbFbDh0FjDPOjHwXPhd51 V0y1ASlSzDhJTDdfN1ZKGi4CtaOPlOV//0TgwCrDLBTYbvJ1xXYrSCTDvydCR97WCYqoys d3Pgk8FGve5rrGUJoZHJg6QpNKJHqfQHCkDUoKAynew6IcxoLt/7SacUdaDgdJUjeYRnyp VVvzo/WQF+gy8nlzHT2qeH1E2+vtHdTB23IW4Ay+1Tb8eXLmgaXsjO5F8eCKEY3jfZntzJ wHuNXGuOy9N8ocBY2A7K020B2gt1CZQP+ouDjRKwpCuuxxW2sENUItkUPxWMjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318122; a=rsa-sha256; cv=none; b=eYkRnDBx0cjseZCsrJzLt9viSYMONyvcdI2vZWuW3TtRSHDlky+RLxeoEopZfiHXS70fKw MTHW+YCYo92nhcGkXaSPzruGYxvY2P3pxhTnITdvUkD6kAp1sjOL0n+ObsK2IoA7i40spA 8ZtTgs3cDmKOBRNyxd3C5X0jYsUiDxmyrRLkJhGocH9vkwMQXZf8bRzN9ru51RkVRGTJi+ AVsX6rku5I781v17a8Q6A+LYQSKSE6Y9weYc2rw/97eS0MQ+GE7FhQLYFRBE7ja+jPOEzg folujwx9qHZlnDWRgp112V9rM7b0CARvOezLRZl0op2LT1rXPrB8rsPEgeS6FA== 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 4R9Tdk28yRzFxT; Tue, 25 Jul 2023 20:48:42 +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 36PKmgFB063620; Tue, 25 Jul 2023 20:48:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmg23063619; Tue, 25 Jul 2023 20:48:42 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:42 GMT Message-Id: <202307252048.36PKmg23063619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c114c5aee5d0 - stable/13 - spdx: Remove duplicate lines List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c114c5aee5d0b71d08dfc949dba2e2a9298190c4 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c114c5aee5d0b71d08dfc949dba2e2a9298190c4 commit c114c5aee5d0b71d08dfc949dba2e2a9298190c4 Author: Warner Losh AuthorDate: 2023-05-10 22:42:54 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:14:23 +0000 spdx: Remove duplicate lines Remove duplicated SPDX lines. Sponsored by: Netflix (cherry picked from commit c87658aa7d1fe09d3839b9ad1d6a9c0fef5afd94) --- sys/dev/qlxge/qls_isr.c | 2 -- sys/xen/xenbus/xenbusb.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/dev/qlxge/qls_isr.c b/sys/dev/qlxge/qls_isr.c index f8fc84680997..9778fecc4218 100644 --- a/sys/dev/qlxge/qls_isr.c +++ b/sys/dev/qlxge/qls_isr.c @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause - * * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013-2014 Qlogic Corporation diff --git a/sys/xen/xenbus/xenbusb.h b/sys/xen/xenbus/xenbusb.h index 12f5201f70eb..f59af62a7c2c 100644 --- a/sys/xen/xenbus/xenbusb.h +++ b/sys/xen/xenbus/xenbusb.h @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause - * * Core definitions and data structures shareable across OS platforms. * * SPDX-License-Identifier: BSD-2-Clause From nobody Tue Jul 25 20:48:43 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 4R9Tdm0g55z4nZCX; Tue, 25 Jul 2023 20:48:44 +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 4R9Tdl5SZ3z3khy; Tue, 25 Jul 2023 20:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318123; 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=5wZs1ZnCCPCVtXX95JJ2h0Kn+rPE/0/ByZb3AJOaVF8=; b=v0U83A+7a4HEgk+G4KmbuUFTZyBiYQlGKPAp5wsejUbfIRCBNciVoHnupoRCRgjnk7o3qR xFCuAvksMD6lk6PLz40u2KgGoJWdRxylVKYTki4JP9276SBCFW0HADY01tXl4WAOxOLfi2 HFi9yMYcO3hmvjIjnOH4MhwAfLcVv3nlJLm+5eOypWe5cI7X4VhaFfg8zcAfjdKL6Q31Sy 9Kr4sK1D4nbeUuHDQ9Prp4Ejn40iFeR5OHM/ILPHRfjLxPQ5qmZlAnAZzDoL3kR1SIxeb5 sE7X+MUXzjKtKunS3NHZsdtigvmcMmxslGyAixR09L9Rb/xp7d0tI9gDkUUCpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318123; 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=5wZs1ZnCCPCVtXX95JJ2h0Kn+rPE/0/ByZb3AJOaVF8=; b=NMAj7ETW0K0jdpm43JSMfnCz9QeK0V/qqk7VipcDSSAgVUpCXl08yFr4C8ABBKs3YX6nC2 PbZEgyGjztmDxnWF8iGeHECrdsdY8TZ2RYPUWv3Q+bvKM0KNljrt4qcxfHE4M5/t/6ihJE De3iHmjztgDnPem5gG4XeSE7tffLIVrMenyNOqPNlhU4OnMwF2fY3gWY5KDSVfi5jZbRxh Ok9h2TbWo+hKcjwxN7ac9TQ23kjh5jmL+veWGvr3tpUfWl4Wd1gu0NftVY7m9RTcX3HklD 2OZ4Qk0crF7LzqNjN7PhmDOdy6HRIls6jE92yJHu8Y+H5Bv6R7YD/worvZ7vPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318123; a=rsa-sha256; cv=none; b=j0o8/OUIu5mAIGcZrCFSrOxjPjCxDz+Xr5WTXbiCVHwVDJ+YTUJei99o8Q4lYACSLWVjZ8 oOe4bRkVfSKDHPVskIE4wmfdV71Rwmg2iM5up1/YQPAFh8PlLX4pbotDTnP/Za8UTiXVcm WhNN5rDsMgMsrXFtHF/rUdek0n0vrm3XlcY5wmVtxZe79luadONEDY3Dh/V5K4mbX8/hpm 1P22IJ78w79YcdsHRHsICmIZvZyYVpS+sHh8LNpfR4Xi13zX32Kpkgr1FbuhLcLlcERn8M z3luxWUMFRP19cjGTsrMV4TQCS0o+vje7NYxnqpUqnp08ggUVriH+pcFqIL5Aw== 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 4R9Tdl3bt5zFG2; Tue, 25 Jul 2023 20:48:43 +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 36PKmh6x063639; Tue, 25 Jul 2023 20:48:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmh50063638; Tue, 25 Jul 2023 20:48:43 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:43 GMT Message-Id: <202307252048.36PKmh50063638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f73b4bf27cf5 - stable/13 - spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f73b4bf27cf50bcd9224b6011197886f4c494f78 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f73b4bf27cf50bcd9224b6011197886f4c494f78 commit f73b4bf27cf50bcd9224b6011197886f4c494f78 Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:15:32 +0000 spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD The SPDX folks have obsoleted the BSD-2-Clause-NetBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit b61a573019428cbdc38ed03be9ecd2482011ea66) --- bin/pkill/pkill.c | 2 +- include/getopt.h | 2 +- include/hesiod.h | 2 +- include/netconfig.h | 2 +- include/nl_types.h | 2 +- include/nsswitch.h | 2 +- include/stringlist.h | 2 +- include/wchar.h | 2 +- lib/libc/arm/gen/arm_initfini.c | 2 +- lib/libc/arm/gen/makecontext.c | 2 +- lib/libc/gen/fmtcheck.c | 2 +- lib/libc/gen/lockf.c | 2 +- lib/libc/mips/gen/makecontext.c | 2 +- lib/libc/net/nsdispatch.c | 2 +- lib/libc/net/nslexer.l | 2 +- lib/libc/net/nsparser.y | 2 +- lib/libc/powerpc/gen/fpgetmask.c | 2 +- lib/libc/powerpc/gen/fpgetround.c | 2 +- lib/libc/powerpc/gen/fpgetsticky.c | 2 +- lib/libc/powerpc/gen/fpsetmask.c | 2 +- lib/libc/powerpc/gen/fpsetround.c | 2 +- lib/libc/powerpc64/gen/flt_rounds.c | 2 +- lib/libc/powerpc64/gen/fpgetmask.c | 2 +- lib/libc/powerpc64/gen/fpgetround.c | 2 +- lib/libc/powerpc64/gen/fpgetsticky.c | 2 +- lib/libc/powerpc64/gen/fpsetmask.c | 2 +- lib/libc/softfloat/fpgetmask.c | 2 +- lib/libc/softfloat/fpgetround.c | 2 +- lib/libc/softfloat/fpgetsticky.c | 2 +- lib/libc/softfloat/fpsetmask.c | 2 +- lib/libc/softfloat/fpsetround.c | 2 +- lib/libc/softfloat/fpsetsticky.c | 2 +- lib/libnetbsd/stdlib.h | 2 +- lib/libnetbsd/strsuftoll.c | 2 +- lib/libusbhid/data.c | 2 +- lib/libusbhid/descr.c | 2 +- lib/libusbhid/descr_compat.c | 2 +- lib/libusbhid/parse.c | 2 +- lib/libusbhid/usage.c | 2 +- lib/libusbhid/usbhid.h | 2 +- lib/libusbhid/usbvar.h | 2 +- libexec/rpc.sprayd/sprayd.c | 2 +- libexec/rtld-elf/powerpc/reloc.c | 2 +- libexec/rtld-elf/powerpc64/reloc.c | 2 +- sbin/camcontrol/camcontrol.h | 2 +- sbin/camcontrol/progress.c | 2 +- sbin/camcontrol/progress.h | 2 +- sbin/ccdconfig/pathnames.h | 2 +- share/examples/kld/dyn_sysctl/dyn_sysctl.c | 2 +- share/examples/kld/firmware/fwconsumer/fw_consumer.c | 2 +- sys/arm/include/_inttypes.h | 2 +- sys/arm/include/_stdint.h | 2 +- sys/arm/include/bus_dma.h | 2 +- sys/arm/include/ucontext.h | 2 +- sys/compat/linux/linux_getcwd.c | 2 +- sys/compat/linux/linux_time.c | 2 +- sys/dev/bhnd/cores/usb/bhnd_ohci.c | 2 +- sys/dev/esp/am53c974reg.h | 2 +- sys/dev/esp/esp_pci.c | 2 +- sys/dev/esp/ncr53c9xvar.h | 2 +- sys/dev/fxp/if_fxp.c | 2 +- sys/dev/fxp/if_fxpreg.h | 2 +- sys/dev/gem/if_gem.c | 2 +- sys/dev/gem/if_gem_pci.c | 2 +- sys/dev/gem/if_gemreg.h | 2 +- sys/dev/gem/if_gemvar.h | 2 +- sys/dev/hid/hid.c | 2 +- sys/dev/hid/hid.h | 2 +- sys/dev/hid/hidquirk.c | 2 +- sys/dev/hid/hidraw.c | 2 +- sys/dev/hid/hkbd.c | 2 +- sys/dev/iicbus/s35390a.c | 2 +- sys/dev/le/am7990.c | 2 +- sys/dev/le/am79900.c | 2 +- sys/dev/le/am79900reg.h | 2 +- sys/dev/le/am79900var.h | 2 +- sys/dev/le/am7990var.h | 2 +- sys/dev/le/if_le_isa.c | 2 +- sys/dev/le/if_le_pci.c | 2 +- sys/dev/le/lance.c | 2 +- sys/dev/le/lancereg.h | 2 +- sys/dev/le/lancevar.h | 2 +- sys/dev/mii/acphy.c | 2 +- sys/dev/mii/bmtphy.c | 2 +- sys/dev/mii/bmtphyreg.h | 2 +- sys/dev/mii/e1000phy.c | 2 +- sys/dev/mii/gentbi.c | 2 +- sys/dev/mii/icsphy.c | 2 +- sys/dev/mii/icsphyreg.h | 2 +- sys/dev/mii/lxtphy.c | 2 +- sys/dev/mii/lxtphyreg.h | 2 +- sys/dev/mii/mii.c | 2 +- sys/dev/mii/mii_bitbang.c | 2 +- sys/dev/mii/mii_bitbang.h | 2 +- sys/dev/mii/mii_physubr.c | 2 +- sys/dev/mii/miivar.h | 2 +- sys/dev/mii/nsphy.c | 2 +- sys/dev/mii/nsphyreg.h | 2 +- sys/dev/mii/nsphyter.c | 2 +- sys/dev/mii/nsphyterreg.h | 2 +- sys/dev/mii/qsphy.c | 2 +- sys/dev/mii/qsphyreg.h | 2 +- sys/dev/mii/ukphy.c | 2 +- sys/dev/mii/ukphy_subr.c | 2 +- sys/dev/ofw/ofw_pci.h | 2 +- sys/dev/qat/qat.c | 2 +- sys/dev/qat/qat_ae.c | 2 +- sys/dev/qat/qat_aevar.h | 2 +- sys/dev/qat/qat_c2xxx.c | 2 +- sys/dev/qat/qat_c2xxxreg.h | 2 +- sys/dev/qat/qat_c3xxx.c | 2 +- sys/dev/qat/qat_c3xxxreg.h | 2 +- sys/dev/qat/qat_c62x.c | 2 +- sys/dev/qat/qat_c62xreg.h | 2 +- sys/dev/qat/qat_d15xx.c | 2 +- sys/dev/qat/qat_d15xxreg.h | 2 +- sys/dev/qat/qat_dh895xccreg.h | 2 +- sys/dev/qat/qat_hw15.c | 2 +- sys/dev/qat/qat_hw15reg.h | 2 +- sys/dev/qat/qat_hw15var.h | 2 +- sys/dev/qat/qat_hw17.c | 2 +- sys/dev/qat/qat_hw17reg.h | 2 +- sys/dev/qat/qat_hw17var.h | 2 +- sys/dev/qat/qatreg.h | 2 +- sys/dev/qat/qatvar.h | 2 +- sys/dev/sound/midi/midi.c | 2 +- sys/dev/sound/pci/cmireg.h | 2 +- sys/dev/sound/pci/via82c686.h | 2 +- sys/dev/sound/usb/uaudio.c | 2 +- sys/dev/sound/usb/uaudioreg.h | 2 +- sys/dev/stge/if_stge.c | 2 +- sys/dev/stge/if_stgereg.h | 2 +- sys/dev/usb/controller/ehci.h | 2 +- sys/dev/usb/controller/ehci_pci.c | 2 +- sys/dev/usb/controller/ehcireg.h | 2 +- sys/dev/usb/controller/ohci.h | 2 +- sys/dev/usb/controller/ohci_pci.c | 2 +- sys/dev/usb/input/uhid.c | 2 +- sys/dev/usb/input/ukbd.c | 2 +- sys/dev/usb/input/usbhid.c | 2 +- sys/dev/usb/quirk/usb_quirk.c | 2 +- sys/dev/usb/serial/ubsa.c | 2 +- sys/dev/usb/serial/ubser.c | 2 +- sys/dev/usb/serial/uchcom.c | 2 +- sys/dev/usb/serial/ufoma.c | 2 +- sys/dev/usb/serial/uftdi.c | 2 +- sys/dev/usb/serial/ugensa.c | 2 +- sys/dev/usb/serial/uipaq.c | 2 +- sys/dev/usb/serial/ulpt.c | 2 +- sys/dev/usb/serial/umodem.c | 2 +- sys/dev/usb/serial/uplcom.c | 2 +- sys/dev/usb/serial/usb_serial.c | 2 +- sys/dev/usb/serial/usb_serial.h | 2 +- sys/dev/usb/serial/uvisor.c | 2 +- sys/dev/usb/usb.h | 2 +- sys/dev/usb/usb_cdc.h | 2 +- sys/dev/usb/usb_hid.c | 2 +- sys/dev/usb/usb_hub.c | 2 +- sys/dev/usb/usb_hub_acpi.c | 2 +- sys/dev/usb/usb_hub_private.h | 2 +- sys/dev/usb/usbhid.h | 2 +- sys/dev/xl/xlphy.c | 2 +- sys/fs/tmpfs/tmpfs.h | 2 +- sys/fs/tmpfs/tmpfs_fifoops.c | 2 +- sys/fs/tmpfs/tmpfs_fifoops.h | 2 +- sys/fs/tmpfs/tmpfs_subr.c | 2 +- sys/fs/tmpfs/tmpfs_vfsops.c | 2 +- sys/fs/tmpfs/tmpfs_vnops.c | 2 +- sys/fs/tmpfs/tmpfs_vnops.h | 2 +- sys/geom/geom_ccd.c | 2 +- sys/mips/cavium/octopci_bus_space.c | 2 +- sys/mips/include/_inttypes.h | 2 +- sys/mips/include/bus.h | 2 +- sys/mips/include/elf.h | 2 +- sys/mips/malta/gt_pci_bus_space.h | 2 +- sys/mips/malta/gtreg.h | 2 +- sys/mips/mips/bus_space_generic.c | 2 +- sys/mips/mips/gdb_machdep.c | 2 +- sys/net/bridgestp.c | 2 +- sys/net/ieee8023ad_lacp.c | 2 +- sys/net/ieee8023ad_lacp.h | 2 +- sys/netinet/ip_gre.c | 2 +- sys/powerpc/fpu/fpu_extern.h | 2 +- sys/powerpc/include/bat.h | 2 +- sys/powerpc/include/bus.h | 2 +- sys/sys/bus_dma.h | 2 +- sys/tools/miidevs2h.awk | 2 +- sys/tools/pccarddevs2h.awk | 2 +- sys/x86/include/_inttypes.h | 2 +- sys/x86/include/bus.h | 2 +- sys/x86/xen/pv.c | 2 +- usr.bin/gencat/gencat.c | 2 +- usr.bin/gzip/gzip.c | 2 +- usr.bin/gzip/unbzip2.c | 2 +- usr.bin/gzip/unxz.c | 2 +- usr.bin/nl/nl.c | 2 +- usr.bin/seq/seq.c | 2 +- usr.bin/stat/stat.c | 2 +- usr.bin/usbhidaction/usbhidaction.c | 2 +- usr.bin/usbhidctl/usbhid.c | 2 +- usr.bin/ypcat/ypcat.c | 2 +- usr.bin/ypmatch/ypmatch.c | 2 +- usr.bin/ypwhich/ypwhich.c | 2 +- usr.sbin/bluetooth/btpand/bnep.c | 2 +- usr.sbin/bluetooth/btpand/bnep.h | 2 +- usr.sbin/bluetooth/btpand/btpand.c | 2 +- usr.sbin/bluetooth/btpand/btpand.h | 2 +- usr.sbin/bluetooth/btpand/channel.c | 2 +- usr.sbin/bluetooth/btpand/packet.c | 2 +- usr.sbin/bluetooth/btpand/sdp.c | 2 +- usr.sbin/bluetooth/btpand/sdp.h | 2 +- usr.sbin/bluetooth/btpand/server.c | 2 +- usr.sbin/bluetooth/btpand/tap.c | 2 +- usr.sbin/makefs/cd9660.c | 2 +- usr.sbin/makefs/cd9660.h | 2 +- usr.sbin/makefs/cd9660/cd9660_conversion.c | 2 +- usr.sbin/makefs/cd9660/cd9660_debug.c | 2 +- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 2 +- usr.sbin/makefs/cd9660/cd9660_eltorito.h | 2 +- usr.sbin/makefs/cd9660/cd9660_strings.c | 2 +- usr.sbin/makefs/cd9660/cd9660_write.c | 2 +- usr.sbin/makefs/cd9660/iso9660_rrip.c | 2 +- usr.sbin/makefs/cd9660/iso9660_rrip.h | 2 +- usr.sbin/makefs/ffs/ffs_bswap.c | 2 +- usr.sbin/makefs/ffs/newfs_extern.h | 2 +- usr.sbin/makefs/ffs/ufs_bswap.h | 2 +- usr.sbin/rpcbind/util.c | 2 +- usr.sbin/services_mkdb/extern.h | 2 +- usr.sbin/services_mkdb/services_mkdb.c | 2 +- usr.sbin/services_mkdb/uniq.c | 2 +- usr.sbin/ypset/ypset.c | 2 +- 231 files changed, 231 insertions(+), 231 deletions(-) diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c index 6d8f29147a04..93349ecdafee 100644 --- a/bin/pkill/pkill.c +++ b/bin/pkill/pkill.c @@ -1,7 +1,7 @@ /* $NetBSD: pkill.c,v 1.16 2005/10/10 22:13:20 kleink Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2005 Pawel Jakub Dawidek diff --git a/include/getopt.h b/include/getopt.h index 789b4d1d434c..4c0399db8545 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/hesiod.h b/include/hesiod.h index e8c38d84dccb..a06b69d32413 100644 --- a/include/hesiod.h +++ b/include/hesiod.h @@ -3,7 +3,7 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC) + * SPDX-License-Identifier: (BSD-2-Clause AND ISC) * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/netconfig.h b/include/netconfig.h index b459e2ee0bf2..c4aec6a3e791 100644 --- a/include/netconfig.h +++ b/include/netconfig.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/nl_types.h b/include/nl_types.h index bf88144aefd4..c07352e24096 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -1,7 +1,7 @@ /* $NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/nsswitch.h b/include/nsswitch.h index 2be7a59fd1b9..e44a9e4a44a3 100644 --- a/include/nsswitch.h +++ b/include/nsswitch.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/stringlist.h b/include/stringlist.h index b570e631b526..a5177e235a5d 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -1,7 +1,7 @@ /* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1994 Christos Zoulas * All rights reserved. diff --git a/include/wchar.h b/include/wchar.h index 78f2f010048f..147efb4dbf86 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause-NetBSD) + * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause) * * Copyright (c)1999 Citrus Project, * All rights reserved. diff --git a/lib/libc/arm/gen/arm_initfini.c b/lib/libc/arm/gen/arm_initfini.c index 4dabe6743c9f..a54646eb7907 100644 --- a/lib/libc/arm/gen/arm_initfini.c +++ b/lib/libc/arm/gen/arm_initfini.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 Andrew Turner diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c index 421cf0dd3ed2..ad3f97184fd0 100644 --- a/lib/libc/arm/gen/makecontext.c +++ b/lib/libc/arm/gen/makecontext.c @@ -1,7 +1,7 @@ /* $NetBSD: makecontext.c,v 1.2 2003/01/18 11:06:24 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c index a772f50e51c8..42809bb04c58 100644 --- a/lib/libc/gen/fmtcheck.c +++ b/lib/libc/gen/fmtcheck.c @@ -1,7 +1,7 @@ /* $NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c index 20f016dd1694..85110387fbe3 100644 --- a/lib/libc/gen/lockf.c +++ b/lib/libc/gen/lockf.c @@ -1,6 +1,6 @@ /* $NetBSD: lockf.c,v 1.3 2008/04/28 20:22:59 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/mips/gen/makecontext.c b/lib/libc/mips/gen/makecontext.c index 7d3e647b4d09..ce964d050866 100644 --- a/lib/libc/mips/gen/makecontext.c +++ b/lib/libc/mips/gen/makecontext.c @@ -1,7 +1,7 @@ /* $NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c index ada7ac606e15..d2d9f08b6efa 100644 --- a/lib/libc/net/nsdispatch.c +++ b/lib/libc/net/nsdispatch.c @@ -1,7 +1,7 @@ /* $NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l index 946aace3a8a8..bd3c02dcacf4 100644 --- a/lib/libc/net/nslexer.l +++ b/lib/libc/net/nslexer.l @@ -2,7 +2,7 @@ /* $NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y index 6e90fc73d8c9..b05b30d26bd0 100644 --- a/lib/libc/net/nsparser.y +++ b/lib/libc/net/nsparser.y @@ -2,7 +2,7 @@ /* $NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c index b8c813e8bb84..76820e6807d7 100644 --- a/lib/libc/powerpc/gen/fpgetmask.c +++ b/lib/libc/powerpc/gen/fpgetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c index 062a565cc570..b40016447246 100644 --- a/lib/libc/powerpc/gen/fpgetround.c +++ b/lib/libc/powerpc/gen/fpgetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c index e556123251ec..0c25a270f27e 100644 --- a/lib/libc/powerpc/gen/fpgetsticky.c +++ b/lib/libc/powerpc/gen/fpgetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c index f5d52eec5482..36c46f12dcd9 100644 --- a/lib/libc/powerpc/gen/fpsetmask.c +++ b/lib/libc/powerpc/gen/fpsetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c index d1cc134760a5..9a1956113c85 100644 --- a/lib/libc/powerpc/gen/fpsetround.c +++ b/lib/libc/powerpc/gen/fpsetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/flt_rounds.c b/lib/libc/powerpc64/gen/flt_rounds.c index 39af35c77e1c..885942a1389a 100644 --- a/lib/libc/powerpc64/gen/flt_rounds.c +++ b/lib/libc/powerpc64/gen/flt_rounds.c @@ -1,7 +1,7 @@ /* $NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996 Mark Brinicombe * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpgetmask.c b/lib/libc/powerpc64/gen/fpgetmask.c index b8c813e8bb84..76820e6807d7 100644 --- a/lib/libc/powerpc64/gen/fpgetmask.c +++ b/lib/libc/powerpc64/gen/fpgetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpgetround.c b/lib/libc/powerpc64/gen/fpgetround.c index 062a565cc570..b40016447246 100644 --- a/lib/libc/powerpc64/gen/fpgetround.c +++ b/lib/libc/powerpc64/gen/fpgetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpgetsticky.c b/lib/libc/powerpc64/gen/fpgetsticky.c index e556123251ec..0c25a270f27e 100644 --- a/lib/libc/powerpc64/gen/fpgetsticky.c +++ b/lib/libc/powerpc64/gen/fpgetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpsetmask.c b/lib/libc/powerpc64/gen/fpsetmask.c index f5d52eec5482..36c46f12dcd9 100644 --- a/lib/libc/powerpc64/gen/fpsetmask.c +++ b/lib/libc/powerpc64/gen/fpsetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c index 2fe4c12c589d..71ea2ac99621 100644 --- a/lib/libc/softfloat/fpgetmask.c +++ b/lib/libc/softfloat/fpgetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c index 0f15f2ae4517..c5bc6f9b6735 100644 --- a/lib/libc/softfloat/fpgetround.c +++ b/lib/libc/softfloat/fpgetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c index 8ac7b90e9647..349657e25eb3 100644 --- a/lib/libc/softfloat/fpgetsticky.c +++ b/lib/libc/softfloat/fpgetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c index afbe64b2ee7f..42025e1de3c3 100644 --- a/lib/libc/softfloat/fpsetmask.c +++ b/lib/libc/softfloat/fpsetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c index 54df295000a4..8305e4302e2d 100644 --- a/lib/libc/softfloat/fpsetround.c +++ b/lib/libc/softfloat/fpsetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c index 33c17120d33d..b71475096d10 100644 --- a/lib/libc/softfloat/fpsetsticky.c +++ b/lib/libc/softfloat/fpsetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libnetbsd/stdlib.h b/lib/libnetbsd/stdlib.h index b7bb875740d5..1ccc18b3ec49 100644 --- a/lib/libnetbsd/stdlib.h +++ b/lib/libnetbsd/stdlib.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 SRI International * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc. diff --git a/lib/libnetbsd/strsuftoll.c b/lib/libnetbsd/strsuftoll.c index 078bee0ace58..5b2d0978c083 100644 --- a/lib/libnetbsd/strsuftoll.c +++ b/lib/libnetbsd/strsuftoll.c @@ -1,6 +1,6 @@ /* $NetBSD: strsuftoll.c,v 1.6 2004/03/05 05:58:29 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c index cad320562eee..944edbb60d64 100644 --- a/lib/libusbhid/data.c +++ b/lib/libusbhid/data.c @@ -1,7 +1,7 @@ /* $NetBSD: data.c,v 1.8 2000/04/02 11:10:53 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c index 7cd6750ad322..c340fe1ef402 100644 --- a/lib/libusbhid/descr.c +++ b/lib/libusbhid/descr.c @@ -1,7 +1,7 @@ /* $NetBSD: descr.c,v 1.9 2000/09/24 02:13:24 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c index 237319269a2c..fdcc7dbac061 100644 --- a/lib/libusbhid/descr_compat.c +++ b/lib/libusbhid/descr_compat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c index 2913de594200..2f677172be02 100644 --- a/lib/libusbhid/parse.c +++ b/lib/libusbhid/parse.c @@ -1,7 +1,7 @@ /* $NetBSD: parse.c,v 1.11 2000/09/24 02:19:54 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2001 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c index fba9c668bd33..6317567248d0 100644 --- a/lib/libusbhid/usage.c +++ b/lib/libusbhid/usage.c @@ -1,7 +1,7 @@ /* $NetBSD: usage.c,v 1.8 2000/10/10 19:23:58 is Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h index 971884ba8ee9..1b0676426ef9 100644 --- a/lib/libusbhid/usbhid.h +++ b/lib/libusbhid/usbhid.h @@ -1,7 +1,7 @@ /* $NetBSD: usb.h,v 1.8 2000/08/13 22:22:02 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h index 0dfd596e8bb0..32fcabd0ab39 100644 --- a/lib/libusbhid/usbvar.h +++ b/lib/libusbhid/usbvar.h @@ -1,7 +1,7 @@ /* $NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 5d015481a9e2..209d74af59af 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -1,7 +1,7 @@ /* $NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1994 Christos Zoulas * All rights reserved. diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 56985ef51d8d..7fd6251c7dd5 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -1,7 +1,7 @@ /* $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1998 Tsubai Masanari * All rights reserved. diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 93907ebd97d3..732d6ddff7c9 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -1,7 +1,7 @@ /* $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1998 Tsubai Masanari * All rights reserved. diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h index 85f2e8658fe8..0fdcdb196294 100644 --- a/sbin/camcontrol/camcontrol.h +++ b/sbin/camcontrol/camcontrol.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 Kenneth D. Merry. * All rights reserved. diff --git a/sbin/camcontrol/progress.c b/sbin/camcontrol/progress.c index 054b3f5391e7..c620b577416a 100644 --- a/sbin/camcontrol/progress.c +++ b/sbin/camcontrol/progress.c @@ -1,7 +1,7 @@ /* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997-2009 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sbin/camcontrol/progress.h b/sbin/camcontrol/progress.h index 1234c1136eaf..f49857f57de6 100644 --- a/sbin/camcontrol/progress.h +++ b/sbin/camcontrol/progress.h @@ -1,7 +1,7 @@ /* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997-2012 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h index 85791ddbfcff..83392b665f44 100644 --- a/sbin/ccdconfig/pathnames.h +++ b/sbin/ccdconfig/pathnames.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c index c7ff6fb2c48c..2e455f468bb3 100644 --- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c +++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Andrzej Bialecki * All rights reserved. diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c index d0b038c8339d..294d2fbb636f 100644 --- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c +++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006, Max Laier * All rights reserved. diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h index d8c1ce8a6cb9..e3f9b52ed089 100644 --- a/sys/arm/include/_inttypes.h +++ b/sys/arm/include/_inttypes.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 2032b7368143..e1803060e51a 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001, 2002 Mike Barcroft * Copyright (c) 2001 The NetBSD Foundation, Inc. diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h index d716f4f01a17..a4b59b6ed95d 100644 --- a/sys/arm/include/bus_dma.h +++ b/sys/arm/include/bus_dma.h @@ -1,7 +1,7 @@ /* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/arm/include/ucontext.h b/sys/arm/include/ucontext.h index 2fdc5b68230b..969327d015d0 100644 --- a/sys/arm/include/ucontext.h +++ b/sys/arm/include/ucontext.h @@ -1,7 +1,7 @@ /* $NetBSD: mcontext.h,v 1.4 2003/10/08 22:43:01 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 1c893737f8a6..5628aa495593 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -1,7 +1,7 @@ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 2015 The FreeBSD Foundation diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 1a9f6cca22e0..0497fb98edb8 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -1,7 +1,7 @@ /* $NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/bhnd/cores/usb/bhnd_ohci.c b/sys/dev/bhnd/cores/usb/bhnd_ohci.c index 0308562e7ae6..117fc305d1b5 100644 --- a/sys/dev/bhnd/cores/usb/bhnd_ohci.c +++ b/sys/dev/bhnd/cores/usb/bhnd_ohci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 2010, Aleksandr Rybalko diff --git a/sys/dev/esp/am53c974reg.h b/sys/dev/esp/am53c974reg.h index 795aa88d1668..23e404640b63 100644 --- a/sys/dev/esp/am53c974reg.h +++ b/sys/dev/esp/am53c974reg.h @@ -1,7 +1,7 @@ /* $NetBSD: pcscpreg.h,v 1.2 2008/04/28 20:23:55 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/esp/esp_pci.c b/sys/dev/esp/esp_pci.c *** 2110 LINES SKIPPED *** From nobody Tue Jul 25 20:48:44 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 4R9Tdn0gPnz4nZQx; Tue, 25 Jul 2023 20:48:45 +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 4R9Tdm5mYVz3knQ; Tue, 25 Jul 2023 20:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318124; 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=dPIBXI5FVA5bon1leicVDGKw+gYVFP4Z+1erSOJCNAo=; b=W1TQSHxdKW9eh58IJPWDBEHGLh1SfeTMcQ2phUqTevPmQFUDJSd79rlLVh5aTtm8clOuH+ nIUXxW72sL4arZLHYyIN4R28LXNZj/HFt7Aq2B03ylpkRPnduBGd5HhROoNFbKHN8pHP9t 6hZOBUlhdSfCXywhVZXF7ct5RDKHLV6ShWZxhRUx+vvlKpHtNklzIGwbcNnvYg6mvWu9G4 vELvlF5KXbSalyZjLlEj84qclQtWzpUNlOsyeI1J3iN60tRUUILCLcM7gIn4tzrlTtnlxP 0osatCLgg1+EAS4QI7MxMbNXWTXXpLiJQjnIk2k+M0KHXW4Z1W+7TXLouihgVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318124; 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=dPIBXI5FVA5bon1leicVDGKw+gYVFP4Z+1erSOJCNAo=; b=ZyIcAV472OwXF4S3RLLG9DzDbXLBMAPqRon94R8KrgagUxa7dVZ4yLY5WMj8sAY5WYYsTT W8HEBFvqISJ+o7lZsPwxSleiUp+uuwTQs1LZxK5DkFSx035259QCGGKZS3Bcksjiyi1Z7g 6+A1nn6AG8CM/axxDS6crLC/5cKxEjgTDsnWQp02qjRTKOFvt4LihsvFPZB8jJ+nUlogqc h9ps3etaxTBpJyzC/Uu1JucUPtWbu3+3+82hfiU/qTP9OlTcSSJmWbMS5MKa8PNmRqIPGJ X3jffVTwmPDnCIQ2LLgUcG+cWq9pWTypnBwWsG2euHHTlSi6iqowMHGFuIpgbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318124; a=rsa-sha256; cv=none; b=cATlTWVtj0l+ik7uGeKswF9HJA1BsRWA/R4md+viKsyaLM/VMzRfAjKuK6yP+DknMDO0c6 nu77oc83pTU7OL2Idf2vHVyiDwz5+AzeGWfyCWyTxGeUt0s+cA/PeYj4C1wQCkWzPEPf22 cDE4kdJp3EvxDdykbV2Sbs4y5Ke+xS8sVq3KUwhYr93KMobUXlehRjiq3J6bJSrtFGr+cc Y6YYNdf6i/JIbo4WBthNVcR7d9pipi0j08O3rFC5a3xH6x64wR31NLMvLe5EiqOdm7rhoc DDStaiQJ9L9qQAZHiEz+VmusVk/3wSO/PbHprW6U9vCYLBspqNv41sp9CBnC3Q== 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 4R9Tdm4LqpzFRC; Tue, 25 Jul 2023 20:48:44 +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 36PKmith063658; Tue, 25 Jul 2023 20:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmir3063657; Tue, 25 Jul 2023 20:48:44 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:44 GMT Message-Id: <202307252048.36PKmir3063657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 58f593fbb832 - stable/13 - spdx: Simplify BSD-2-Clause AND BSD-2-Clause List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 58f593fbb832e7ad1a240eb83396e75ec50fd049 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=58f593fbb832e7ad1a240eb83396e75ec50fd049 commit 58f593fbb832e7ad1a240eb83396e75ec50fd049 Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:17:00 +0000 spdx: Simplify BSD-2-Clause AND BSD-2-Clause After removing the -FreeBSD and -NetBSD, we're left with a nuber of BSD-2-Clause AND BSD-2-Clause, so tidy that up. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit eebd9d53665e1b691ffada910b940b37b6f62cc4) --- include/wchar.h | 2 +- sys/arm/freescale/imx/imx51_ccm.c | 2 +- sys/arm/freescale/imx/imx51_ccmreg.h | 2 +- sys/arm/freescale/imx/imx51_ccmvar.h | 2 +- sys/arm/freescale/imx/imx51_dpllreg.h | 2 +- sys/arm/freescale/imx/imx51_ipuv3reg.h | 2 +- sys/arm/freescale/imx/imx51_tzicreg.h | 2 +- sys/dev/iicbus/s35390a.c | 2 +- sys/dev/mfi/mfi.c | 2 +- sys/dev/mfi/mfi_pci.c | 2 +- sys/dev/mfi/mfireg.h | 2 +- sys/dev/mfi/mfivar.h | 2 +- sys/dev/mii/gentbi.c | 2 +- sys/dev/mii/nsphy.c | 2 +- sys/dev/mii/nsphyter.c | 2 +- sys/dev/mii/qsphy.c | 2 +- sys/dev/usb/serial/ubsa.c | 2 +- sys/dev/usb/serial/ubser.c | 2 +- sys/dev/usb/serial/uchcom.c | 2 +- sys/dev/usb/serial/ufoma.c | 2 +- sys/dev/usb/serial/umodem.c | 2 +- sys/dev/usb/serial/uplcom.c | 2 +- sys/dev/usb/serial/usb_serial.c | 2 +- sys/dev/usb/serial/usb_serial.h | 2 +- sys/dev/xl/xlphy.c | 2 +- sys/netgraph/ng_ppp.c | 2 +- sys/netinet/libalias/alias_smedia.c | 2 +- usr.sbin/bhyveload/bhyveload.c | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/wchar.h b/include/wchar.h index 147efb4dbf86..c0cf13c49a9e 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause) + * SPDX-License-Identifier: (BSD-2-Clause) * * Copyright (c)1999 Citrus Project, * All rights reserved. diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c index 9afd646ce216..b50b6fe926cb 100644 --- a/sys/arm/freescale/imx/imx51_ccm.c +++ b/sys/arm/freescale/imx/imx51_ccm.c @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ccm.c,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_ccmreg.h b/sys/arm/freescale/imx/imx51_ccmreg.h index 504c6e9ef126..d14289ac4fdb 100644 --- a/sys/arm/freescale/imx/imx51_ccmreg.h +++ b/sys/arm/freescale/imx/imx51_ccmreg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ccmreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_ccmvar.h b/sys/arm/freescale/imx/imx51_ccmvar.h index dc35f1bc7116..b58e78cb2c72 100644 --- a/sys/arm/freescale/imx/imx51_ccmvar.h +++ b/sys/arm/freescale/imx/imx51_ccmvar.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ccmvar.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_dpllreg.h b/sys/arm/freescale/imx/imx51_dpllreg.h index a98f255fb036..ca93934cbc86 100644 --- a/sys/arm/freescale/imx/imx51_dpllreg.h +++ b/sys/arm/freescale/imx/imx51_dpllreg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_dpllreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_ipuv3reg.h b/sys/arm/freescale/imx/imx51_ipuv3reg.h index 16e52e405784..380e879e8f92 100644 --- a/sys/arm/freescale/imx/imx51_ipuv3reg.h +++ b/sys/arm/freescale/imx/imx51_ipuv3reg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ipuv3reg.h,v 1.1 2012/04/17 10:19:57 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_tzicreg.h b/sys/arm/freescale/imx/imx51_tzicreg.h index 3311dfffb3d5..ac36f2c5277f 100644 --- a/sys/arm/freescale/imx/imx51_tzicreg.h +++ b/sys/arm/freescale/imx/imx51_tzicreg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_tzicreg.h,v 1.1 2010/11/13 07:11:03 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c index 3029f6acd6f8..ca28cd8d5e4c 100644 --- a/sys/dev/iicbus/s35390a.c +++ b/sys/dev/iicbus/s35390a.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Yusuke Tanaka * All rights reserved. diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 3c88e505bb7b..25731b851c59 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 6c791997341b..ce325b1d2da3 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h index dea3fce664b2..d649cc5aa9cb 100644 --- a/sys/dev/mfi/mfireg.h +++ b/sys/dev/mfi/mfireg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h index 72658d8a8aad..a3bb9a1bfdff 100644 --- a/sys/dev/mfi/mfivar.h +++ b/sys/dev/mfi/mfivar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c index 49a7bbd4fea6..4f91b909dfbe 100644 --- a/sys/dev/mii/gentbi.c +++ b/sys/dev/mii/gentbi.c @@ -1,7 +1,7 @@ /* $NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 367c1a7a06a0..d3809669e2f3 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -1,7 +1,7 @@ /* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c index cead4de0b59d..4d65fa677ffe 100644 --- a/sys/dev/mii/nsphyter.c +++ b/sys/dev/mii/nsphyter.c @@ -1,7 +1,7 @@ /* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 6bb204359b87..a5ce4c6ed6d0 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -2,7 +2,7 @@ /* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c index 2d1402e77d15..f49c6689eab2 100644 --- a/sys/dev/usb/serial/ubsa.c +++ b/sys/dev/usb/serial/ubsa.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002, Alexander Kabaev . * All rights reserved. diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c index 34666ddc69da..dbff14dc3f9f 100644 --- a/sys/dev/usb/serial/ubser.c +++ b/sys/dev/usb/serial/ubser.c @@ -8,7 +8,7 @@ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2002, Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index 995eab6553d6..3c9bca9114cb 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -1,7 +1,7 @@ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007, Takanori Watanabe * All rights reserved. diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c index a6eddd941b85..b95ffc0308db 100644 --- a/sys/dev/usb/serial/ufoma.c +++ b/sys/dev/usb/serial/ufoma.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); #define UFOMA_HANDSFREE /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005, Takanori Watanabe All rights reserved. * Copyright (c) 2003 M. Warner Losh diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index d3b40a74cadc..da6ecbc48ba6 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 M. Warner Losh * diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index 4a8700e9e13a..282149274bb2 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 66e22d64e923..e251714cf714 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -1,7 +1,7 @@ /* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2003, 2005, 2008 * Shunsuke Akiyama . diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h index 306eb035c8cd..b2ec25141800 100644 --- a/sys/dev/usb/serial/usb_serial.h +++ b/sys/dev/usb/serial/usb_serial.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2002, Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c index a078d3cf5f9e..7357b3085f74 100644 --- a/sys/dev/xl/xlphy.c +++ b/sys/dev/xl/xlphy.c @@ -1,7 +1,7 @@ /* $NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c index e25cf1a5ba2a..d237446c1ae9 100644 --- a/sys/netgraph/ng_ppp.c +++ b/sys/netgraph/ng_ppp.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996-2000 Whistle Communications, Inc. * All rights reserved. diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c index e7a15afebc6d..a591bc079dc5 100644 --- a/sys/netinet/libalias/alias_smedia.c +++ b/sys/netinet/libalias/alias_smedia.c @@ -1,7 +1,7 @@ /*- * alias_smedia.c * - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Whistle Communications, Inc. * All rights reserved. diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index eb8a1bb64974..413bcbff2d13 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 NetApp, Inc. * All rights reserved. From nobody Tue Jul 25 20:48:45 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 4R9Tdp3Vqjz4nZG3; Tue, 25 Jul 2023 20:48:46 +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 4R9Tdp1QRLz3l1G; Tue, 25 Jul 2023 20:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318126; 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=M/z9YIpl7gVJHDn7CGkvoUdnvl2FNHt6AmAUrur6gyo=; b=Ni+TE3YqyJb/YfiQI0NpnZibFxQ64K9NqtobEvZU6Gc78I3hAMM4Yq73VhMKYHTmFygdYn evNuffLy8dXcWF9/yY31+BOWOUvEgwhZlxMiRTQDHTPOaums48x6x9WZRbK2IY5hLVaa3F CitGE8vb8zOakSXNxzo0GetxZYdCl1ZyBuboAsJE+WUyZ9f67tOm+lhLqmC9Ibo261nVFB zMfniPRmrHuEIWv3HFf7+WDQeITses4pl2J1P36sEvYZMXIRmtqBQN/Z6Lywzs663QgkV+ 2liFvg+eCywbaStszCLPgt/6HUOi6zXuXP0LDV4C+wLmCNvLLzC0RPSPJPih7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318126; 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=M/z9YIpl7gVJHDn7CGkvoUdnvl2FNHt6AmAUrur6gyo=; b=bzHR+jPy/5oObiUrtbVAyggEllb0s8yTkvfpZTEi54YN6ZikMH7XnECC1ZXth90IrAhUdn Jm28uEuvREBc5WXYLq3SXVnfRe9G///Q3jbOI02WeppDvHYatewyDo3JgAOy4d0V73wgj/ BdXJ1Yjcp6Q21JgSRz4v1VZ6YWfZzRDdfw8K+xED3mUIi1Ypt5T8EhYCoSKDdKzAgwo3LE yao3woquiM0mJ0IHGV32N2UGURrVXHqZHUvrQIdnF1BtGmlWpRDsIEdWSA0CKMIaftuizY i4peFyGvwpjJk4/CN2IzJHieJZ2wHgUd+u+pu8TVELJMLJqLMMh+djKkRulWTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318126; a=rsa-sha256; cv=none; b=ObnR8cn1uDPym1HJ/2x1vAOJx9cBwDJGrL0gh0E1grsIuNSUl4pOryXtGLLdXusfB7BBpB mm+vVlsbiQtT8xJYlZiaEohKVJJmCUvTGt3pkXF7hA+YkTMyneFeNBTLUpW2RAq0xzEYSJ fi9cf5I6vRbCwD5Oh8bTo7HUghNBl+pzIwW/Ph4zY+yGvJ3MHhwoN40J2gJmLTrakoeJU6 VwvyVxng4Ht1ESWK7sp5vhHatUoTFef/WzeNBURCr/cqfHZsqpvu92/hPiLoC/95ZYBAeB 2q3tqVBTdauib+D+f7fPAXAgNt1jb2nhkOTGZrQcUwkaPCon30N9cQDmgJ7Qag== 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 4R9Tdn5XNFzFdC; Tue, 25 Jul 2023 20:48:45 +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 36PKmjmZ063677; Tue, 25 Jul 2023 20:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmjAc063676; Tue, 25 Jul 2023 20:48:45 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:45 GMT Message-Id: <202307252048.36PKmjAc063676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8b43a608425a - stable/13 - SPDX: It's spelled 'SPDX-License-Identifier' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b43a608425ae680c109d13a2849a6872877c9fd Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b43a608425ae680c109d13a2849a6872877c9fd commit 8b43a608425ae680c109d13a2849a6872877c9fd Author: Warner Losh AuthorDate: 2023-05-11 16:03:59 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:17:48 +0000 SPDX: It's spelled 'SPDX-License-Identifier' Sponsored by: Netflix (cherry picked from commit ecfb43cb419808a5e2f802f780cba66a49f473b7) --- sys/netgraph/ng_vlan_rotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netgraph/ng_vlan_rotate.c b/sys/netgraph/ng_vlan_rotate.c index a9added7fb6d..cbc55e6f7a84 100644 --- a/sys/netgraph/ng_vlan_rotate.c +++ b/sys/netgraph/ng_vlan_rotate.c @@ -1,5 +1,5 @@ /*- - * Spdx-License-Identifier: BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019-2021 IKS Service GmbH * From nobody Tue Jul 25 20:48:46 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 4R9Tdq6dwGz4nZRF; Tue, 25 Jul 2023 20:48:47 +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 4R9Tdq1NK1z3l1X; Tue, 25 Jul 2023 20:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318127; 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=Z65x+vpdTcKW7JQebR2Oh8BzHhE/xtk1OWZg3i95R/Y=; b=yA1vhl6pkW43LbbJVmpeDK4BE41bgtQamRV4YqNlUp7pEMGAl6TfLeTAmeimPZkjfKLVIH cWp8zEZaKav9IpSy4F+yBnI61x9hRtAPvCjfDz2McNBfMvLIj8LrfAPbbjKva9A6GPqlO2 wE/vGX2qKLO7V5Gxou0IE0OYLBZ5xsWvJ+4Q5BR0Q/cB5WstzM6A7wOZXPE6xRyg1SV3C0 Nr3OVj6z0/EBHEBRdqDqWZe5tWZQQBX1htlD2GuiBpMYT4Y8Bx9uPJF0uk1Qwqxjqx1wW0 fOU8BnRowpozcJgt3j++uvbOYrQlac54BvEfCHO5B8QkHFvNDa963qhBhxbSWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318127; 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=Z65x+vpdTcKW7JQebR2Oh8BzHhE/xtk1OWZg3i95R/Y=; b=IpMNUtGwj3wToor1v+opJSAOctjrnni6SNNI/pEf92MFyvFLKxdEF+vBeyVh6U8jLybH1R lY7q5n9fbZITgh4s5+D2LR/EgZn3GyTxmpF4zOSc6pRjoFxZKzYM82Z/qi2uD5W0tfQ+LT /B78+tUOrY0+7pE6pRGCWnDOeMYGNdOri/gW1ipKQXEbgRy7miSbWQxHXaRrBbX9Nbxnlb 1Su8FswiFB/Vu6V9Gkyf7lNoPPHQ29z0jQIb5tbov21xjTwMGF1V3pltZxZR0tCBVcHbiA 4jLiB+23tNEH57jTF/p4ZJzAOS+fwbN2puUikkb9ndaIZWMgTbQeNFOSBGxQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318127; a=rsa-sha256; cv=none; b=yE/TNT35Oy1KeNIfXcxqqCmY3+5p9BJcXyABSrNIU+9X9HJYIfQlCBmE0SiV6b50g9Vw+U ahtFZprxeV0xf982NSiRDSVSky1+EX+kjwVpXRnYOqwZ5ossN8TEOrjwqT/gl5bkMQPb+F drSsvx7LXrE992aFtZvSrhS7JUMQ/VLsf0JfRpE2lmdycjZOU02pMROiM0At80KmY+zZPn FZc5mVN5jnO/6Bkbu/Zr0WQrl4YluGIlKmzt8Ibd614VhZdd7qIQzC4bj9/7NSVPkApTCa 1OWzZfJKDKWOGMlSYiZrB7ph5fwRk/BpMqwjjB3zO2vigrZNWdGyJo4LhjqneA== 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 4R9Tdp6ZNPzFk2; Tue, 25 Jul 2023 20:48:46 +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 36PKmkOM063698; Tue, 25 Jul 2023 20:48:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmk8Y063697; Tue, 25 Jul 2023 20:48:46 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:46 GMT Message-Id: <202307252048.36PKmk8Y063697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6d30916e9bc4 - stable/13 - spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d30916e9bc49501e1ae22575fdd0736a1191d9a Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6d30916e9bc49501e1ae22575fdd0736a1191d9a commit 6d30916e9bc49501e1ae22575fdd0736a1191d9a Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:18:00 +0000 spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD There never was a BSD-3-Clause-FreeBSD SPDX identifier. Replace it with BSD-3-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit eb8f887758f31f605829c995ce71a627dec0838a) --- lib/libgeom/geom_getxml.c | 2 +- lib/libgeom/geom_stats.c | 2 +- lib/libgeom/geom_xml2tree.c | 2 +- lib/libgeom/libgeom.h | 2 +- sbin/fsck_ffs/ea.c | 2 +- usr.sbin/gstat/gstat.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c index a6bb130fd5a7..a46a58328373 100644 --- a/lib/libgeom/geom_getxml.c +++ b/lib/libgeom/geom_getxml.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c index e8e2969e835f..80a29cb9148e 100644 --- a/lib/libgeom/geom_stats.c +++ b/lib/libgeom/geom_stats.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 52d21790101e..d75b8e53bcd0 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h index 339a8d34729f..86d22b125287 100644 --- a/lib/libgeom/libgeom.h +++ b/lib/libgeom/libgeom.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index f46d883e12ad..c64fb20ee9e8 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c index 65388c3002ff..cd44c740a3b4 100644 --- a/usr.sbin/gstat/gstat.c +++ b/usr.sbin/gstat/gstat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. From nobody Wed Jul 26 18:05:57 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 4RB1zT4TKpz4pg4n; Wed, 26 Jul 2023 18:05:57 +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 4RB1zT3p0lz3rhK; Wed, 26 Jul 2023 18:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394757; 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=6O25C646pQXU9S4QKQJXnT3KDQD+yKirfdLWYwlgMkQ=; b=KCL55MiwQQ39+2oI9/2puj/fSljJ/GDCz0F42krDfIcS3/Ft+aVSZov5M9ehLmm8h5n863 qr1bmCVZ85Y/W7PNVy6xkaxAyR5NIhtfgLNC3+5pbVd/7R+LKsh7gT0I0a+8bKrv3c95q3 TZYSFboIQeG4e476/vBdoKQh+Ttib2yIgX0uXDz13BH5bQWaA1m4ErvKnXTYKmQSuT3J/B 0hNWrTx+HpeyMo4dEnAjAFSXDRI2gbOkXSNeNt7hWmcoAoQbyqs9T2k69H6vqaq637f/In MVOxI1vbeIcBZLJaNMSDroBx4XuQASxt7I18zmNKdPV+W8NlpyX2He9ylYmesQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394757; 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=6O25C646pQXU9S4QKQJXnT3KDQD+yKirfdLWYwlgMkQ=; b=wVEf/fliiEj6dLdmwZFvf/SpTbRJoztg0mxM/T5IuipmI0yNigpZNKmq18TdoYbK5hbxfH 4nCaU8z9TQRol6+0O2IhkeAmtbV8+bpJnIW1xiTlpXP14e0nNyfHfK28O4q8Kw28+QnTJ2 EZBGSQ2BOyeoNs8yV2O9GZRqX3cCe0W4XVUh26yHuTx3IVSSL3iFF7x4CseY9KinQAgyO6 ggs8gOJv9LIvDJxpVCFqiyZHgzlV0owt7HgJzOhv0V/J7ezvdA0BkTOa1sqd67LtnLH32w eToDtvrRrqUUfADAAQLNjVANGeHDEjYQTbxst23Fhtq9oNrnm9xNp2APqBUCBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690394757; a=rsa-sha256; cv=none; b=l9A5tH2vki+z8rRT/aQZN1gnHacVeDYnssHOIoAAi0rnRbapj1hK4hjC4bK5uMZgh48pAZ pQ/2rSnAINB4FmUALT4NeAumhqNP9krrkE5ATFm1X0sjSrg63Lzrg8t+F4obg8ZavWP3OX XaT5Lv2IbXrEqEvYO+5Sq1t4Qr899PS/CYvH0gGfrsgoOw58ZWt7yyQVoWfsbUWt4rvZM9 meVhoKL6U1l7T4qv/ZmwQT5t+cF0a6gPPUA5teGV5eBaJg/9Nnt7KLMJrw+2KehwULpMyo 96hvlXbvoU4j4y8qgkJ9z1j8PX1LFKRXwpo5NGTmxUiLDj8O8BgfmK6x8i/nww== 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 4RB1zT2mX5zs8X; Wed, 26 Jul 2023 18:05:57 +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 36QI5v09087443; Wed, 26 Jul 2023 18:05:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QI5vjF087442; Wed, 26 Jul 2023 18:05:57 GMT (envelope-from git) Date: Wed, 26 Jul 2023 18:05:57 GMT Message-Id: <202307261805.36QI5vjF087442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f1f27dfa4ad9 - stable/13 - Work around VNET and DPCPU related panics on aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76 commit f1f27dfa4ad9da53fcdfc6aae644fab83bda4e76 Author: Dimitry Andric AuthorDate: 2023-07-23 13:48:36 +0000 Commit: Dimitry Andric CommitDate: 2023-07-26 18:02:37 +0000 Work around VNET and DPCPU related panics on aarch64 lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions, which breaks VNET and DPCPU when used in modules. Until VNET and DPCPU can be fixed to deal with these relaxed instructions, disable linker relaxation for now. PR: 264094 Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41156 (cherry picked from commit 80e4ac2964a11edef456a15b77e43aadeaf273a2) --- sys/conf/kmod.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index a06f6a2555d9..4a0d828f0159 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -168,6 +168,13 @@ CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer CFLAGS+= -fPIC .endif +.if ${MACHINE_CPUARCH} == "aarch64" +# https://bugs.freebsd.org/264094 +# lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions, +# which breaks VNET. +LDFLAGS+= --no-relax +.endif + # Temporary workaround for PR 196407, which contains the fascinating details. # Don't allow clang to use fpu instructions or registers in kernel modules. .if ${MACHINE_CPUARCH} == arm From nobody Wed Jul 26 18:05:58 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 4RB1zW04Zjz4pg2Q; Wed, 26 Jul 2023 18:05:59 +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 4RB1zV3ZbPz3rYK; Wed, 26 Jul 2023 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394758; 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=VfWD4/+VxVPWmFaMoJEjChXLTF+2SlmAaPbhqRUeL28=; b=kRV9wlFY+C7+AmIlBQuD7qnZvyxmbL6LnSyFKha0ojP3ayNdkxRkjZ2w16Os0Gg4Pf8Hsj y5o/9LgMRDe6Yy9gz+c5OGcgQq6YniGSrx0we2AZdAh6gpfMfmXPkPrGlnyPdzNywjrefz +N5zokXko+QoMV0Strx+cHKAdVHOLgCpdK1oyI6cgLiq/sIvQVUcU+CEcQKFexWTTCpViY M5vDAc3Z24nOi6D6SGOeQTKZukRB4qAv0ZJMFfXbuPIgLpRvadZI6WPPbhTXV0whthvXGB Dbs0kRPCCpy8N4bLBwfQE+VBHmEPE/oUGCKfwaYqgkdTDgpnAOideW5Ybmb/jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394758; 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=VfWD4/+VxVPWmFaMoJEjChXLTF+2SlmAaPbhqRUeL28=; b=pm3SSflgTFn/g/y7Xs0eFP8Sh6DVGPYAtmfcDEeNmbJofwWIgwidPdl2QGskls7T5OEblj obO9UlqEXVG3no4BPunfTVb+1IMiPkkZSCrReBz+1GAdvONUFKbZXfNFLMPVPsBq4DhtTL aqXyLkvWVfvF0LSGcXZ+KALnZTKfpilG4AadLNUjGaBEan//LjNl+RZ7wNhWus78j6xU4J Mx73IAP+gkv5c+PEqRYBIKnruXn+1UPXUSsD1jDlaFFNgWGzE+7lIgzE8y+YElOsTrfT+c lQdMWeqbFJQ3BfOQF8gssE6wrucOdZdyjMQU7BemtaErfol6kDCm/Mn9ID0zNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690394758; a=rsa-sha256; cv=none; b=FaDUPlC8Mcbp1TdUjIdBw/ZzVttXKVVmAz4uWod0B9nHOEpf8vQx2f1egN/FX0TIChdp3N tWdGDMHN8TQpNrsXv+X7zkcFbrFznYDeRXP2H4Fs9S9xPhlgDaLMjP9lB2QRQ3qVi4jEGw ynDyMaRDUAfdMe9mSlX26cuN4T9zevRD1uK72UI/+HkRhQ/3Wv/IyoZ98M5csgEMvFA+4E 8LaBAQcDas7OHY0h1mil7BnVP0bRIojynlrNyzPYtl2ZS8eo7FBoMENksmdUpeeE5X/0hb d8NiACUp8/TE6ZjsHPd1kJS8wV6qc/E6nTDlx8Ssf98HJey2razm10EBtXSkGg== 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 4RB1zV2dhdzsl7; Wed, 26 Jul 2023 18:05:58 +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 36QI5wVk087462; Wed, 26 Jul 2023 18:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QI5wS1087461; Wed, 26 Jul 2023 18:05:58 GMT (envelope-from git) Date: Wed, 26 Jul 2023 18:05:58 GMT Message-Id: <202307261805.36QI5wS1087461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ca54e5c484ca - stable/13 - Move LIBADD lines from usr.bin/clang/*/Makefile one level up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca54e5c484caf54e674cc1236be1f7c9e6d193cc Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ca54e5c484caf54e674cc1236be1f7c9e6d193cc commit ca54e5c484caf54e674cc1236be1f7c9e6d193cc Author: Dimitry Andric AuthorDate: 2023-07-23 20:04:46 +0000 Commit: Dimitry Andric CommitDate: 2023-07-26 18:03:26 +0000 Move LIBADD lines from usr.bin/clang/*/Makefile one level up Some utilities under usr.bin/clang were only linked to libz, while most others were linked to libz and libzstd. Make this consistent, and remove repetition, by moving these LIBADD lines to usr.bin/clang/clang.prog.mk and usr.bin/clang/clang.prog.mk. MFC after: 3 days (cherry picked from commit f576172682401984fcf5e422d31086499caaebcf) --- usr.bin/clang/bugpoint/Makefile | 3 --- usr.bin/clang/clang.prog.mk | 2 ++ usr.bin/clang/clang/Makefile | 3 --- usr.bin/clang/llc/Makefile | 3 --- usr.bin/clang/lli/Makefile | 3 --- usr.bin/clang/llvm-ar/Makefile | 3 --- usr.bin/clang/llvm-cov/Makefile | 3 --- usr.bin/clang/llvm-dwarfdump/Makefile | 3 --- usr.bin/clang/llvm-dwarfutil/Makefile | 3 --- usr.bin/clang/llvm-dwp/Makefile | 3 --- usr.bin/clang/llvm-extract/Makefile | 2 -- usr.bin/clang/llvm-lto/Makefile | 3 --- usr.bin/clang/llvm-lto2/Makefile | 3 --- usr.bin/clang/llvm-mc/Makefile | 3 --- usr.bin/clang/llvm-mca/Makefile | 2 -- usr.bin/clang/llvm-nm/Makefile | 3 --- usr.bin/clang/llvm-objcopy/Makefile | 3 --- usr.bin/clang/llvm-objdump/Makefile | 3 --- usr.bin/clang/llvm-pdbutil/Makefile | 2 -- usr.bin/clang/llvm-profdata/Makefile | 3 --- usr.bin/clang/llvm-readobj/Makefile | 3 --- usr.bin/clang/llvm-rtdyld/Makefile | 3 --- usr.bin/clang/llvm-symbolizer/Makefile | 3 --- usr.bin/clang/llvm-xray/Makefile | 3 --- usr.bin/clang/llvm.prog.mk | 2 ++ usr.bin/clang/opt/Makefile | 3 --- 26 files changed, 4 insertions(+), 69 deletions(-) diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index 2ca34d2579e3..2afd888f1df7 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -13,7 +13,4 @@ SRCS+= OptimizerDriver.cpp SRCS+= ToolRunner.cpp SRCS+= bugpoint.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 79229be332a8..faa4918c7298 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -29,5 +29,7 @@ LIBADD+= execinfo LIBADD+= ncursesw .endif LIBADD+= pthread +LIBADD+= z +LIBADD+= zstd .include diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 8a654020d837..efeb49f891e0 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -34,9 +34,6 @@ MLINKS+= clang.1 cc.1 \ clang.1 cpp.1 .endif -LIBADD+= z -LIBADD+= zstd - # Ensure we don't add CFLAGS.clang when using GCC NO_TARGET_FLAGS= diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index 42835ff00656..a4c68c6baec6 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -5,7 +5,4 @@ PROG_CXX= llc SRCDIR= llvm/tools/llc SRCS+= llc.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index 0c8d621f42a6..febbebc1accf 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -6,7 +6,4 @@ SRCDIR= llvm/tools/lli SRCS+= ExecutionUtils.cpp SRCS+= lli.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index dd58fb18c417..12a3da13273f 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -10,9 +10,6 @@ SRCS+= llvm-ar.cpp CFLAGS.llvm-ar.cpp+= -Dllvm_ar_main=main -LIBADD+= z -LIBADD+= zstd - LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib .if ${MK_LLVM_BINUTILS} != "no" diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 9c6cafab0561..5bf4797d48e2 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -20,7 +20,4 @@ SRCS+= TestingSupport.cpp SRCS+= gcov.cpp SRCS+= llvm-cov.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index d5aaf812f8c4..cdf976a7c272 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -7,7 +7,4 @@ SRCS+= SectionSizes.cpp SRCS+= Statistics.cpp SRCS+= llvm-dwarfdump.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index 0be0eefcea3e..cc5ebf4275fb 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -22,7 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwp/Makefile b/usr.bin/clang/llvm-dwp/Makefile index c47729aea678..4732be082e70 100644 --- a/usr.bin/clang/llvm-dwp/Makefile +++ b/usr.bin/clang/llvm-dwp/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-dwp SRCS+= llvm-dwp.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile index 7a0a5b205a4f..2cfb9a13455d 100644 --- a/usr.bin/clang/llvm-extract/Makefile +++ b/usr.bin/clang/llvm-extract/Makefile @@ -5,6 +5,4 @@ PROG_CXX= llvm-extract SRCDIR= llvm/tools/llvm-extract SRCS+= llvm-extract.cpp -LIBADD+= z - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index 35e2b87fef3c..f216412b2e8a 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-lto SRCS= llvm-lto.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile index 37a5e7f794c0..78ca08fff06c 100644 --- a/usr.bin/clang/llvm-lto2/Makefile +++ b/usr.bin/clang/llvm-lto2/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-lto2 SRCS= llvm-lto2.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index cb3080481607..ee9d1c41c8c1 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -7,7 +7,4 @@ SRCDIR= llvm/tools/llvm-mc SRCS+= Disassembler.cpp SRCS+= llvm-mc.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile index 727651146c52..268ca8805a0b 100644 --- a/usr.bin/clang/llvm-mca/Makefile +++ b/usr.bin/clang/llvm-mca/Makefile @@ -20,6 +20,4 @@ SRCS+= llvm-mca.cpp CFLAGS+= -I${LLVM_BASE}/${SRCDIR} -LIBADD+= z - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 2c19f02e49de..d71295d0313d 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -25,9 +25,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - .if ${MK_LLVM_BINUTILS} != "no" LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm MLINKS+= llvm-nm.1 nm.1 diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 335badf81ed9..181a307457a9 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -27,9 +27,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip .if ${MK_LLVM_BINUTILS} != "no" diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index d8d80443d965..390bf40b851c 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -30,9 +30,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - LINKS= ${BINDIR}/llvm-objdump ${BINDIR}/objdump MLINKS= llvm-objdump.1 objdump.1 diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile index 5036955f775a..6e91c0424f2f 100644 --- a/usr.bin/clang/llvm-pdbutil/Makefile +++ b/usr.bin/clang/llvm-pdbutil/Makefile @@ -24,6 +24,4 @@ SRCS+= TypeReferenceTracker.cpp SRCS+= YAMLOutputStyle.cpp SRCS+= llvm-pdbutil.cpp -LIBADD+= z - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index b3b0d63346de..1538aacdb493 100644 --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -7,7 +7,4 @@ SRCS+= llvm-profdata.cpp CFLAGS.llvm-profdata.cpp+= -Dllvm_profdata_main=main -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index d47cdfa329fc..0c1afcae6d0b 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -36,9 +36,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - LINKS+= ${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf .if ${MK_LLVM_BINUTILS} != "no" diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 6c7bd97f4bd0..37977771eddb 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-rtdyld SRCS+= llvm-rtdyld.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index 0308b58bba55..5da4840b1594 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -24,9 +24,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line .if ${MK_LLVM_BINUTILS} != "no" diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile index 1be3eb059e81..5e84483e4f6b 100644 --- a/usr.bin/clang/llvm-xray/Makefile +++ b/usr.bin/clang/llvm-xray/Makefile @@ -15,7 +15,4 @@ SRCS+= xray-graph.cpp SRCS+= xray-registry.cpp SRCS+= xray-stacks.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 56698c4138d3..053450f38e95 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -27,5 +27,7 @@ LIBADD+= execinfo LIBADD+= ncursesw .endif LIBADD+= pthread +LIBADD+= z +LIBADD+= zstd .include diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index 27e0395942f6..ca209cec45ac 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -8,7 +8,4 @@ SRCS+= BreakpointPrinter.cpp SRCS+= NewPMDriver.cpp SRCS+= opt.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" From nobody Wed Jul 26 18:06:24 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 4RB20065jxz4pgRk; Wed, 26 Jul 2023 18:06:24 +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 4RB2005GSjz3sHG; Wed, 26 Jul 2023 18:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394784; 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=bv2GqflWqlrYqzeuG07Vs/m6rdpxIlVTbTW5xelKE1I=; b=aYG7U6pFnpJL/BvPSmyo/IFLsUoaUfwGllEEAc5bCJsemoic2kedpL/iQZJ+FblUtklMCI oF5Jry9Ak8aYGkT9q2/Sqe2RecPnyh+ritSit1yvEXwPhU582SyBfGT/yNxTleD+pA65N1 KyQP0e08vmye6hxGAu39oc3vMVMK/6NyTRSRDRaiiJ+q11md2w+nw6ZWK323jHI67lp+nA xKSwS39dJRrU8jBoXgk/5E9ZgdS7tWaL0p7qgFW1eIvlgVWRXq7WTJXQIqX8bSKO6xvWZc 5OV894Q0DDuo/4pMS9w4byCOQ0YAdWgUB+4IBE2+cOJlxr28GNqQyo5mMzS0UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394784; 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=bv2GqflWqlrYqzeuG07Vs/m6rdpxIlVTbTW5xelKE1I=; b=HfS//0/WYqt74W4Bz38DinDinqNBClEyhhOuDS31oSy+vN2Y0pSLEpw7j0SbVRLHGFRhTa SK7o0shRzIAx09vOmuxd8a7k/GrQ05CI38KjYZlHwRE7FJGJD4eTUfqfdQJMRC8aW87zl8 8o5QO5LjKt0EhRl/4ARNzp5RP6j5AWfHduN2u4VSERB9MDKVuWMqKIa0ZFE4QBzOKZsuZW nC8og0DUH6myqkAmT5Fbazy62E/xIwL3hH3YxuTm8VbPs53kv8Zifr7lqZChe8LTqMyRXq dMsEXKvHC1iuoaRke5mHjv2qM1YBjgyvL4lMcs1APpf8SWW8cQxwf/WwMtXOKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690394784; a=rsa-sha256; cv=none; b=ulM5AIUYOfCaKEffHCW9fRUZLbswrp43s+LzFOwAHwWhM72Np5vD0ORCTs5W7HLSEr40xm 5zBMb27XlHcHooDu4bXbZmRI011azWvJu8BtiKpJCslZ7LLDvhz6lzNW/dJhlXdhzjumCA XWOqsIQ25+56uUpi+cWIEizrZidm8xuRUn/zZ+vyVU4B4f20Z/W/t7Bxwct5enPi9n49hF yvH4sD7ZvHWgSsNcLTexnFywCj1KR00QvAHOSah87YDtMVNhJFJDezUTGBSNXjOnxSQOPA 9wJlO6dF6OFWYx/538sjyMivSWXyhDYzQaIQQT09pRGbrH6clV/xEDV44NeReA== 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 4RB2004490zs8Y; Wed, 26 Jul 2023 18:06:24 +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 36QI6OKJ087626; Wed, 26 Jul 2023 18:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QI6O1b087625; Wed, 26 Jul 2023 18:06:24 GMT (envelope-from git) Date: Wed, 26 Jul 2023 18:06:24 GMT Message-Id: <202307261806.36QI6O1b087625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 98e7f836e65e - stable/12 - Work around VNET and DPCPU related panics on aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 98e7f836e65ee413cd0b383371a6aca0115084ed Auto-Submitted: auto-generated The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=98e7f836e65ee413cd0b383371a6aca0115084ed commit 98e7f836e65ee413cd0b383371a6aca0115084ed Author: Dimitry Andric AuthorDate: 2023-07-23 13:48:36 +0000 Commit: Dimitry Andric CommitDate: 2023-07-26 18:03:46 +0000 Work around VNET and DPCPU related panics on aarch64 lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions, which breaks VNET and DPCPU when used in modules. Until VNET and DPCPU can be fixed to deal with these relaxed instructions, disable linker relaxation for now. PR: 264094 Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41156 (cherry picked from commit 80e4ac2964a11edef456a15b77e43aadeaf273a2) --- sys/conf/kmod.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 610484ba7e36..f67be86eeb73 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -168,6 +168,13 @@ CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer CFLAGS+= -fPIC .endif +.if ${MACHINE_CPUARCH} == "aarch64" +# https://bugs.freebsd.org/264094 +# lld >= 14 and recent GNU ld can relax adrp+add and adrp+ldr instructions, +# which breaks VNET. +LDFLAGS+= --no-relax +.endif + # Temporary workaround for PR 196407, which contains the fascinating details. # Don't allow clang to use fpu instructions or registers in kernel modules. .if ${MACHINE_CPUARCH} == arm From nobody Wed Jul 26 23:51:22 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 4RB9f23mqrz4p9FT; Wed, 26 Jul 2023 23:51: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 4RB9f23CqWz4HlH; Wed, 26 Jul 2023 23:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415482; 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=etqbJluaUvXJospdLeYcqIfPC9yfKmSWp22JD2/7qlQ=; b=tHtGz6b4jeyL+x91PFPSqavq21vTPafg3QoYHXKc2qllChSatx7m/VETmeK+p0NeNS2xfe oMUyUtKBo0aHVm331gL4cWWhM9Jv4xylnZiF9WUSu8oV6Xo04TjADu8JyBV4dgYfNu1p1N uNf6WsWwHsHweUYuictBKGqH8cKxI+pJ0Q+dNywjQ+zogtfglqFR058P52fsTTh4Rr8XNe 1OzfmUwuVC48z58+MJzGwH0gptu+zOqYl4Z5x0AMt6/fqaNhlZj8WTGsne6BoaRUA/kj7W evvKtyXeNyq3BHDlKaZUCV3FolIlvgASzhCZylkjy/sgyIkMJ8LOZWq0DyzARA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415482; 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=etqbJluaUvXJospdLeYcqIfPC9yfKmSWp22JD2/7qlQ=; b=B0uOD/xC/kKaCLAxxRIOCCGuCtEwibsOwbGjZIYssIofcr07zxwXk/eILB2+Rr/swPHoRB Pt/85OTo13rMTzZ24PsG6kRLC6a+Wzn9C1LD6G7S3CK/MsRyx676Jm8+eEmm5RGoV+OVjE cbUBPZjUMe+buRCcgmRloYvZnmXbPAX4OAOjMpMopuzktGRYvh4QgWuRB+fAYKNmlmUfFk kfuyo3rOe0XbSuF4yA7ZaNVw4DDbBStNJsZ+LeKutDG5Qrrh2RDlREzcSyaI1qK7rsBNcb qkMpx+dC6udm1jZgyZezs82hEqwatMERRYUaUQoMFXwx/r8vo3xLr+cALI/y9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690415482; a=rsa-sha256; cv=none; b=f6DdIPotA+XXJ3BFAMbCcMry4Ncgb0PA/pIQ6pCm3UWr8PLH5JY0T+8GnAJGSngCnKPTJ/ Mg/gIjO1GSTAgUNuA+BW/KWEb7ej2e1p2s8rTBGO6u8JkUcQGf8f+eua9AFMaqVgGJ38LM RWi0PGFieqmZSfRtc29/2iHPEuzmmpP4tO3OHRzbjcpVS0KEiWQ3Yd5QXhwMQANKcQdym8 nkcv9YR5cU67m1RFo/EyP5u0VTuRMu1AnDWWcCnh5IbIPFURtg+jtSCNt1qDhU6kf1jrlY idRAt3uRIx1PAsC9ill5zw7KUiFAt2jWXyvzL1dCTz0t5snYugT7YlIRmaq61A== 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 4RB9f22KDcz12wd; Wed, 26 Jul 2023 23:51:22 +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 36QNpMwX060637; Wed, 26 Jul 2023 23:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QNpM4l060636; Wed, 26 Jul 2023 23:51:22 GMT (envelope-from git) Date: Wed, 26 Jul 2023 23:51:22 GMT Message-Id: <202307262351.36QNpM4l060636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2b01ffb88416 - stable/13 - Fix powf(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b01ffb8841635440e03dd2f8c3f7a013f1c8bba Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b01ffb8841635440e03dd2f8c3f7a013f1c8bba commit 2b01ffb8841635440e03dd2f8c3f7a013f1c8bba Author: Mark Murray AuthorDate: 2021-09-06 17:26:39 +0000 Commit: Ed Maste CommitDate: 2023-07-26 23:07:29 +0000 Fix powf(). Summary: From Steve Kargl: Paul Zimmermann has identified a bug in Openlibm's powf(), which is identical to FreeBSD's libm. Both derived from fdlibm. https://github.com/JuliaMath/openlibm/issues/212. Consider % cat h.c int main(void) { float x, y, z; x = 0x1.ffffecp-1F; y = -0x1.000002p+27F; z = 0x1.557a86p115F; printf("%e %e %e <-- should be %e\n", x, y, powf(x,y), z); return 0; } % cc -o h -fno-builtin h.c -lm && ./h 9.999994e-01 -1.342177e+08 inf <-- should be 5.540807e+34 Reviewers: manu Subscribers: imp, andrew, emaste Differential Revision: https://reviews.freebsd.org/D31865 (cherry picked from commit 292815eac623035493854f133200a4b1041fa246) --- lib/msun/src/e_powf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c index 33eedad50b16..122da455f740 100644 --- a/lib/msun/src/e_powf.c +++ b/lib/msun/src/e_powf.c @@ -136,7 +136,7 @@ __ieee754_powf(float x, float y) /* |y| is huge */ if(iy>0x4d000000) { /* if |y| > 2**27 */ /* over/underflow if x is not close to one */ - if(ix<0x3f7ffff7) return (hy<0)? sn*huge*huge:sn*tiny*tiny; + if(ix<0x3f7ffff6) return (hy<0)? sn*huge*huge:sn*tiny*tiny; if(ix>0x3f800007) return (hy>0)? sn*huge*huge:sn*tiny*tiny; /* now |1-x| is tiny <= 2**-20, suffice to compute log(x) by x-x^2/2+x^3/3-x^4/4 */ From nobody Wed Jul 26 23:51:23 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 4RB9f43Kftz4p9YT; Wed, 26 Jul 2023 23:51:24 +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 4RB9f33fyvz4HxJ; Wed, 26 Jul 2023 23:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415483; 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=NlgtvviTfqiKNGhRkOw61QXwq0jrags6cuoX++UJs00=; b=qlMiDpI9M6xYw0zd0t9E1zzpV9fbs4vKogPFci87NKYNALiihsbo3HUDV3ACh1N7hckDMz yI9pq1QI7Wm1R+rGLtpl89egQPfKi5wQ4c8+LBDlJ4v7MYq6QCgogWi+WW8mQoNE0Y9ldh qh61uRc8GS22Y6nzXyZ7HCvgYyy39ijCbZOm2zRG56S1ExatsdEZltode4Q0GTUhO+KdKT 5JP0HNxD9lQLa4Nr1N7dFoH0uiMBOEJWHDkgS2I3zY063nAZ6Dwt7+ZJCUzzrGPwHKznk4 8RQjgxWWozApCdKSdA1eROV3LGdjDnCRWj7D75j8YorEJgu9GyrWjMPpTynlCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415483; 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=NlgtvviTfqiKNGhRkOw61QXwq0jrags6cuoX++UJs00=; b=Vy7oo82utayf5vlTzp8vVGetkflcXxmTbB638BqsMlK1l7lEy3iz444uCD+Tky61+PYU/m eW2OuDLd3xpkpqdH2vqptCe4nRf0m9MJl8GECHFR1it76g+tQ0HqhyyCJ/7C/CTbDxBURR mVZm0b1kDQmR6vb1o/Wrpwu1fsUt//tH1LAEXn2AxRBl7ICGGWUrARX0x6abwrxFxYSf2j 17apdmGS9IOPucbmV8UvlIijhNdwxcogdWs9JlmDHi2Asj2X4wXY/UM1bLXRBgT7F28FLk FUybYmnZzEI2l1Ou3uLsFBNlfxwJgH1U1C/cT40pk9apgmqa2edWobybCvSnpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690415483; a=rsa-sha256; cv=none; b=nZaGEePFT1EhZz5TukjhxH85eU30x2exn1u+xC3MrDGRkCwvQxrmbrfhMlF9MX2anBmZ2T kxICwPtLPEAvcEHeD3wZJM94d8UoZ9XyweoQqmCIN5/IlxEvgcLYM4mjEYG0YrbWAKl+Ie HxvfilwXGbyEZOq0WQfS1Lsk2BWUJsi8o2cNypf8bK1AmpLL4kcsrSgNvmPDqx4xDvbAJg mEkzVmVJmmVSFtaJUMEqX/Qac8GnN1sCQxbXiKt7M7BigBEoiAK6tlH91TSH7jnjmpe8yu fhLZbRAJFjwMS0DTjo81sbYPjqCbzDlwGHeM5tof0TSC3ibpYmMFTjub/nZTuA== 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 4RB9f32jJxz131l; Wed, 26 Jul 2023 23:51:23 +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 36QNpNOF060662; Wed, 26 Jul 2023 23:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QNpNtZ060661; Wed, 26 Jul 2023 23:51:23 GMT (envelope-from git) Date: Wed, 26 Jul 2023 23:51:23 GMT Message-Id: <202307262351.36QNpNtZ060661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4b597e559c24 - stable/13 - * lib/msun/Makefile: . Disconnect b_exp.c and b_log.c from the build. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b597e559c240a6a8a89d6279818d0cf0f1d8c6f Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4b597e559c240a6a8a89d6279818d0cf0f1d8c6f commit 4b597e559c240a6a8a89d6279818d0cf0f1d8c6f Author: Mark Murray AuthorDate: 2021-12-14 09:02:45 +0000 Commit: Ed Maste CommitDate: 2023-07-26 23:07:30 +0000 * lib/msun/Makefile: . Disconnect b_exp.c and b_log.c from the build. * lib/msun/bsdsrc/b_exp.c: . Replace scalb() usage with C99's ldexp(). . Replace finite(x) usage with C99's isfinite(). . Whitespace changes towards style(9). . Remove include of "mathimpl.h". It is no longer needed. . Remove #if 0 ... #endif code, which has been present since svn r93211 (2002-03-26). . New minimax polynomial coefficients. . Add comments to explain origins of some constants. . Use ansi-C prototype. Remove K&R prototype. Add static to prototype. * lib/msun/bsdsrc/b_log.c: . Remove include of "mathimpl.h". It is no longer needed. . Fix comments to actually describe the code. . Reduce minimax polynomial from degree 4 to degree 3. This uses newly computed coefficients. . Use ansi-C prototype. Remove K&R prototype. Add static to prototype. . Remove volatile in declaration of u1. . Alphabetize decalaration list. . Whitespace changes towards style(9). . In argument reduction of x to g and m, replace use of logb() and ldexp() with a single call to frexp(). Add code to get 1 <= g < 2. . Remove #if 0 ... #endif code, which has been present since svn r93211 (2002-03-26). . The special case m == -1022, replace logb() with ilogb(). * lib/msun/bsdsrc/b_tgamma.c: . Update comments. Fix comments where needed. . Add float.h to get LDBL_MANT_DIG for weak reference of tgammal to tgamma. . Remove include of "mathimpl.h". It is no longer needed. . Use "math.h" instead of . . Add '#include math_private.h" . Add struct Double from mathimpl.h and include b_log.c and b_exp.c. . Remove forward declarations of neg_gam(), small_gam(), smaller_gam, large_gam() and ratfun_gam() by re-arranging the code to move these function above their first reference. . New minimax coefficients for polynomial in large_gam(). . New splitting of a0 into a0hi nd a0lo, which include additional bits of precision. . Use ansi-C prototype. Remove K&R prototype. . Replace the TRUNC() macro with a simple cast of a double entities to float before assignment (functional changes). . Replace sin(M_PI*z) with sinpi(z) and cos(M_PI*(0.5-z)) with cospi(0.5-z). Submitted by: Steve Kargl Differential Revision: https://reviews.freebsd.org/D33444 Reviewed by: pfg (cherry picked from commit 455b2ccda3df35f31a167f8a35f11ec31fac89bc) --- lib/msun/Makefile | 2 +- lib/msun/bsdsrc/b_exp.c | 143 +++++--------- lib/msun/bsdsrc/b_log.c | 166 +++++------------ lib/msun/bsdsrc/b_tgamma.c | 455 +++++++++++++++++++++++++++------------------ 4 files changed, 370 insertions(+), 396 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 0be2813bb933..24d740d761d5 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -59,7 +59,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 5 WARNS?= 1 IGNORE_PRAGMA= -COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \ +COMMON_SRCS= b_tgamma.c \ e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \ e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \ e_expf.c e_fmod.c e_fmodf.c e_gamma.c e_gamma_r.c e_gammaf.c \ diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c index 89a290529da9..c667293ed7c6 100644 --- a/lib/msun/bsdsrc/b_exp.c +++ b/lib/msun/bsdsrc/b_exp.c @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD$"); - /* EXP(X) * RETURN THE EXPONENTIAL OF X * DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS) @@ -41,14 +40,14 @@ __FBSDID("$FreeBSD$"); * REVISED BY K.C. NG on 2/6/85, 2/15/85, 3/7/85, 3/24/85, 4/16/85, 6/14/86. * * Required system supported functions: - * scalb(x,n) + * ldexp(x,n) * copysign(x,y) - * finite(x) + * isfinite(x) * * Method: * 1. Argument Reduction: given the input x, find r and integer k such * that - * x = k*ln2 + r, |r| <= 0.5*ln2 . + * x = k*ln2 + r, |r| <= 0.5*ln2. * r will be represented as r := z+c for better accuracy. * * 2. Compute exp(r) by @@ -69,105 +68,59 @@ __FBSDID("$FreeBSD$"); * with 1,156,000 random arguments on a VAX, the maximum observed * error was 0.869 ulps (units in the last place). */ - -#include "mathimpl.h" - -static const double p1 = 0x1.555555555553ep-3; -static const double p2 = -0x1.6c16c16bebd93p-9; -static const double p3 = 0x1.1566aaf25de2cp-14; -static const double p4 = -0x1.bbd41c5d26bf1p-20; -static const double p5 = 0x1.6376972bea4d0p-25; -static const double ln2hi = 0x1.62e42fee00000p-1; -static const double ln2lo = 0x1.a39ef35793c76p-33; -static const double lnhuge = 0x1.6602b15b7ecf2p9; -static const double lntiny = -0x1.77af8ebeae354p9; -static const double invln2 = 0x1.71547652b82fep0; - -#if 0 -double exp(x) -double x; -{ - double z,hi,lo,c; - int k; - -#if !defined(vax)&&!defined(tahoe) - if(x!=x) return(x); /* x is NaN */ -#endif /* !defined(vax)&&!defined(tahoe) */ - if( x <= lnhuge ) { - if( x >= lntiny ) { - - /* argument reduction : x --> x - k*ln2 */ - - k=invln2*x+copysign(0.5,x); /* k=NINT(x/ln2) */ - - /* express x-k*ln2 as hi-lo and let x=hi-lo rounded */ - - hi=x-k*ln2hi; - x=hi-(lo=k*ln2lo); - - /* return 2^k*[1+x+x*c/(2+c)] */ - z=x*x; - c= x - z*(p1+z*(p2+z*(p3+z*(p4+z*p5)))); - return scalb(1.0+(hi-(lo-(x*c)/(2.0-c))),k); - - } - /* end of x > lntiny */ - - else - /* exp(-big#) underflows to zero */ - if(finite(x)) return(scalb(1.0,-5000)); - - /* exp(-INF) is zero */ - else return(0.0); - } - /* end of x < lnhuge */ - - else - /* exp(INF) is INF, exp(+big#) overflows to INF */ - return( finite(x) ? scalb(1.0,5000) : x); -} -#endif +static const double + p1 = 1.6666666666666660e-01, /* 0x3fc55555, 0x55555553 */ + p2 = -2.7777777777564776e-03, /* 0xbf66c16c, 0x16c0ac3c */ + p3 = 6.6137564717940088e-05, /* 0x3f11566a, 0xb5c2ba0d */ + p4 = -1.6534060280704225e-06, /* 0xbebbbd53, 0x273e8fb7 */ + p5 = 4.1437773411069054e-08; /* 0x3e663f2a, 0x09c94b6c */ + +static const double + ln2hi = 0x1.62e42fee00000p-1, /* High 32 bits round-down. */ + ln2lo = 0x1.a39ef35793c76p-33; /* Next 53 bits round-to-nearst. */ + +static const double + lnhuge = 0x1.6602b15b7ecf2p9, /* (DBL_MAX_EXP + 9) * log(2.) */ + lntiny = -0x1.77af8ebeae354p9, /* (DBL_MIN_EXP - 53 - 10) * log(2.) */ + invln2 = 0x1.71547652b82fep0; /* 1 / log(2.) */ /* returns exp(r = x + c) for |c| < |x| with no overlap. */ -double __exp__D(x, c) -double x, c; +static double +__exp__D(double x, double c) { - double z,hi,lo; + double hi, lo, z; int k; - if (x != x) /* x is NaN */ + if (x != x) /* x is NaN. */ return(x); - if ( x <= lnhuge ) { - if ( x >= lntiny ) { - /* argument reduction : x --> x - k*ln2 */ - z = invln2*x; - k = z + copysign(.5, x); - - /* express (x+c)-k*ln2 as hi-lo and let x=hi-lo rounded */ - - hi=(x-k*ln2hi); /* Exact. */ - x= hi - (lo = k*ln2lo-c); - /* return 2^k*[1+x+x*c/(2+c)] */ - z=x*x; - c= x - z*(p1+z*(p2+z*(p3+z*(p4+z*p5)))); - c = (x*c)/(2.0-c); - - return scalb(1.+(hi-(lo - c)), k); + if (x <= lnhuge) { + if (x >= lntiny) { + /* argument reduction: x --> x - k*ln2 */ + z = invln2 * x; + k = z + copysign(0.5, x); + + /* + * Express (x + c) - k * ln2 as hi - lo. + * Let x = hi - lo rounded. + */ + hi = x - k * ln2hi; /* Exact. */ + lo = k * ln2lo - c; + x = hi - lo; + + /* Return 2^k*[1+x+x*c/(2+c)] */ + z = x * x; + c = x - z * (p1 + z * (p2 + z * (p3 + z * (p4 + + z * p5)))); + c = (x * c) / (2 - c); + + return (ldexp(1 + (hi - (lo - c)), k)); + } else { + /* exp(-INF) is 0. exp(-big) underflows to 0. */ + return (isfinite(x) ? ldexp(1., -5000) : 0); } - /* end of x > lntiny */ - - else - /* exp(-big#) underflows to zero */ - if(finite(x)) return(scalb(1.0,-5000)); - - /* exp(-INF) is zero */ - else return(0.0); - } - /* end of x < lnhuge */ - - else + } else /* exp(INF) is INF, exp(+big#) overflows to INF */ - return( finite(x) ? scalb(1.0,5000) : x); + return (isfinite(x) ? ldexp(1., 5000) : x); } diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c index c164dfa5014c..9d09ac754706 100644 --- a/lib/msun/bsdsrc/b_log.c +++ b/lib/msun/bsdsrc/b_log.c @@ -33,10 +33,6 @@ #include __FBSDID("$FreeBSD$"); -#include - -#include "mathimpl.h" - /* Table-driven natural logarithm. * * This code was derived, with minor modifications, from: @@ -44,25 +40,27 @@ __FBSDID("$FreeBSD$"); * Logarithm in IEEE Floating-Point arithmetic." ACM Trans. * Math Software, vol 16. no 4, pp 378-400, Dec 1990). * - * Calculates log(2^m*F*(1+f/F)), |f/j| <= 1/256, + * Calculates log(2^m*F*(1+f/F)), |f/F| <= 1/256, * where F = j/128 for j an integer in [0, 128]. * * log(2^m) = log2_hi*m + log2_tail*m - * since m is an integer, the dominant term is exact. + * The leading term is exact, because m is an integer, * m has at most 10 digits (for subnormal numbers), * and log2_hi has 11 trailing zero bits. * - * log(F) = logF_hi[j] + logF_lo[j] is in tabular form in log_table.h + * log(F) = logF_hi[j] + logF_lo[j] is in table below. * logF_hi[] + 512 is exact. * * log(1+f/F) = 2*f/(2*F + f) + 1/12 * (2*f/(2*F + f))**3 + ... - * the leading term is calculated to extra precision in two + * + * The leading term is calculated to extra precision in two * parts, the larger of which adds exactly to the dominant * m and F terms. + * * There are two cases: - * 1. when m, j are non-zero (m | j), use absolute + * 1. When m and j are non-zero (m | j), use absolute * precision for the leading term. - * 2. when m = j = 0, |1-x| < 1/256, and log(x) ~= (x-1). + * 2. When m = j = 0, |1-x| < 1/256, and log(x) ~= (x-1). * In this case, use a relative precision of 24 bits. * (This is done differently in the original paper) * @@ -70,11 +68,21 @@ __FBSDID("$FreeBSD$"); * 0 return signalling -Inf * neg return signalling NaN * +Inf return +Inf -*/ + */ #define N 128 -/* Table of log(Fj) = logF_head[j] + logF_tail[j], for Fj = 1+j/128. +/* + * Coefficients in the polynomial approximation of log(1+f/F). + * Domain of x is [0,1./256] with 2**(-64.187) precision. + */ +static const double + A1 = 8.3333333333333329e-02, /* 0x3fb55555, 0x55555555 */ + A2 = 1.2499999999943598e-02, /* 0x3f899999, 0x99991a98 */ + A3 = 2.2321527525957776e-03; /* 0x3f624929, 0xe24e70be */ + +/* + * Table of log(Fj) = logF_head[j] + logF_tail[j], for Fj = 1+j/128. * Used for generation of extend precision logarithms. * The constant 35184372088832 is 2^45, so the divide is exact. * It ensures correct reading of logF_head, even for inaccurate @@ -82,12 +90,7 @@ __FBSDID("$FreeBSD$"); * right answer for integers less than 2^53.) * Values for log(F) were generated using error < 10^-57 absolute * with the bc -l package. -*/ -static double A1 = .08333333333333178827; -static double A2 = .01250000000377174923; -static double A3 = .002232139987919447809; -static double A4 = .0004348877777076145742; - + */ static double logF_head[N+1] = { 0., .007782140442060381246, @@ -351,118 +354,51 @@ static double logF_tail[N+1] = { .00000000000025144230728376072, -.00000000000017239444525614834 }; - -#if 0 -double -#ifdef _ANSI_SOURCE -log(double x) -#else -log(x) double x; -#endif -{ - int m, j; - double F, f, g, q, u, u2, v, zero = 0.0, one = 1.0; - volatile double u1; - - /* Catch special cases */ - if (x <= 0) - if (x == zero) /* log(0) = -Inf */ - return (-one/zero); - else /* log(neg) = NaN */ - return (zero/zero); - else if (!finite(x)) - return (x+x); /* x = NaN, Inf */ - - /* Argument reduction: 1 <= g < 2; x/2^m = g; */ - /* y = F*(1 + f/F) for |f| <= 2^-8 */ - - m = logb(x); - g = ldexp(x, -m); - if (m == -1022) { - j = logb(g), m += j; - g = ldexp(g, -j); - } - j = N*(g-1) + .5; - F = (1.0/N) * j + 1; /* F*128 is an integer in [128, 512] */ - f = g - F; - - /* Approximate expansion for log(1+f/F) ~= u + q */ - g = 1/(2*F+f); - u = 2*f*g; - v = u*u; - q = u*v*(A1 + v*(A2 + v*(A3 + v*A4))); - - /* case 1: u1 = u rounded to 2^-43 absolute. Since u < 2^-8, - * u1 has at most 35 bits, and F*u1 is exact, as F has < 8 bits. - * It also adds exactly to |m*log2_hi + log_F_head[j] | < 750 - */ - if (m | j) - u1 = u + 513, u1 -= 513; - - /* case 2: |1-x| < 1/256. The m- and j- dependent terms are zero; - * u1 = u to 24 bits. - */ - else - u1 = u, TRUNC(u1); - u2 = (2.0*(f - F*u1) - u1*f) * g; - /* u1 + u2 = 2f/(2F+f) to extra precision. */ - - /* log(x) = log(2^m*F*(1+f/F)) = */ - /* (m*log2_hi+logF_head[j]+u1) + (m*log2_lo+logF_tail[j]+q); */ - /* (exact) + (tiny) */ - - u1 += m*logF_head[N] + logF_head[j]; /* exact */ - u2 = (u2 + logF_tail[j]) + q; /* tiny */ - u2 += logF_tail[N]*m; - return (u1 + u2); -} -#endif - /* * Extra precision variant, returning struct {double a, b;}; - * log(x) = a+b to 63 bits, with a rounded to 26 bits. + * log(x) = a+b to 63 bits, with 'a' rounded to 24 bits. */ -struct Double -#ifdef _ANSI_SOURCE +static struct Double __log__D(double x) -#else -__log__D(x) double x; -#endif { int m, j; - double F, f, g, q, u, v, u2; - volatile double u1; + double F, f, g, q, u, v, u1, u2; struct Double r; - /* Argument reduction: 1 <= g < 2; x/2^m = g; */ - /* y = F*(1 + f/F) for |f| <= 2^-8 */ - - m = logb(x); - g = ldexp(x, -m); + /* + * Argument reduction: 1 <= g < 2; x/2^m = g; + * y = F*(1 + f/F) for |f| <= 2^-8 + */ + g = frexp(x, &m); + g *= 2; + m--; if (m == -1022) { - j = logb(g), m += j; + j = ilogb(g); + m += j; g = ldexp(g, -j); } - j = N*(g-1) + .5; - F = (1.0/N) * j + 1; + j = N * (g - 1) + 0.5; + F = (1. / N) * j + 1; f = g - F; - g = 1/(2*F+f); - u = 2*f*g; - v = u*u; - q = u*v*(A1 + v*(A2 + v*(A3 + v*A4))); - if (m | j) - u1 = u + 513, u1 -= 513; - else - u1 = u, TRUNC(u1); - u2 = (2.0*(f - F*u1) - u1*f) * g; + g = 1 / (2 * F + f); + u = 2 * f * g; + v = u * u; + q = u * v * (A1 + v * (A2 + v * A3)); + if (m | j) { + u1 = u + 513; + u1 -= 513; + } else { + u1 = (float)u; + } + u2 = (2 * (f - F * u1) - u1 * f) * g; - u1 += m*logF_head[N] + logF_head[j]; + u1 += m * logF_head[N] + logF_head[j]; - u2 += logF_tail[j]; u2 += q; - u2 += logF_tail[N]*m; - r.a = u1 + u2; /* Only difference is here */ - TRUNC(r.a); + u2 += logF_tail[j]; + u2 += q; + u2 += logF_tail[N] * m; + r.a = (float)(u1 + u2); /* Only difference is here. */ r.b = (u1 - r.a) + u2; return (r); } diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c index 5cb1f93f25ed..493ced3769c7 100644 --- a/lib/msun/bsdsrc/b_tgamma.c +++ b/lib/msun/bsdsrc/b_tgamma.c @@ -29,37 +29,46 @@ * SUCH DAMAGE. */ +/* + * The original code, FreeBSD's old svn r93211, contained the following + * attribution: + * + * This code by P. McIlroy, Oct 1992; + * + * The financial support of UUNET Communications Services is greatfully + * acknowledged. + * + * The algorithm remains, but the code has been re-arranged to facilitate + * porting to other precisions. + */ + /* @(#)gamma.c 8.1 (Berkeley) 6/4/93 */ #include __FBSDID("$FreeBSD$"); -/* - * This code by P. McIlroy, Oct 1992; - * - * The financial support of UUNET Communications Services is greatfully - * acknowledged. - */ +#include -#include -#include "mathimpl.h" +#include "math.h" +#include "math_private.h" -/* METHOD: - * x < 0: Use reflection formula, G(x) = pi/(sin(pi*x)*x*G(x)) - * At negative integers, return NaN and raise invalid. - * - * x < 6.5: - * Use argument reduction G(x+1) = xG(x) to reach the - * range [1.066124,2.066124]. Use a rational - * approximation centered at the minimum (x0+1) to - * ensure monotonicity. - * - * x >= 6.5: Use the asymptotic approximation (Stirling's formula) - * adjusted for equal-ripples: - * - * log(G(x)) ~= (x-.5)*(log(x)-1) + .5(log(2*pi)-1) + 1/x*P(1/(x*x)) +/* Used in b_log.c and below. */ +struct Double { + double a; + double b; +}; + +#include "b_log.c" +#include "b_exp.c" + +/* + * The range is broken into several subranges. Each is handled by its + * helper functions. * - * Keep extra precision in multiplying (x-.5)(log(x)-1), to - * avoid premature round-off. + * x >= 6.0: large_gam(x) + * 6.0 > x >= xleft: small_gam(x) where xleft = 1 + left + x0. + * xleft > x > iota: smaller_gam(x) where iota = 1e-17. + * iota > x > -itoa: Handle x near 0. + * -iota > x : neg_gam * * Special values: * -Inf: return NaN and raise invalid; @@ -77,201 +86,224 @@ __FBSDID("$FreeBSD$"); * Maximum observed error < 4ulp in 1,000,000 trials. */ -static double neg_gam(double); -static double small_gam(double); -static double smaller_gam(double); -static struct Double large_gam(double); -static struct Double ratfun_gam(double, double); - -/* - * Rational approximation, A0 + x*x*P(x)/Q(x), on the interval - * [1.066.., 2.066..] accurate to 4.25e-19. - */ -#define LEFT -.3955078125 /* left boundary for rat. approx */ -#define x0 .461632144968362356785 /* xmin - 1 */ - -#define a0_hi 0.88560319441088874992 -#define a0_lo -.00000000000000004996427036469019695 -#define P0 6.21389571821820863029017800727e-01 -#define P1 2.65757198651533466104979197553e-01 -#define P2 5.53859446429917461063308081748e-03 -#define P3 1.38456698304096573887145282811e-03 -#define P4 2.40659950032711365819348969808e-03 -#define Q0 1.45019531250000000000000000000e+00 -#define Q1 1.06258521948016171343454061571e+00 -#define Q2 -2.07474561943859936441469926649e-01 -#define Q3 -1.46734131782005422506287573015e-01 -#define Q4 3.07878176156175520361557573779e-02 -#define Q5 5.12449347980666221336054633184e-03 -#define Q6 -1.76012741431666995019222898833e-03 -#define Q7 9.35021023573788935372153030556e-05 -#define Q8 6.13275507472443958924745652239e-06 /* * Constants for large x approximation (x in [6, Inf]) * (Accurate to 2.8*10^-19 absolute) */ -#define lns2pi_hi 0.418945312500000 -#define lns2pi_lo -.000006779295327258219670263595 -#define Pa0 8.33333333333333148296162562474e-02 -#define Pa1 -2.77777777774548123579378966497e-03 -#define Pa2 7.93650778754435631476282786423e-04 -#define Pa3 -5.95235082566672847950717262222e-04 -#define Pa4 8.41428560346653702135821806252e-04 -#define Pa5 -1.89773526463879200348872089421e-03 -#define Pa6 5.69394463439411649408050664078e-03 -#define Pa7 -1.44705562421428915453880392761e-02 - -static const double zero = 0., one = 1.0, tiny = 1e-300; -double -tgamma(x) - double x; +static const double zero = 0.; +static const volatile double tiny = 1e-300; +/* + * x >= 6 + * + * Use the asymptotic approximation (Stirling's formula) adjusted fof + * equal-ripples: + * + * log(G(x)) ~= (x-0.5)*(log(x)-1) + 0.5(log(2*pi)-1) + 1/x*P(1/(x*x)) + * + * Keep extra precision in multiplying (x-.5)(log(x)-1), to avoid + * premature round-off. + * + * Accurate to max(ulp(1/128) absolute, 2^-66 relative) error. + */ +static const double + ln2pi_hi = 0.41894531250000000, + ln2pi_lo = -6.7792953272582197e-6, + Pa0 = 8.3333333333333329e-02, /* 0x3fb55555, 0x55555555 */ + Pa1 = -2.7777777777735404e-03, /* 0xbf66c16c, 0x16c145ec */ + Pa2 = 7.9365079044114095e-04, /* 0x3f4a01a0, 0x183de82d */ + Pa3 = -5.9523715464225254e-04, /* 0xbf438136, 0x0e681f62 */ + Pa4 = 8.4161391899445698e-04, /* 0x3f4b93f8, 0x21042a13 */ + Pa5 = -1.9065246069191080e-03, /* 0xbf5f3c8b, 0x357cb64e */ + Pa6 = 5.9047708485785158e-03, /* 0x3f782f99, 0xdaf5d65f */ + Pa7 = -1.6484018705183290e-02; /* 0xbf90e12f, 0xc4fb4df0 */ + +static struct Double +large_gam(double x) { + double p, z, thi, tlo, xhi, xlo; struct Double u; - if (x >= 6) { - if(x > 171.63) - return (x / zero); - u = large_gam(x); - return(__exp__D(u.a, u.b)); - } else if (x >= 1.0 + LEFT + x0) - return (small_gam(x)); - else if (x > 1.e-17) - return (smaller_gam(x)); - else if (x > -1.e-17) { - if (x != 0.0) - u.a = one - tiny; /* raise inexact */ - return (one/x); - } else if (!finite(x)) - return (x - x); /* x is NaN or -Inf */ - else - return (neg_gam(x)); + z = 1 / (x * x); + p = Pa0 + z * (Pa1 + z * (Pa2 + z * (Pa3 + z * (Pa4 + z * (Pa5 + + z * (Pa6 + z * Pa7)))))); + p = p / x; + + u = __log__D(x); + u.a -= 1; + + /* Split (x - 0.5) in high and low parts. */ + x -= 0.5; + xhi = (float)x; + xlo = x - xhi; + + /* Compute t = (x-.5)*(log(x)-1) in extra precision. */ + thi = xhi * u.a; + tlo = xlo * u.a + x * u.b; + + /* Compute thi + tlo + ln2pi_hi + ln2pi_lo + p. */ + tlo += ln2pi_lo; + tlo += p; + u.a = ln2pi_hi + tlo; + u.a += thi; + u.b = thi - u.a; + u.b += ln2pi_hi; + u.b += tlo; + return (u); } /* - * Accurate to max(ulp(1/128) absolute, 2^-66 relative) error. + * Rational approximation, A0 + x * x * P(x) / Q(x), on the interval + * [1.066.., 2.066..] accurate to 4.25e-19. + * + * Returns r.a + r.b = a0 + (z + c)^2 * p / q, with r.a truncated. */ +static const double +#if 0 + a0_hi = 8.8560319441088875e-1, + a0_lo = -4.9964270364690197e-17, +#else + a0_hi = 8.8560319441088875e-01, /* 0x3fec56dc, 0x82a74aef */ + a0_lo = -4.9642368725563397e-17, /* 0xbc8c9deb, 0xaa64afc3 */ +#endif + P0 = 6.2138957182182086e-1, + P1 = 2.6575719865153347e-1, + P2 = 5.5385944642991746e-3, + P3 = 1.3845669830409657e-3, + P4 = 2.4065995003271137e-3, + Q0 = 1.4501953125000000e+0, + Q1 = 1.0625852194801617e+0, + Q2 = -2.0747456194385994e-1, + Q3 = -1.4673413178200542e-1, + Q4 = 3.0787817615617552e-2, + Q5 = 5.1244934798066622e-3, + Q6 = -1.7601274143166700e-3, + Q7 = 9.3502102357378894e-5, + Q8 = 6.1327550747244396e-6; + static struct Double -large_gam(x) - double x; +ratfun_gam(double z, double c) { - double z, p; - struct Double t, u, v; + double p, q, thi, tlo; + struct Double r; - z = one/(x*x); - p = Pa0+z*(Pa1+z*(Pa2+z*(Pa3+z*(Pa4+z*(Pa5+z*(Pa6+z*Pa7)))))); - p = p/x; + q = Q0 + z * (Q1 + z * (Q2 + z * (Q3 + z * (Q4 + z * (Q5 + + z * (Q6 + z * (Q7 + z * Q8))))))); + p = P0 + z * (P1 + z * (P2 + z * (P3 + z * P4))); + p = p / q; - u = __log__D(x); - u.a -= one; - v.a = (x -= .5); - TRUNC(v.a); - v.b = x - v.a; - t.a = v.a*u.a; /* t = (x-.5)*(log(x)-1) */ - t.b = v.b*u.a + x*u.b; - /* return t.a + t.b + lns2pi_hi + lns2pi_lo + p */ - t.b += lns2pi_lo; t.b += p; - u.a = lns2pi_hi + t.b; u.a += t.a; - u.b = t.a - u.a; - u.b += lns2pi_hi; u.b += t.b; - return (u); + /* Split z into high and low parts. */ + thi = (float)z; + tlo = (z - thi) + c; + tlo *= (thi + z); + + /* Split (z+c)^2 into high and low parts. */ + thi *= thi; + q = thi; + thi = (float)thi; + tlo += (q - thi); + + /* Split p/q into high and low parts. */ + r.a = (float)p; + r.b = p - r.a; + + tlo = tlo * p + thi * r.b + a0_lo; + thi *= r.a; /* t = (z+c)^2*(P/Q) */ + r.a = (float)(thi + a0_hi); + r.b = ((a0_hi - r.a) + thi) + tlo; + return (r); /* r = a0 + t */ } /* + * x < 6 + * + * Use argument reduction G(x+1) = xG(x) to reach the range [1.066124, + * 2.066124]. Use a rational approximation centered at the minimum + * (x0+1) to ensure monotonicity. + * * Good to < 1 ulp. (provably .90 ulp; .87 ulp on 1,000,000 runs.) * It also has correct monotonicity. */ +static const double + left = -0.3955078125, /* left boundary for rat. approx */ + x0 = 4.6163214496836236e-1; /* xmin - 1 */ + static double -small_gam(x) - double x; +small_gam(double x) { - double y, ym1, t; + double t, y, ym1; struct Double yy, r; - y = x - one; - ym1 = y - one; - if (y <= 1.0 + (LEFT + x0)) { + + y = x - 1; + if (y <= 1 + (left + x0)) { yy = ratfun_gam(y - x0, 0); return (yy.a + yy.b); } - r.a = y; - TRUNC(r.a); - yy.a = r.a - one; - y = ym1; - yy.b = r.b = y - yy.a; + + r.a = (float)y; + yy.a = r.a - 1; + y = y - 1 ; + r.b = yy.b = y - yy.a; + /* Argument reduction: G(x+1) = x*G(x) */ - for (ym1 = y-one; ym1 > LEFT + x0; y = ym1--, yy.a--) { - t = r.a*yy.a; - r.b = r.a*yy.b + y*r.b; - r.a = t; - TRUNC(r.a); + for (ym1 = y - 1; ym1 > left + x0; y = ym1--, yy.a--) { + t = r.a * yy.a; + r.b = r.a * yy.b + y * r.b; + r.a = (float)t; r.b += (t - r.a); } + /* Return r*tgamma(y). */ yy = ratfun_gam(y - x0, 0); - y = r.b*(yy.a + yy.b) + r.a*yy.b; - y += yy.a*r.a; + y = r.b * (yy.a + yy.b) + r.a * yy.b; + y += yy.a * r.a; return (y); } /* - * Good on (0, 1+x0+LEFT]. Accurate to 1ulp. + * Good on (0, 1+x0+left]. Accurate to 1 ulp. */ static double -smaller_gam(x) - double x; +smaller_gam(double x) { - double t, d; - struct Double r, xx; - if (x < x0 + LEFT) { - t = x, TRUNC(t); - d = (t+x)*(x-t); + double d, rhi, rlo, t, xhi, xlo; + struct Double r; + + if (x < x0 + left) { + t = (float)x; + d = (t + x) * (x - t); t *= t; - xx.a = (t + x), TRUNC(xx.a); - xx.b = x - xx.a; xx.b += t; xx.b += d; - t = (one-x0); t += x; - d = (one-x0); d -= t; d += x; - x = xx.a + xx.b; + xhi = (float)(t + x); + xlo = x - xhi; + xlo += t; + xlo += d; + t = 1 - x0; + t += x; + d = 1 - x0; + d -= t; + d += x; + x = xhi + xlo; } else { - xx.a = x, TRUNC(xx.a); - xx.b = x - xx.a; + xhi = (float)x; + xlo = x - xhi; t = x - x0; - d = (-x0 -t); d += x; + d = - x0 - t; + d += x; } + r = ratfun_gam(t, d); - d = r.a/x, TRUNC(d); - r.a -= d*xx.a; r.a -= d*xx.b; r.a += r.b; - return (d + r.a/x); + d = (float)(r.a / x); + r.a -= d * xhi; + r.a -= d * xlo; + r.a += r.b; + + return (d + r.a / x); } /* - * returns (z+c)^2 * P(z)/Q(z) + a0 + * x < 0 + * + * Use reflection formula, G(x) = pi/(sin(pi*x)*x*G(x)). + * At negative integers, return NaN and raise invalid. */ -static struct Double -ratfun_gam(z, c) - double z, c; -{ - double p, q; - struct Double r, t; - - q = Q0 +z*(Q1+z*(Q2+z*(Q3+z*(Q4+z*(Q5+z*(Q6+z*(Q7+z*Q8))))))); - p = P0 + z*(P1 + z*(P2 + z*(P3 + z*P4))); - - /* return r.a + r.b = a0 + (z+c)^2*p/q, with r.a truncated to 26 bits. */ - p = p/q; - t.a = z, TRUNC(t.a); /* t ~= z + c */ - t.b = (z - t.a) + c; - t.b *= (t.a + z); - q = (t.a *= t.a); /* t = (z+c)^2 */ - TRUNC(t.a); - t.b += (q - t.a); - r.a = p, TRUNC(r.a); /* r = P/Q */ - r.b = p - r.a; - t.b = t.b*p + t.a*r.b + a0_lo; - t.a *= r.a; /* t = (z+c)^2*(P/Q) */ - r.a = t.a + a0_hi, TRUNC(r.a); - r.b = ((a0_hi-r.a) + t.a) + t.b; - return (r); /* r = a0 + t */ -} - static double -neg_gam(x) - double x; +neg_gam(double x) { int sgn = 1; struct Double lg, lsine; @@ -280,23 +312,29 @@ neg_gam(x) y = ceil(x); if (y == x) /* Negative integer. */ return ((x - x) / zero); + z = y - x; if (z > 0.5) - z = one - z; - y = 0.5 * y; + z = 1 - z; + + y = y / 2; if (y == ceil(y)) sgn = -1; - if (z < .25) - z = sin(M_PI*z); + + if (z < 0.25) + z = sinpi(z); else - z = cos(M_PI*(0.5-z)); + z = cospi(0.5 - z); + /* Special case: G(1-x) = Inf; G(x) may be nonzero. */ if (x < -170) { + if (x < -190) - return ((double)sgn*tiny*tiny); - y = one - x; /* exact: 128 < |x| < 255 */ + return (sgn * tiny * tiny); + + y = 1 - x; /* exact: 128 < |x| < 255 */ lg = large_gam(y); - lsine = __log__D(M_PI/z); /* = TRUNC(log(u)) + small */ + lsine = __log__D(M_PI / z); /* = TRUNC(log(u)) + small */ lg.a -= lsine.a; /* exact (opposite signs) */ lg.b -= lsine.b; y = -(lg.a + lg.b); @@ -305,11 +343,58 @@ neg_gam(x) *** 62 LINES SKIPPED *** From nobody Wed Jul 26 23:51:24 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 4RB9f46GKpz4p9QP; Wed, 26 Jul 2023 23:51:24 +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 4RB9f43yFSz4J15; Wed, 26 Jul 2023 23:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415484; 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=ivG4z0cLh2XwjKYapqnDYYjDnuW3TDSUQhMkFuRLMD8=; b=NYexMWQEFu304VlrVLmW3ffITPNJuKPS6bGnAFYD3uyydI69XGrc4b9c0qhpwGB8FOs4t9 uKHXj/5iuBkqw23OJjYgJ0PD50cPunLZ8XYKGDaceQd6NrFAoNsoxXXmbCf9GcFWzYwI2t JnmI17CgN/lkNaNaG6qv9s8k5z3B5yPxTwYvT3KIiN+0JaYvjy+mh21b2il4TT0HmJ6INu lj8zmWPIIztjMtzLj7EI+EbFR6fHWFxc1T07pfAk7GTroWKPgoxJaFDoNeLAvrq4zzrgM1 WCJ6puO1XswshcK3Mj1zUZYhO9XX9YikEzk/+g09uJaIWp456PMedhPF17ycpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415484; 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=ivG4z0cLh2XwjKYapqnDYYjDnuW3TDSUQhMkFuRLMD8=; b=McKFLNaqDTUqP+HSI0zirbBaV7P0P5JikdemUhY/5K4hVNs7BcpJwOHUExgsUDmvtORiY2 WQZk4BSTw9e6s04Z/5HAnL6P7hyAUBKhQj38+/aJ7g5sd9Kqsa0YRe5WPiA9+GEFT1g2RX UeZs+eGTvtNoJYyU+EbVb2hdnUGKSqAb/cbU7I5IiI1l4FhrViixzq+CFFqDIYjgeDTJzG etKg+DXPnVj0KW9X5OtgkVur5oyNCqdQC7rSWd/0imeNirv1Bzq+FYReE31d6NbY7bXRTe I0+d7P4m/Thi0F8J7IvrOxNuyYdi7+9ZRzCG7ERlagNbWk6438iyJgqz44spdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690415484; a=rsa-sha256; cv=none; b=voO93qrOMjT3zSsrW/aRzUpklmEcBS8QhASLazFbR/58zS42IDY48/h4tzc/4kaDYhhG5y vHSU7UWvkoQubCNVpM2Of1jBMBfSZLi+vkMU82tNvBS+7Q+244dDvDkFpr7Rzz/huILnCK bz2AZSn6OSLsKknZuIYr2DmNfwG61JSbrYAi7OiLDl8CxvkxozZFLfU4UgNnvDOTlH86yw wzp/UsB44p4DZiEw1jJ77dvGirpAlwgIISiId6xASX3/W96tdTNHAuurSc4eK7KVgJC8S9 iV/0f8bhdo9DC+PVmpAw2SxFjJ03ucLgrnxlmMojqBs6kRNccQipE268o4Mqsw== 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 4RB9f433cWz12wg; Wed, 26 Jul 2023 23:51:24 +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 36QNpO1Z060682; Wed, 26 Jul 2023 23:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QNpO9u060681; Wed, 26 Jul 2023 23:51:24 GMT (envelope-from git) Date: Wed, 26 Jul 2023 23:51:24 GMT Message-Id: <202307262351.36QNpO9u060681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d47b524eadb5 - stable/13 - * lib/msun/Makefile b/lib/msun/Makefile: . Disconnect imprecise.c from the build. This file can be deleted. . Add b_tgammal.c to the build for ld80 and ld128 targets. The ld128 is a 'git mv' of imprecise.c to ld128/b_tgammal.c. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d47b524eadb5a87506fe6ae03febbf72fad2ee06 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d47b524eadb5a87506fe6ae03febbf72fad2ee06 commit d47b524eadb5a87506fe6ae03febbf72fad2ee06 Author: Mark Murray AuthorDate: 2021-12-14 09:08:57 +0000 Commit: Ed Maste CommitDate: 2023-07-26 23:07:30 +0000 * lib/msun/Makefile b/lib/msun/Makefile: . Disconnect imprecise.c from the build. This file can be deleted. . Add b_tgammal.c to the build for ld80 and ld128 targets. The ld128 is a 'git mv' of imprecise.c to ld128/b_tgammal.c. * lib/msun/ld80/b_expl.c: . New file. Implement __exp__D for ld80 targets. This is based on bsdsrc/b_exp.c. * lib/msun/ld80/b_logl.c: . New file. Implement __log__D for ld80 targets. This is based on bsdsrc/b_log.c. * lib/msun/ld80/b_tgammal.c b/lib/msun/ld80/b_tgammal.c . New file. Implement tgammal(x) for ld80 targets. Submitted by: Steve Kargl Differential Revision: https://reviews.freebsd.org/D33444 Reviewed by: pfg (cherry picked from commit 03a88e3de9c68182d21df94b1c8c7ced930dbd1f) --- lib/msun/Makefile | 3 +- lib/msun/{src/imprecise.c => ld128/b_tgammal.c} | 0 lib/msun/ld80/b_expl.c | 113 +++++++ lib/msun/ld80/b_logl.c | 375 +++++++++++++++++++++ lib/msun/ld80/b_tgammal.c | 419 ++++++++++++++++++++++++ 5 files changed, 908 insertions(+), 2 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 24d740d761d5..8cb67f3700b9 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -69,7 +69,6 @@ COMMON_SRCS= b_tgamma.c \ e_pow.c e_powf.c e_rem_pio2.c \ e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c e_scalbf.c \ e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c fenv.c \ - imprecise.c \ k_cos.c k_cosf.c k_exp.c k_expf.c k_rem_pio2.c k_sin.c k_sinf.c \ k_tan.c k_tanf.c \ s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c s_cargl.c \ @@ -116,7 +115,7 @@ SYMBOL_MAPS= ${SYM_MAPS} COMMON_SRCS+= s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c .if ${LDBL_PREC} != 53 # If long double != double use these; otherwise, we alias the double versions. -COMMON_SRCS+= catrigl.c \ +COMMON_SRCS+= b_tgammal.c catrigl.c \ e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \ e_coshl.c e_fmodl.c e_hypotl.c \ e_lgammal.c e_lgammal_r.c e_powl.c \ diff --git a/lib/msun/src/imprecise.c b/lib/msun/ld128/b_tgammal.c similarity index 100% rename from lib/msun/src/imprecise.c rename to lib/msun/ld128/b_tgammal.c diff --git a/lib/msun/ld80/b_expl.c b/lib/msun/ld80/b_expl.c new file mode 100644 index 000000000000..21bacf4497a3 --- /dev/null +++ b/lib/msun/ld80/b_expl.c @@ -0,0 +1,113 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1985, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * See bsdsrc/b_exp.c for implementation details. + * + * bsdrc/b_exp.c converted to long double by Steven G. Kargl. + */ + +#include "fpmath.h" +#include "math_private.h" + +static const union IEEEl2bits + p0u = LD80C(0xaaaaaaaaaaaaaaab, -3, 1.66666666666666666671e-01L), + p1u = LD80C(0xb60b60b60b60b59a, -9, -2.77777777777777775377e-03L), + p2u = LD80C(0x8ab355e008a3cfce, -14, 6.61375661375629297465e-05L), + p3u = LD80C(0xddebbc994b0c1376, -20, -1.65343915327882529784e-06L), + p4u = LD80C(0xb354784cb4ef4c41, -25, 4.17535101591534118469e-08L), + p5u = LD80C(0x913e8a718382ce75, -30, -1.05679137034774806475e-09L), + p6u = LD80C(0xe8f0042aa134502e, -36, 2.64819349895429516863e-11L); +#define p1 (p0u.e) +#define p2 (p1u.e) +#define p3 (p2u.e) +#define p4 (p3u.e) +#define p5 (p4u.e) +#define p6 (p5u.e) +#define p7 (p6u.e) + +/* + * lnhuge = (LDBL_MAX_EXP + 9) * log(2.) + * lntiny = (LDBL_MIN_EXP - 64 - 10) * log(2.) + * invln2 = 1 / log(2.) + */ +static const union IEEEl2bits +ln2hiu = LD80C(0xb17217f700000000, -1, 6.93147180369123816490e-01L), +ln2lou = LD80C(0xd1cf79abc9e3b398, -33, 1.90821492927058781614e-10L), +lnhugeu = LD80C(0xb18b0c0330a8fad9, 13, 1.13627617309191834574e+04L), +lntinyu = LD80C(0xb236f28a68bc3bd7, 13, -1.14057368561139000667e+04L), +invln2u = LD80C(0xb8aa3b295c17f0bc, 0, 1.44269504088896340739e+00L); +#define ln2hi (ln2hiu.e) +#define ln2lo (ln2lou.e) +#define lnhuge (lnhugeu.e) +#define lntiny (lntinyu.e) +#define invln2 (invln2u.e) + +/* returns exp(r = x + c) for |c| < |x| with no overlap. */ + +static long double +__exp__D(long double x, long double c) +{ + long double hi, lo, z; + int k; + + if (x != x) /* x is NaN. */ + return(x); + + if (x <= lnhuge) { + if (x >= lntiny) { + /* argument reduction: x --> x - k*ln2 */ + z = invln2 * x; + k = z + copysignl(0.5L, x); + + /* + * Express (x + c) - k * ln2 as hi - lo. + * Let x = hi - lo rounded. + */ + hi = x - k * ln2hi; /* Exact. */ + lo = k * ln2lo - c; + x = hi - lo; + + /* Return 2^k*[1+x+x*c/(2+c)] */ + z = x * x; + c = x - z * (p1 + z * (p2 + z * (p3 + z * (p4 + + z * (p5 + z * (p6 + z * p7)))))); + c = (x * c) / (2 - c); + + return (ldexpl(1 + (hi - (lo - c)), k)); + } else { + /* exp(-INF) is 0. exp(-big) underflows to 0. */ + return (isfinite(x) ? ldexpl(1., -5000) : 0); + } + } else + /* exp(INF) is INF, exp(+big#) overflows to INF */ + return (isfinite(x) ? ldexpl(1., 5000) : x); +} diff --git a/lib/msun/ld80/b_logl.c b/lib/msun/ld80/b_logl.c new file mode 100644 index 000000000000..b11eacbe17a1 --- /dev/null +++ b/lib/msun/ld80/b_logl.c @@ -0,0 +1,375 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * See bsdsrc/b_log.c for implementation details. + * + * bsdrc/b_log.c converted to long double by Steven G. Kargl. + */ + +#define N 128 + +/* + * Coefficients in the polynomial approximation of log(1+f/F). + * Domain of x is [0,1./256] with 2**(-84.48) precision. + */ +static const union IEEEl2bits + a1u = LD80C(0xaaaaaaaaaaaaaaab, -4, 8.33333333333333333356e-02L), + a2u = LD80C(0xcccccccccccccd29, -7, 1.25000000000000000781e-02L), + a3u = LD80C(0x9249249241ed3764, -9, 2.23214285711721994134e-03L), + a4u = LD80C(0xe38e959e1e7e01cf, -12, 4.34030476540000360640e-04L); +#define A1 (a1u.e) +#define A2 (a2u.e) +#define A3 (a3u.e) +#define A4 (a4u.e) + +/* + * Table of log(Fj) = logF_head[j] + logF_tail[j], for Fj = 1+j/128. + * Used for generation of extend precision logarithms. + * The constant 35184372088832 is 2^45, so the divide is exact. + * It ensures correct reading of logF_head, even for inaccurate + * decimal-to-binary conversion routines. (Everybody gets the + * right answer for integers less than 2^53.) + * Values for log(F) were generated using error < 10^-57 absolute + * with the bc -l package. + */ + +static double logF_head[N+1] = { + 0., + .007782140442060381246, + .015504186535963526694, + .023167059281547608406, + .030771658666765233647, + .038318864302141264488, + .045809536031242714670, + .053244514518837604555, + .060624621816486978786, + .067950661908525944454, + .075223421237524235039, + .082443669210988446138, + .089612158689760690322, + .096729626458454731618, + .103796793681567578460, + .110814366340264314203, + .117783035656430001836, + .124703478501032805070, + .131576357788617315236, + .138402322859292326029, + .145182009844575077295, + .151916042025732167530, + .158605030176659056451, + .165249572895390883786, + .171850256926518341060, + .178407657472689606947, + .184922338493834104156, + .191394852999565046047, + .197825743329758552135, + .204215541428766300668, + .210564769107350002741, + .216873938300523150246, + .223143551314024080056, + .229374101064877322642, + .235566071312860003672, + .241719936886966024758, + .247836163904594286577, + .253915209980732470285, + .259957524436686071567, + .265963548496984003577, + .271933715484010463114, + .277868451003087102435, + .283768173130738432519, + .289633292582948342896, + .295464212893421063199, + .301261330578199704177, + .307025035294827830512, + .312755710004239517729, + .318453731118097493890, + .324119468654316733591, + .329753286372579168528, + .335355541920762334484, + .340926586970454081892, + .346466767346100823488, + .351976423156884266063, + .357455888922231679316, + .362905493689140712376, + .368325561158599157352, + .373716409793814818840, + .379078352934811846353, + .384411698910298582632, + .389716751140440464951, + .394993808240542421117, + .400243164127459749579, + .405465108107819105498, + .410659924985338875558, + .415827895143593195825, + .420969294644237379543, + .426084395310681429691, + .431173464818130014464, + .436236766774527495726, + .441274560805140936281, + .446287102628048160113, + .451274644139630254358, + .456237433481874177232, + .461175715122408291790, + .466089729924533457960, + .470979715219073113985, + .475845904869856894947, + .480688529345570714212, + .485507815781602403149, + .490303988045525329653, + .495077266798034543171, + .499827869556611403822, + .504556010751912253908, + .509261901790523552335, + .513945751101346104405, + .518607764208354637958, + .523248143765158602036, + .527867089620485785417, + .532464798869114019908, + .537041465897345915436, + .541597282432121573947, + .546132437597407260909, + .550647117952394182793, + .555141507540611200965, + .559615787935399566777, + .564070138285387656651, + .568504735352689749561, + .572919753562018740922, + .577315365035246941260, + .581691739635061821900, + .586049045003164792433, + .590387446602107957005, + .594707107746216934174, + .599008189645246602594, + .603290851438941899687, + .607555250224322662688, + .611801541106615331955, + .616029877215623855590, + .620240409751204424537, + .624433288012369303032, + .628608659422752680256, + .632766669570628437213, + .636907462236194987781, + .641031179420679109171, + .645137961373620782978, + .649227946625615004450, + .653301272011958644725, + .657358072709030238911, + .661398482245203922502, + .665422632544505177065, + .669430653942981734871, + .673422675212350441142, + .677398823590920073911, + .681359224807238206267, + .685304003098281100392, + .689233281238557538017, + .693147180560117703862 +}; + +static double logF_tail[N+1] = { + 0., + -.00000000000000543229938420049, + .00000000000000172745674997061, + -.00000000000001323017818229233, + -.00000000000001154527628289872, + -.00000000000000466529469958300, + .00000000000005148849572685810, + -.00000000000002532168943117445, + -.00000000000005213620639136504, + -.00000000000001819506003016881, + .00000000000006329065958724544, + .00000000000008614512936087814, + -.00000000000007355770219435028, + .00000000000009638067658552277, + .00000000000007598636597194141, + .00000000000002579999128306990, + -.00000000000004654729747598444, + -.00000000000007556920687451336, + .00000000000010195735223708472, + -.00000000000017319034406422306, + -.00000000000007718001336828098, + .00000000000010980754099855238, + -.00000000000002047235780046195, + -.00000000000008372091099235912, + .00000000000014088127937111135, + .00000000000012869017157588257, + .00000000000017788850778198106, + .00000000000006440856150696891, + .00000000000016132822667240822, + -.00000000000007540916511956188, + -.00000000000000036507188831790, + .00000000000009120937249914984, + .00000000000018567570959796010, + -.00000000000003149265065191483, + -.00000000000009309459495196889, + .00000000000017914338601329117, + -.00000000000001302979717330866, + .00000000000023097385217586939, + .00000000000023999540484211737, + .00000000000015393776174455408, + -.00000000000036870428315837678, + .00000000000036920375082080089, + -.00000000000009383417223663699, + .00000000000009433398189512690, + .00000000000041481318704258568, + -.00000000000003792316480209314, + .00000000000008403156304792424, + -.00000000000034262934348285429, + .00000000000043712191957429145, + -.00000000000010475750058776541, + -.00000000000011118671389559323, + .00000000000037549577257259853, + .00000000000013912841212197565, + .00000000000010775743037572640, + .00000000000029391859187648000, + -.00000000000042790509060060774, + .00000000000022774076114039555, + .00000000000010849569622967912, + -.00000000000023073801945705758, + .00000000000015761203773969435, + .00000000000003345710269544082, + -.00000000000041525158063436123, + .00000000000032655698896907146, + -.00000000000044704265010452446, + .00000000000034527647952039772, + -.00000000000007048962392109746, + .00000000000011776978751369214, + -.00000000000010774341461609578, + .00000000000021863343293215910, + .00000000000024132639491333131, + .00000000000039057462209830700, + -.00000000000026570679203560751, + .00000000000037135141919592021, + -.00000000000017166921336082431, + -.00000000000028658285157914353, + -.00000000000023812542263446809, + .00000000000006576659768580062, + -.00000000000028210143846181267, + .00000000000010701931762114254, + .00000000000018119346366441110, + .00000000000009840465278232627, + -.00000000000033149150282752542, + -.00000000000018302857356041668, + -.00000000000016207400156744949, + .00000000000048303314949553201, + -.00000000000071560553172382115, + .00000000000088821239518571855, + -.00000000000030900580513238244, + -.00000000000061076551972851496, + .00000000000035659969663347830, + .00000000000035782396591276383, + -.00000000000046226087001544578, + .00000000000062279762917225156, + .00000000000072838947272065741, + .00000000000026809646615211673, + -.00000000000010960825046059278, + .00000000000002311949383800537, + -.00000000000058469058005299247, + -.00000000000002103748251144494, + -.00000000000023323182945587408, + -.00000000000042333694288141916, + -.00000000000043933937969737844, + .00000000000041341647073835565, + .00000000000006841763641591466, + .00000000000047585534004430641, + .00000000000083679678674757695, + -.00000000000085763734646658640, + .00000000000021913281229340092, + -.00000000000062242842536431148, + -.00000000000010983594325438430, + .00000000000065310431377633651, + -.00000000000047580199021710769, + -.00000000000037854251265457040, + .00000000000040939233218678664, + .00000000000087424383914858291, + .00000000000025218188456842882, + -.00000000000003608131360422557, + -.00000000000050518555924280902, + .00000000000078699403323355317, + -.00000000000067020876961949060, + .00000000000016108575753932458, + .00000000000058527188436251509, + -.00000000000035246757297904791, + -.00000000000018372084495629058, + .00000000000088606689813494916, + .00000000000066486268071468700, + .00000000000063831615170646519, + .00000000000025144230728376072, + -.00000000000017239444525614834 +}; +/* + * Extra precision variant, returning struct {double a, b;}; + * log(x) = a + b to 63 bits, with 'a' rounded to 24 bits. + */ +static struct Double +__log__D(long double x) +{ + int m, j; + long double F, f, g, q, u, v, u1, u2; + struct Double r; + + /* + * Argument reduction: 1 <= g < 2; x/2^m = g; + * y = F*(1 + f/F) for |f| <= 2^-8 + */ + g = frexpl(x, &m); + g *= 2; + m--; + if (m == DBL_MIN_EXP - 1) { + j = ilogbl(g); + m += j; + g = ldexpl(g, -j); + } + j = N * (g - 1) + 0.5L; + F = (1.L / N) * j + 1; + f = g - F; + + g = 1 / (2 * F + f); + u = 2 * f * g; + v = u * u; + q = u * v * (A1 + v * (A2 + v * (A3 + v * A4))); + if (m | j) { + u1 = u + 513; + u1 -= 513; + } else { + u1 = (float)u; + } + u2 = (2 * (f - F * u1) - u1 * f) * g; + + u1 += m * (long double)logF_head[N] + logF_head[j]; + + u2 += logF_tail[j]; + u2 += q; + u2 += logF_tail[N] * m; + r.a = (float)(u1 + u2); /* Only difference is here. */ + r.b = (u1 - r.a) + u2; + return (r); +} diff --git a/lib/msun/ld80/b_tgammal.c b/lib/msun/ld80/b_tgammal.c new file mode 100644 index 000000000000..121248adb1b2 --- /dev/null +++ b/lib/msun/ld80/b_tgammal.c @@ -0,0 +1,419 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * The original code, FreeBSD's old svn r93211, contain the following + * attribution: + * + * This code by P. McIlroy, Oct 1992; + * + * The financial support of UUNET Communications Services is greatfully + * acknowledged. + * + * bsdrc/b_tgamma.c converted to long double by Steven G. Kargl. + */ + +/* + * See bsdsrc/t_tgamma.c for implementation details. + */ + +#include + +#if LDBL_MAX_EXP != 0x4000 +#error "Unsupported long double format" +#endif + +#ifdef __i386__ +#include +#endif + +#include "fpmath.h" +#include "math.h" +#include "math_private.h" + +/* Used in b_log.c and below. */ +struct Double { + long double a; + long double b; +}; + +#include "b_logl.c" +#include "b_expl.c" + +static const double zero = 0.; +static const volatile double tiny = 1e-300; +/* + * x >= 6 + * + * Use the asymptotic approximation (Stirling's formula) adjusted for + * equal-ripples: + * + * log(G(x)) ~= (x-0.5)*(log(x)-1) + 0.5(log(2*pi)-1) + 1/x*P(1/(x*x)) + * + * Keep extra precision in multiplying (x-.5)(log(x)-1), to avoid + * premature round-off. + * + * Accurate to max(ulp(1/128) absolute, 2^-66 relative) error. + */ + +/* + * The following is a decomposition of 0.5 * (log(2*pi) - 1) into the + * first 12 bits in ln2pi_hi and the trailing 64 bits in ln2pi_lo. The + * variables are clearly misnamed. + */ +static const union IEEEl2bits +ln2pi_hiu = LD80C(0xd680000000000000, -2, 4.18945312500000000000e-01L), +ln2pi_lou = LD80C(0xe379b414b596d687, -18, -6.77929532725821967032e-06L); +#define ln2pi_hi (ln2pi_hiu.e) +#define ln2pi_lo (ln2pi_lou.e) + +static const union IEEEl2bits + Pa0u = LD80C(0xaaaaaaaaaaaaaaaa, -4, 8.33333333333333333288e-02L), + Pa1u = LD80C(0xb60b60b60b5fcd59, -9, -2.77777777777776516326e-03L), + Pa2u = LD80C(0xd00d00cffbb47014, -11, 7.93650793635429639018e-04L), + Pa3u = LD80C(0x9c09c07c0805343e, -11, -5.95238087960599252215e-04L), + Pa4u = LD80C(0xdca8d31f8e6e5e8f, -11, 8.41749082509607342883e-04L), + Pa5u = LD80C(0xfb4d4289632f1638, -10, -1.91728055205541624556e-03L), + Pa6u = LD80C(0xd15a4ba04078d3f8, -8, 6.38893788027752396194e-03L), + Pa7u = LD80C(0xe877283110bcad95, -6, -2.83771309846297590312e-02L), + Pa8u = LD80C(0x8da97eed13717af8, -3, 1.38341887683837576925e-01L), + Pa9u = LD80C(0xf093b1c1584e30ce, -2, -4.69876818515470146031e-01L); +#define Pa0 (Pa0u.e) +#define Pa1 (Pa1u.e) +#define Pa2 (Pa2u.e) +#define Pa3 (Pa3u.e) +#define Pa4 (Pa4u.e) +#define Pa5 (Pa5u.e) +#define Pa6 (Pa6u.e) +#define Pa7 (Pa7u.e) +#define Pa8 (Pa8u.e) +#define Pa9 (Pa9u.e) + +static struct Double +large_gam(long double x) +{ + long double p, z, thi, tlo, xhi, xlo; + long double logx; + struct Double u; + + z = 1 / (x * x); + p = Pa0 + z * (Pa1 + z * (Pa2 + z * (Pa3 + z * (Pa4 + z * (Pa5 + + z * (Pa6 + z * (Pa7 + z * (Pa8 + z * Pa9)))))))); + p = p / x; + + u = __log__D(x); + u.a -= 1; + + /* Split (x - 0.5) in high and low parts. */ + x -= 0.5L; + xhi = (float)x; + xlo = x - xhi; + + /* Compute t = (x-.5)*(log(x)-1) in extra precision. */ + thi = xhi * u.a; + tlo = xlo * u.a + x * u.b; + + /* Compute thi + tlo + ln2pi_hi + ln2pi_lo + p. */ + tlo += ln2pi_lo; + tlo += p; + u.a = ln2pi_hi + tlo; + u.a += thi; + u.b = thi - u.a; + u.b += ln2pi_hi; + u.b += tlo; + return (u); +} +/* + * Rational approximation, A0 + x * x * P(x) / Q(x), on the interval + * [1.066.., 2.066..] accurate to 4.25e-19. + * + * Returns r.a + r.b = a0 + (z + c)^2 * p / q, with r.a truncated. + */ +static const union IEEEl2bits + a0_hiu = LD80C(0xe2b6e4153a57746c, -1, 8.85603194410888700265e-01L), + a0_lou = LD80C(0x851566d40f32c76d, -66, 1.40907742727049706207e-20L); +#define a0_hi (a0_hiu.e) +#define a0_lo (a0_lou.e) + +static const union IEEEl2bits +P0u = LD80C(0xdb629fb9bbdc1c1d, -2, 4.28486815855585429733e-01L), +P1u = LD80C(0xe6f4f9f5641aa6be, -3, 2.25543885805587730552e-01L), +P2u = LD80C(0xead1bd99fdaf7cc1, -6, 2.86644652514293482381e-02L), +P3u = LD80C(0x9ccc8b25838ab1e0, -8, 4.78512567772456362048e-03L), +P4u = LD80C(0x8f0c4383ef9ce72a, -9, 2.18273781132301146458e-03L), +P5u = LD80C(0xe732ab2c0a2778da, -13, 2.20487522485636008928e-04L), +P6u = LD80C(0xce70b27ca822b297, -16, 2.46095923774929264284e-05L), +P7u = LD80C(0xa309e2e16fb63663, -19, 2.42946473022376182921e-06L), +P8u = LD80C(0xaf9c110efb2c633d, -23, 1.63549217667765869987e-07L), +Q1u = LD80C(0xd4d7422719f48f15, -1, 8.31409582658993993626e-01L), +Q2u = LD80C(0xe13138ea404f1268, -5, -5.49785826915643198508e-02L), +Q3u = LD80C(0xd1c6cc91989352c0, -4, -1.02429960435139887683e-01L), +Q4u = LD80C(0xa7e9435a84445579, -7, 1.02484853505908820524e-02L), +Q5u = LD80C(0x83c7c34db89b7bda, -8, 4.02161632832052872697e-03L), +Q6u = LD80C(0xbed06bf6e1c14e5b, -11, -7.27898206351223022157e-04L), +Q7u = LD80C(0xef05bf841d4504c0, -18, 7.12342421869453515194e-06L), +Q8u = LD80C(0xf348d08a1ff53cb1, -19, 3.62522053809474067060e-06L); +#define P0 (P0u.e) +#define P1 (P1u.e) +#define P2 (P2u.e) +#define P3 (P3u.e) +#define P4 (P4u.e) +#define P5 (P5u.e) +#define P6 (P6u.e) +#define P7 (P7u.e) +#define P8 (P8u.e) +#define Q1 (Q1u.e) +#define Q2 (Q2u.e) +#define Q3 (Q3u.e) +#define Q4 (Q4u.e) +#define Q5 (Q5u.e) +#define Q6 (Q6u.e) +#define Q7 (Q7u.e) +#define Q8 (Q8u.e) + +static struct Double +ratfun_gam(long double z, long double c) +{ + long double p, q, thi, tlo; + struct Double r; + + q = 1 + z * (Q1 + z * (Q2 + z * (Q3 + z * (Q4 + z * (Q5 + + z * (Q6 + z * (Q7 + z * Q8))))))); + p = P0 + z * (P1 + z * (P2 + z * (P3 + z * (P4 + z * (P5 + + z * (P6 + z * (P7 + z * P8))))))); + p = p / q; + + /* Split z into high and low parts. */ + thi = (float)z; + tlo = (z - thi) + c; + tlo *= (thi + z); + + /* Split (z+c)^2 into high and low parts. */ + thi *= thi; + q = thi; + thi = (float)thi; + tlo += (q - thi); + + /* Split p/q into high and low parts. */ + r.a = (float)p; + r.b = p - r.a; + + tlo = tlo * p + thi * r.b + a0_lo; + thi *= r.a; /* t = (z+c)^2*(P/Q) */ + r.a = (float)(thi + a0_hi); + r.b = ((a0_hi - r.a) + thi) + tlo; + return (r); /* r = a0 + t */ +} +/* + * x < 6 + * + * Use argument reduction G(x+1) = xG(x) to reach the range [1.066124, + * 2.066124]. Use a rational approximation centered at the minimum + * (x0+1) to ensure monotonicity. + * + * Good to < 1 ulp. (provably .90 ulp; .87 ulp on 1,000,000 runs.) + * It also has correct monotonicity. + */ +static const union IEEEl2bits + xm1u = LD80C(0xec5b0c6ad7c7edc3, -2, 4.61632144968362341254e-01L); +#define x0 (xm1u.e) + +static const double + left = -0.3955078125; /* left boundary for rat. approx */ + +static long double +small_gam(long double x) +{ + long double t, y, ym1; + struct Double yy, r; + + y = x - 1; + + if (y <= 1 + (left + x0)) { + yy = ratfun_gam(y - x0, 0); + return (yy.a + yy.b); + } + + r.a = (float)y; + yy.a = r.a - 1; + y = y - 1 ; + r.b = yy.b = y - yy.a; + + /* Argument reduction: G(x+1) = x*G(x) */ + for (ym1 = y - 1; ym1 > left + x0; y = ym1--, yy.a--) { + t = r.a * yy.a; + r.b = r.a * yy.b + y * r.b; + r.a = (float)t; + r.b += (t - r.a); + } + + /* Return r*tgamma(y). */ + yy = ratfun_gam(y - x0, 0); + y = r.b * (yy.a + yy.b) + r.a * yy.b; + y += yy.a * r.a; + return (y); +} +/* + * Good on (0, 1+x0+left]. Accurate to 1 ulp. + */ +static long double +smaller_gam(long double x) +{ + long double d, rhi, rlo, t, xhi, xlo; + struct Double r; + + if (x < x0 + left) { + t = (float)x; + d = (t + x) * (x - t); + t *= t; + xhi = (float)(t + x); + xlo = x - xhi; + xlo += t; + xlo += d; + t = 1 - x0; + t += x; + d = 1 - x0; + d -= t; + d += x; + x = xhi + xlo; + } else { + xhi = (float)x; + xlo = x - xhi; + t = x - x0; + d = - x0 - t; + d += x; + } + + r = ratfun_gam(t, d); + d = (float)(r.a / x); + r.a -= d * xhi; + r.a -= d * xlo; + r.a += r.b; + + return (d + r.a / x); +} +/* + * x < 0 + * + * Use reflection formula, G(x) = pi/(sin(pi*x)*x*G(x)). + * At negative integers, return NaN and raise invalid. + */ +static const union IEEEl2bits +piu = LD80C(0xc90fdaa22168c235, 1, 3.14159265358979323851e+00L); +#define pi (piu.e) + +static long double +neg_gam(long double x) +{ + int sgn = 1; + struct Double lg, lsine; + long double y, z; + + y = ceill(x); + if (y == x) /* Negative integer. */ + return ((x - x) / zero); + + z = y - x; + if (z > 0.5) + z = 1 - z; + + y = y / 2; + if (y == ceill(y)) + sgn = -1; + + if (z < 0.25) + z = sinpil(z); + else + z = cospil(0.5 - z); + + /* Special case: G(1-x) = Inf; G(x) may be nonzero. */ + if (x < -1753) { + + if (x < -1760) + return (sgn * tiny * tiny); + y = expl(lgammal(x) / 2); + y *= y; + return (sgn < 0 ? -y : y); + } + + + y = 1 - x; + if (1 - y == x) + y = tgammal(y); + else /* 1-x is inexact */ + y = - x * tgammal(-x); + + if (sgn < 0) y = -y; + return (pi / (y * z)); +} +/* + * xmax comes from lgamma(xmax) - emax * log(2) = 0. + * static const float xmax = 35.040095f + * static const double xmax = 171.624376956302725; + * ld80: LD80C(0xdb718c066b352e20, 10, 1.75554834290446291689e+03L), + * ld128: 1.75554834290446291700388921607020320e+03L, + * + * iota is a sloppy threshold to isolate x = 0. + */ +static const double xmax = 1755.54834290446291689; +static const double iota = 0x1p-116; + +long double +tgammal(long double x) +{ + struct Double u; + + ENTERI(); + + if (x >= 6) { + if (x > xmax) + RETURNI(x / zero); + u = large_gam(x); + RETURNI(__exp__D(u.a, u.b)); + } + + if (x >= 1 + left + x0) + RETURNI(small_gam(x)); + + if (x > iota) + RETURNI(smaller_gam(x)); + + if (x > -iota) { + if (x != 0) + u.a = 1 - tiny; /* raise inexact */ + RETURNI(1 / x); + } + + if (!isfinite(x)) + RETURNI(x - x); /* x is NaN or -Inf */ + *** 2 LINES SKIPPED *** From nobody Wed Jul 26 23:52:47 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 4RB9gh0gYMz4pBfN; Wed, 26 Jul 2023 23:52:48 +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 4RB9gg6vL6z4KD9; Wed, 26 Jul 2023 23:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415568; 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=H82VRED1YqrRBLX06BSEGOKmwopQ7FPyEGDkH1kgKhE=; b=snqRB6s9PvLTlFj3jvqOuUH6A+u7O/guj7lerLrGq9pd8kTHEMm19+4a70AO3e1mO2Fkwn qbe0W4Zvbc5hDW9tvaSHyBGo2u9u9Qu07CACr3NSeApI8hNBH4kjImYo2pNdQGL6hHkoDW 9u+R9y4DGt4q13XHpjHpoIcwIYzGin4b2ZEDdP4BPXYC/m/v6zy5FUAwb01yQoWyCGUA9C OF/dVCmy3XGOO3hUmRh2fGEVb43tf25SH3hTsXcTXZfHFekjcofLzdRmaZctjclvp/PLhQ d3URN/HcCnzRHXmDfNELGmtSSCLfQvQEnztfEPSJIK2lZ3eLlXtq74Hdxy3vMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690415568; 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=H82VRED1YqrRBLX06BSEGOKmwopQ7FPyEGDkH1kgKhE=; b=NWB6RjEozM/TvYQX0Ppr5RkBKkDG5pLZTgWcfsAJ2bKXJpPyhcbwv5Uno+TRZNfy4wxnna rjjL6Y151wu8bwl8QqOuFyHn7UY+VmQwvWwya00QPD6AG/0K+CLCdLr35tNOR52yqhJwIb 9UzEszYAKrLn9HQTCZQffFHnlLkwhca01J7brDSqLY9tQlw4E7wdlrUvr35fIEAP8kfw7/ Ab3zuoOtn7lUtKLwAQ237SSX1SWFIl2QrmfgZWb46MP4+/xOITBd9ivTYpkW9aCM+1+qBO gqZftycX2eHkBoGjGycTPQCSOsBc8jNfglQMvPocaLfZY5dw5+qXp8w3SsRe7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690415568; a=rsa-sha256; cv=none; b=p3DJheYAYi2dC+q0gEwRLcanrifU8lsyL+5F3oTvRw3XT26po554gOxBn77bQMkkDrIPvc JbCIutMW46WyBX5uCT7+QfuzQYbKkv3XeBcSvrtjESRQDz90OO75UyAtidpK2H7kQBSkSW mY7++D9E3RyIU8d1ybSZgqhUz+TlfowtOyELfzxwnqDBeFgVwsZ5nDbfl4hMjJa8w7NCMP IDVsUOWsb+wTAwlXvyMvJPu5u5IBlbFKGmaxOdu88FA+Zip9YxUmaevBIHAsIlZOC7GF8x 9nDjA5VhoBIlHT0N3RGq85DAQQej40T0B3GGx0NxedLa5aIY5X027LQiHiF60g== 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 4RB9gg5ynrz1376; Wed, 26 Jul 2023 23:52:47 +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 36QNqlDJ064371; Wed, 26 Jul 2023 23:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QNqlp0064370; Wed, 26 Jul 2023 23:52:47 GMT (envelope-from git) Date: Wed, 26 Jul 2023 23:52:47 GMT Message-Id: <202307262352.36QNqlp0064370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8885768c5ffe - stable/13 - msun: Add copyright notices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8885768c5ffe637386a4b579b23981e34aa03ec8 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8885768c5ffe637386a4b579b23981e34aa03ec8 commit 8885768c5ffe637386a4b579b23981e34aa03ec8 Author: Warner Losh AuthorDate: 2021-10-23 04:00:54 +0000 Commit: Ed Maste CommitDate: 2023-07-26 23:52:17 +0000 msun: Add copyright notices These files were copied from MUSL. Add the standard copyright notice and SPDX-License-Identifier: MIT consistent with our new draft license policy. It reads word for word the same as the MIT license on the SPDX web site. Add a pointer to the MUSL COPYIRGHT file which contains a list of all authors of MUSL. Sponsored by: Netflix Noticed by: Steve Kargl (cherry picked from commit 3550a49f6814af38c21b0033ef8746953451dade) --- lib/msun/src/s_scalbn.c | 8 ++++++++ lib/msun/src/s_scalbnf.c | 8 ++++++++ lib/msun/src/s_scalbnl.c | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c index 3de663f8b670..2d4f7a3c6164 100644 --- a/lib/msun/src/s_scalbn.c +++ b/lib/msun/src/s_scalbn.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2005-2020 Rich Felker, et al. + * + * SPDX-License-Identifier: MIT + * + * Please see https://git.musl-libc.org/cgit/musl/tree/COPYRIGHT + * for all contributors to musl. + */ #include #include #include diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c index 3a46470b5661..8cf1e01150da 100644 --- a/lib/msun/src/s_scalbnf.c +++ b/lib/msun/src/s_scalbnf.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2005-2020 Rich Felker, et al. + * + * SPDX-License-Identifier: MIT + * + * Please see https://git.musl-libc.org/cgit/musl/tree/COPYRIGHT + * for all contributors to musl. + */ #include #include diff --git a/lib/msun/src/s_scalbnl.c b/lib/msun/src/s_scalbnl.c index a79f79b33480..6044c1b1d4f7 100644 --- a/lib/msun/src/s_scalbnl.c +++ b/lib/msun/src/s_scalbnl.c @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2005-2020 Rich Felker, et al. + * + * SPDX-License-Identifier: MIT + * + * Please see https://git.musl-libc.org/cgit/musl/tree/COPYRIGHT + * for all contributors to musl. + */ #include #include #include "math_private.h" From nobody Thu Jul 27 17:11:22 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 4RBck25FDMz4pZxn; Thu, 27 Jul 2023 17:11: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 4RBck24mrDz3Lk9; Thu, 27 Jul 2023 17:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690477882; 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=PM17g7+VyNYlXk+kpUm1EAAqDUmdEu7HyTMEPC3Un34=; b=fgay3JBrazrju555wpQD+yCjc+cv766zxsS27IcfZC3XMwkP4xgSuQlmDojlq3Fr3KzTnS PmffZ6ZdfWT6UROrhxSolhLLUl/wlLSVTPD/Vrq2cyDYNKHVZlaVxyluhplYMuNGo2ygNZ vYbAD+/MJX14EY2xqOV1h7yE4GfOG080o/QVOFSkdTqb8vkuZBFFnmdZJzu48x4PtOABYF S1fITNg5tldepkUVyOt3VZo2/2x2yN4u/C5BpX86cSahk696piFMoR2tebANcY6hRQQ3v/ 5qxaMXbN09Bf0hLva3+C544mZTlqRhvoYLok90iEqvsE++xwYOJOTcAJ69ivcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690477882; 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=PM17g7+VyNYlXk+kpUm1EAAqDUmdEu7HyTMEPC3Un34=; b=Fsgwn2DXyYN5u5sAYUuOcSKsCPVXsMtRm958m4ErEnhShs+pOas/rt82QCfJWWEDAWio5C lPAlzcpruZ7oyhxQS41YcW7SXY7vL8tn497d9sFfDF58R0rRVATXqEj89Venwh9OHp1Dlg znlPbOgzS33sZLy3CA2eNblmaZKbI7NMZCqxekFnWuOroMTxVy2/haWESiILdo5XkF15d3 NYvb0ZpimjOYVXbPT2ekqf6UeMUgXMcpPL8fL/vekFND2grOZQ4fxeHToBDWUXa1iEbZot 5McfbAPq7lVuRShrswwRcfJwovJQkKU5HMzjaxS8psyxhDeGm1KOvYRX12G+rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690477882; a=rsa-sha256; cv=none; b=InBqE4Vyg+xgkcO7tsnGl8gTMT+t18qCncTgBPpjG9FBgboz+8haXxoc/SX4R4K756eQtd JCxJWW7b8FYs5NIXoivH/NOkqbmHHBZsOGTf7ZuVOsfYp7za1vNNRJf7xdNBTSmiJkb0BM irGqLcOB/ynD99x8Gqig0OFKoWyPrNim4DhD7pvbvQlaMW0Oc4XKfwZhtDmfOhipBePqF+ MJTPygC0v6jQeiz6a9HCbEiY67JUDc77iuM8YvAL8+jJAbs9aj9jdnshOqbVOCPDWN4PZX 4nXzRAoesOxYXLcZjvMpolq+XcDhFmHfZcMg7NkByUjoIWt62a5GtM/m4b9Idg== 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 4RBck23szGzJ9X; Thu, 27 Jul 2023 17:11:22 +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 36RHBMfA082858; Thu, 27 Jul 2023 17:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RHBMW8082857; Thu, 27 Jul 2023 17:11:22 GMT (envelope-from git) Date: Thu, 27 Jul 2023 17:11:22 GMT Message-Id: <202307271711.36RHBMW8082857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f629a82680ea - stable/13 - Fix cross-builds from macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f629a82680ea9abbd646e43bdc684ed3fb49eaff Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f629a82680ea9abbd646e43bdc684ed3fb49eaff commit f629a82680ea9abbd646e43bdc684ed3fb49eaff Author: Ed Maste AuthorDate: 2022-06-26 17:23:39 +0000 Commit: Ed Maste CommitDate: 2023-07-27 17:10:23 +0000 Fix cross-builds from macOS The macOS linker does not support -zrelro/-znorelro. Since it is only used to for build tools that run on the host, and WITH_RELRO or WITHOUT_RELRO does not matter there, just skip the option. Reviewed by: markj Fixes: 2f3a961487c9 ("Add RELRO build knob, default to enabled") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35589 (cherry picked from commit 7927452ac4e98309bd832d55526cc98438fba8a5) --- share/mk/bsd.lib.mk | 2 ++ share/mk/bsd.prog.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 5cd5663e1ca7..900bc00f0f03 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -77,11 +77,13 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif +.if ${LINKER_TYPE} != "macos" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else LDFLAGS+= -Wl,-zrelro .endif +.endif .if ${MK_RETPOLINE} != "no" .if ${COMPILER_FEATURES:Mretpoline} && ${LINKER_FEATURES:Mretpoline} CFLAGS+= -mretpoline diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3b9b3277a241..d044fed0aeb7 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -41,11 +41,13 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif +.if ${LINKER_TYPE} != "macos" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else LDFLAGS+= -Wl,-zrelro .endif +.endif .if ${MK_PIE} != "no" # Static PIE is not yet supported/tested. .if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" From nobody Thu Jul 27 17:11:23 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 4RBck36NrXz4pZgb; Thu, 27 Jul 2023 17:11:23 +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 4RBck35RNzz3M6x; Thu, 27 Jul 2023 17:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690477883; 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=/4AgFx0MbSQ4v54a5UaKl/7rL3eu/F6JZUqxZFQ7t04=; b=sq/zhA4rsPl36wQqIsX+93jTE+cBg+gNYP/FMrNFnY+ugPCpMPhch+/LSlkPLuZPJ7Cncp K8UfMZpnMLzeHjYsnUYtD+J4tS9Zv9DTW3+Zl4PPAGW47ZqrgtQX2wtkDxT0l/PswNNp+s TclEjsNh0iMBO12Zc9GfvCSt7g0lM/nnauza3gAaQEJMKFgjDho2O09oiWHXhINBd8O/Fn klmE/p8y4gzer6DX+kGyHB9gh/1l8rn9tlp5iWlR3i/RdDVSHTYPftGh9HnGYhiLAx1raq sR3kX8oEyEqCRyoQWOnL9QQ4psffOpzZZUVwBod5xhdkP8/YXLQG4E9L/ssXqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690477883; 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=/4AgFx0MbSQ4v54a5UaKl/7rL3eu/F6JZUqxZFQ7t04=; b=dAV7mcqSiIsgnxxheDa07W9Qmj5Y7U1palDLq5l3uPOCMvuD+RoW6GG3XTWy0CVTT2MOix rRv2u5pAMVCDa+GDx9lYj6ZiMNWGPhlMuypP9Cj2Va559pRJjYaCESjPS7B1SYL2GMczN1 ilwqu02CtEkkQpe5T36G5NNHi9j3eXGHlKWLJdpqp+n1L8gzTci/xUBMJWynxL1OldHPHt HrY6c5ny+JKP3KhW3Bh2eg+CqGScQntiIuFTur6VT9hZVF1d+7ItuZK/e0WOzInN8Whcud L6BFT1AAZ6FBRXfQ6VtSTw/aECsp++96zNDuxDbQrLeurLVyvgaLsCPXLi6WkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690477883; a=rsa-sha256; cv=none; b=Bae4EXD85RXc5RxiRcpUhTpx+mCY3AiKJuwoiR3EL2bVJ36B3tgN39zIZ1HFTRlaBiygfr rC9AN/DUe2N6eoJHAu5MGBLapWWT2cl5c23ZBDzhmI4HP4DtGuQ3BsIlbhv57HlO5jBHUS T+V55u8A9MJN79bBhEx4o4vowZKMp3FVwpsF+PF1JPn0sKPHZYZPWfV1JUytBwQWKz2qfx LuuqJRUicdIma89lF3AICskUptwij+1qZy8EmN3pioc433+pgEMncFx1cv0LZaThOdplk0 QY2EPfBU1oV4AiXG3lhu+E/YoNRX+i4Igj3s+CYFs9AI96stW7hOR+U+OaLL0Q== 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 4RBck34X5nzJDS; Thu, 27 Jul 2023 17:11:23 +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 36RHBNpB082877; Thu, 27 Jul 2023 17:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RHBNw0082876; Thu, 27 Jul 2023 17:11:23 GMT (envelope-from git) Date: Thu, 27 Jul 2023 17:11:23 GMT Message-Id: <202307271711.36RHBNw0082876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 37357e697d18 - stable/13 - msun: Fix typo in math_private.h comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37357e697d18ef53fbfb8c3dc6c762dc5dd78245 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=37357e697d18ef53fbfb8c3dc6c762dc5dd78245 commit 37357e697d18ef53fbfb8c3dc6c762dc5dd78245 Author: Steve Kargl AuthorDate: 2023-07-26 18:21:44 +0000 Commit: Ed Maste CommitDate: 2023-07-27 17:10:31 +0000 msun: Fix typo in math_private.h comment PR: 272738 MFC after: 3 days (cherry picked from commit f2c94ddd0ad79d972b6a707978cc09f3a8a6dbbf) --- lib/msun/src/math_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 20ce7bd88464..33f790c13a6b 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -624,7 +624,7 @@ rnintf(__float_t x) * The complications for extra precision are smaller for rnintl() since it * can safely assume that the rounding precision has been increased from * its default to FP_PE on x86. We don't exploit that here to get small - * optimizations from limiting the rangle to double. We just need it for + * optimizations from limiting the range to double. We just need it for * the magic number to work with long doubles. ld128 callers should use * rnint() instead of this if possible. ld80 callers should prefer * rnintl() since for amd64 this avoids swapping the register set, while From nobody Thu Jul 27 18:34:17 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 4RBfYj3HCnz4pJ1J; Thu, 27 Jul 2023 18:34:17 +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 4RBfYj2jlNz4B7c; Thu, 27 Jul 2023 18:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690482857; 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=HwJAizWJjcpWpK+2WQZqZ/dwDtPtiOAocv3AM7IH6Es=; b=gbsEoVcctXqq2c2qxiv37A4tAZYtL0rHPjqL64+qyAbTfCvodGDp8ePSd1nAiZ49JWGwqn CqEuitCWCYbYKBP/10+6KqAU9Cc2u4k48sZKMxhQ6ZsGHazbpYhYtztYAOiqF98DMRTJ4e j6BnjiZnid/fdMdgFzrS4jA4mrptTn81TlfRoqJ5rXSxmvQ1FQre7rptmgekgfV6pLD90y 0fQAuGramVqJOX/QyMKNoiTXHe+tgsJZydH29HS8QBfTyO64wZMbtFs7NUeVcovl7tmBYt wV9BGpnhC4owzVayX/tsQtMVqsPANwwS3y2zbNxu2+dUlAKpQQxt1Q1FjCgBng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690482857; 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=HwJAizWJjcpWpK+2WQZqZ/dwDtPtiOAocv3AM7IH6Es=; b=dgcqs+ohSNBRiMILEghTyIZOLEq4nFBWd5Frb7icslUrsHISQVDlYEW8VWRObP4/sJ7yQw UfBAH5pDG/EVCL2FtjXhqRBAzTpnquHlFailhqBtYa6r7F7kt+9Zn04zlbWow004KIZ8Id IEhRPVIROwURA3EsvwNXRdlly7cTwCHc34NAqtyInbgxCwpRA5z9wpG4O+vTo5dMbvumA8 e9r+tn5kqIj8sLoSVRsS7qPS56mZQ9FW8slTo2INWzrZv661F3QMjdi2GMnzPHwb3EHx5q 3C5W7GtxBRilrxxdpWF91ST0FoVp8MsksFUWMbXkDQYoSOXm4RZne2gSO8QXbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690482857; a=rsa-sha256; cv=none; b=vHayY/YGjGX+fICON1Dt1z3qA0VeMCwX0LuCLfq1n1EqtvucAoW1KKJmgP0fw8CC2vUgec rbFoxTB23mURgByqOjyaMhp/rgnj0R19h8jkhoY+0qxrQkQAEUcMkvCyZkyUo2W17Exs4D 8/7mltvniVy0cikgCuOJxJ1l0dA4ki9GqvoaVHhToOoF8Cd50wxSbcEOaxnKNJxSE2F67I LWf4DW0JadV3qIO79lj6Whg06VPgn63pC4TgxvgiJ8PIVPPiEwp+SieP9A7F2PPSa+9Zuc 1opUmigC8iZ1qyFu1f0TDfzH8pCwCSMj/Thkt/r+Ygkp/49pCrHAMnWrO1tGZw== 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 4RBfYj1q5czL7X; Thu, 27 Jul 2023 18:34:17 +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 36RIYHpV022087; Thu, 27 Jul 2023 18:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RIYHqW022086; Thu, 27 Jul 2023 18:34:17 GMT (envelope-from git) Date: Thu, 27 Jul 2023 18:34:17 GMT Message-Id: <202307271834.36RIYHqW022086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3cde8fbf97f1 - stable/13 - Really fix cross-builds from macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cde8fbf97f139b99b38c6774042431b2d3be15a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3cde8fbf97f139b99b38c6774042431b2d3be15a commit 3cde8fbf97f139b99b38c6774042431b2d3be15a Author: Jessica Clarke AuthorDate: 2022-06-30 21:08:31 +0000 Commit: Ed Maste CommitDate: 2023-07-27 18:33:59 +0000 Really fix cross-builds from macOS LINKER_TYPE is set to mac not macos on macOS. Fixes: 7927452ac4e9 ("Add RELRO build knob, default to enabled") (cherry picked from commit 4ca6ecf100733ecd61f32257452690c56a6b6a3e) --- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 900bc00f0f03..d16ea6967b23 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -77,7 +77,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${LINKER_TYPE} != "macos" +.if ${LINKER_TYPE} != "mac" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index d044fed0aeb7..fd44a5b40c8d 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -41,7 +41,7 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${LINKER_TYPE} != "macos" +.if ${LINKER_TYPE} != "mac" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else From nobody Thu Jul 27 21:53:44 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 4RBkzr5JRlz4ppHm; Thu, 27 Jul 2023 21:53:44 +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 4RBkzr28dQz4N0s; Thu, 27 Jul 2023 21:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690494824; 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=+eWdIwnKTgJa0Ub55rMa+d6+9jSozXmW88/9pWiLMRI=; b=SwgdmhXI6kNq5AWM8IcneprPGeR/12HHdVX30HhKCtWsrjJEoUzVDjXckcdMYijwnNimPH xqt7hBQco/jGxxgowrNA3zqGKpZUxSbJMfgDXupLW1j0eAZjop9auNdsv6JqQf2D7DmOK3 HC7/6yNrvV/V8TuxPiUJubSR4aXcCzY0NHH1wt8OMaI1xpjhUuGraETTDu8PnjcV+ksNaw 0h/cMRpAII1poAF1LAIE+wUXJ27ac6fD4xzajjLsrSAM42SYO6v18w9a6r6TTa8gjutTaX d4OR68EyNEPGYX3We/AdW/3TMOtAjsTfndW2U4QeEmI5sGO7xUmyR1Ex3gyI5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690494824; 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=+eWdIwnKTgJa0Ub55rMa+d6+9jSozXmW88/9pWiLMRI=; b=DezG6q14g3nE+pxkTTvp1NZo/YLylzsjNxLcRje3cGGfw6V4URtCLSWQghiO/AN7V+4kD/ 2+9g6mp2Z89bfL2jk/UakjmcAzi+BEVrP6flMGUl/bypNkRXYU6yoUFnQk55cSzGq7Tsl8 rHK2Bed8v+pM6vwl33Fk0MHVtDbM9ei5UDNiVJxf/ZM049UVuWbFubvaXpxDn8IscS7jGY 07wA4KNqhv4h0l60mpdNk+L3Vb7ufXM4605XjahzbBya52RKzjGnmg7u7K12VjcORGEaZe 3effC3B2BGy19SvNI67E6rLBQQv+/Mwd2ol+xf1XiePRaMqjsXUY0bIoPU+kKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690494824; a=rsa-sha256; cv=none; b=ts+UeMAnrdTJaWXAQXHYy4JNJXYYCTJ+BHvpqds573u7ru7lnxasYBhMek8coa1b1f0oj3 jmdSHcpFZZiF0cIngUqUWkivnCjj4tG+YQ8g/lrR8+VGY8nrc787IN4Zubg0/15bZuyRBW HnR8YsR8S67KUXS100YgrSHwUurxW1HzJkXttjG+m013x64u9t3VTftQA2NufCtW4rjVpI OiwGGoXWvxfuwov6R6pFKVrf4Pzc3/4eA3niSXbVRJLo8RILcJU7LHQnecmSNmW4oCk6u3 b2ZzT7Qwc3GNr/cFi0L8IFpdI3v69LS7qzUzXudtRrA+Spj4filVfD/cIuSEVg== 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 4RBkzr1F1GzR2V; Thu, 27 Jul 2023 21:53:44 +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 36RLriFx052707; Thu, 27 Jul 2023 21:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RLriUW052706; Thu, 27 Jul 2023 21:53:44 GMT (envelope-from git) Date: Thu, 27 Jul 2023 21:53:44 GMT Message-Id: <202307272153.36RLriUW052706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: e30d990e1a6f - stable/13 - ixl: port ice's atomic API to ixl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e30d990e1a6fbbed11bfbfa9b130d7a41f28ee8c Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=e30d990e1a6fbbed11bfbfa9b130d7a41f28ee8c commit e30d990e1a6fbbed11bfbfa9b130d7a41f28ee8c Author: Piotr Kubaj AuthorDate: 2023-06-06 15:30:18 +0000 Commit: Eric Joyner CommitDate: 2023-07-27 21:48:34 +0000 ixl: port ice's atomic API to ixl Differential Revision: https://reviews.freebsd.org/D40532 Approved by: erj (cherry picked from commit b8f51b8c5423af0795429836a00f2a968e791f6e) --- sys/dev/ixl/if_ixl.c | 21 +++++----- sys/dev/ixl/ixl_pf.h | 34 +++++++++------- sys/dev/ixl/ixl_pf_iflib.c | 16 ++++---- sys/dev/ixl/ixl_pf_main.c | 98 ++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 118 insertions(+), 51 deletions(-) diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index 985843d546fa..65f6a400569c 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -602,14 +602,14 @@ ixl_if_attach_pre(if_ctx_t ctx) if (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 3)) || (pf->hw.aq.fw_maj_ver < 4)) { i40e_aq_stop_lldp(hw, true, false, NULL); - pf->state |= IXL_PF_STATE_FW_LLDP_DISABLED; + ixl_set_state(&pf->state, IXL_STATE_FW_LLDP_DISABLED); } /* Try enabling Energy Efficient Ethernet (EEE) mode */ if (i40e_enable_eee(hw, true) == I40E_SUCCESS) - atomic_set_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + ixl_set_state(&pf->state, IXL_STATE_EEE_ENABLED); else - atomic_clear_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + ixl_clear_state(&pf->state, IXL_STATE_EEE_ENABLED); /* Get MAC addresses from hardware */ i40e_get_mac_addr(hw, hw->mac.addr); @@ -634,11 +634,11 @@ ixl_if_attach_pre(if_ctx_t ctx) /* Query device FW LLDP status */ if (i40e_get_fw_lldp_status(hw, &lldp_status) == I40E_SUCCESS) { if (lldp_status == I40E_GET_FW_LLDP_STATUS_DISABLED) { - atomic_set_32(&pf->state, - IXL_PF_STATE_FW_LLDP_DISABLED); + ixl_set_state(&pf->state, + IXL_STATE_FW_LLDP_DISABLED); } else { - atomic_clear_32(&pf->state, - IXL_PF_STATE_FW_LLDP_DISABLED); + ixl_clear_state(&pf->state, + IXL_STATE_FW_LLDP_DISABLED); } } @@ -777,7 +777,7 @@ ixl_if_attach_post(if_ctx_t ctx) * Driver may have been reloaded. Ensure that the link state * is consistent with current settings. */ - ixl_set_link(pf, (pf->state & IXL_PF_STATE_LINK_ACTIVE_ON_DOWN) != 0); + ixl_set_link(pf, ixl_test_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN)); hw->phy.get_link_info = true; i40e_get_link_status(hw, &pf->link_up); @@ -1037,8 +1037,7 @@ ixl_if_stop(if_ctx_t ctx) * e.g. on MTU change. */ if ((if_getflags(ifp) & IFF_UP) == 0 && - (atomic_load_acq_32(&pf->state) & - IXL_PF_STATE_LINK_ACTIVE_ON_DOWN) == 0) + !ixl_test_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN)) ixl_set_link(pf, false); } @@ -1419,7 +1418,7 @@ ixl_if_update_admin_status(if_ctx_t ctx) if (!i40e_check_asq_alive(&pf->hw)) return; - if (pf->state & IXL_PF_STATE_MDD_PENDING) + if (ixl_test_state(&pf->state, IXL_STATE_MDD_PENDING)) ixl_handle_mdd_event(pf); ixl_process_adminq(pf, &pending); diff --git a/sys/dev/ixl/ixl_pf.h b/sys/dev/ixl/ixl_pf.h index 888949245133..6a73f5acc838 100644 --- a/sys/dev/ixl/ixl_pf.h +++ b/sys/dev/ixl/ixl_pf.h @@ -76,26 +76,26 @@ enum ixl_i2c_access_method_t { }; /* Used in struct ixl_pf's state field */ -enum ixl_pf_state { - IXL_PF_STATE_RECOVERY_MODE = (1 << 0), - IXL_PF_STATE_RESETTING = (1 << 1), - IXL_PF_STATE_MDD_PENDING = (1 << 2), - IXL_PF_STATE_PF_RESET_REQ = (1 << 3), - IXL_PF_STATE_VF_RESET_REQ = (1 << 4), - IXL_PF_STATE_PF_CRIT_ERR = (1 << 5), - IXL_PF_STATE_CORE_RESET_REQ = (1 << 6), - IXL_PF_STATE_GLOB_RESET_REQ = (1 << 7), - IXL_PF_STATE_EMP_RESET_REQ = (1 << 8), - IXL_PF_STATE_FW_LLDP_DISABLED = (1 << 9), - IXL_PF_STATE_EEE_ENABLED = (1 << 10), - IXL_PF_STATE_LINK_ACTIVE_ON_DOWN = (1 << 11), +enum ixl_state { + IXL_STATE_RECOVERY_MODE = 0, + IXL_STATE_RESETTING = 1, + IXL_STATE_MDD_PENDING = 2, + IXL_STATE_PF_RESET_REQ = 3, + IXL_STATE_VF_RESET_REQ = 4, + IXL_STATE_PF_CRIT_ERR = 5, + IXL_STATE_CORE_RESET_REQ = 6, + IXL_STATE_GLOB_RESET_REQ = 7, + IXL_STATE_EMP_RESET_REQ = 8, + IXL_STATE_FW_LLDP_DISABLED = 9, + IXL_STATE_EEE_ENABLED = 10, + IXL_STATE_LINK_ACTIVE_ON_DOWN = 11, }; #define IXL_PF_IN_RECOVERY_MODE(pf) \ - ((atomic_load_acq_32(&pf->state) & IXL_PF_STATE_RECOVERY_MODE) != 0) + ixl_test_state(&pf->state, IXL_STATE_RECOVERY_MODE) #define IXL_PF_IS_RESETTING(pf) \ - ((atomic_load_acq_32(&pf->state) & IXL_PF_STATE_RESETTING) != 0) + ixl_test_state(&pf->state, IXL_STATE_RESETTING) struct ixl_vf { struct ixl_vsi vsi; @@ -284,6 +284,10 @@ struct ixl_pf { #define ixl_dbg_iov(pf, s, ...) ixl_debug_core((pf)->dev, (pf)->dbg_mask, IXL_DBG_IOV, s, ##__VA_ARGS__) /* PF-only function declarations */ +void ixl_set_state(volatile u32 *s, enum ixl_state bit); +void ixl_clear_state(volatile u32 *s, enum ixl_state bit); +bool ixl_test_state(volatile u32 *s, enum ixl_state bit); +u32 ixl_testandset_state(volatile u32 *s, enum ixl_state bit); int ixl_setup_interface(device_t, struct ixl_pf *); void ixl_print_nvm_cmd(device_t, struct i40e_nvm_access *); diff --git a/sys/dev/ixl/ixl_pf_iflib.c b/sys/dev/ixl/ixl_pf_iflib.c index 6ea20389c547..b70388bd6f6e 100644 --- a/sys/dev/ixl/ixl_pf_iflib.c +++ b/sys/dev/ixl/ixl_pf_iflib.c @@ -158,7 +158,7 @@ ixl_msix_adminq(void *arg) if (reg & I40E_PFINT_ICR0_MAL_DETECT_MASK) { mask &= ~I40E_PFINT_ICR0_ENA_MAL_DETECT_MASK; - atomic_set_32(&pf->state, IXL_PF_STATE_MDD_PENDING); + ixl_set_state(&pf->state, IXL_STATE_MDD_PENDING); do_task = TRUE; } @@ -185,7 +185,7 @@ ixl_msix_adminq(void *arg) } device_printf(dev, "Reset Requested! (%s)\n", reset_type); /* overload admin queue task to check reset progress */ - atomic_set_int(&pf->state, IXL_PF_STATE_RESETTING); + ixl_set_state(&pf->state, IXL_STATE_RESETTING); do_task = TRUE; } @@ -202,8 +202,8 @@ ixl_msix_adminq(void *arg) /* Checks against the conditions above */ if (reg & IXL_ICR0_CRIT_ERR_MASK) { mask &= ~IXL_ICR0_CRIT_ERR_MASK; - atomic_set_32(&pf->state, - IXL_PF_STATE_PF_RESET_REQ | IXL_PF_STATE_PF_CRIT_ERR); + ixl_set_state(&pf->state, + IXL_STATE_PF_RESET_REQ | IXL_STATE_PF_CRIT_ERR); do_task = TRUE; } @@ -1037,11 +1037,11 @@ ixl_rebuild_hw_structs_after_reset(struct ixl_pf *pf, bool is_up) /* Query device FW LLDP status */ if (i40e_get_fw_lldp_status(hw, &lldp_status) == I40E_SUCCESS) { if (lldp_status == I40E_GET_FW_LLDP_STATUS_DISABLED) { - atomic_set_32(&pf->state, - IXL_PF_STATE_FW_LLDP_DISABLED); + ixl_set_state(&pf->state, + IXL_STATE_FW_LLDP_DISABLED); } else { - atomic_clear_32(&pf->state, - IXL_PF_STATE_FW_LLDP_DISABLED); + ixl_clear_state(&pf->state, + IXL_STATE_FW_LLDP_DISABLED); } } diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index 0b4e69a5ce37..5cf686c5b7cf 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -116,6 +116,71 @@ static char *ixl_fec_string[3] = { "None" }; +/* Functions for setting and checking driver state. Note the functions take + * bit positions, not bitmasks. The atomic_set_32 and atomic_clear_32 + * operations require bitmasks. This can easily lead to programming error, so + * we provide wrapper functions to avoid this. + */ + +/** + * ixl_set_state - Set the specified state + * @s: the state bitmap + * @bit: the state to set + * + * Atomically update the state bitmap with the specified bit set. + */ +inline void +ixl_set_state(volatile u32 *s, enum ixl_state bit) +{ + /* atomic_set_32 expects a bitmask */ + atomic_set_32(s, BIT(bit)); +} + +/** + * ixl_clear_state - Clear the specified state + * @s: the state bitmap + * @bit: the state to clear + * + * Atomically update the state bitmap with the specified bit cleared. + */ +inline void +ixl_clear_state(volatile u32 *s, enum ixl_state bit) +{ + /* atomic_clear_32 expects a bitmask */ + atomic_clear_32(s, BIT(bit)); +} + +/** + * ixl_test_state - Test the specified state + * @s: the state bitmap + * @bit: the bit to test + * + * Return true if the state is set, false otherwise. Use this only if the flow + * does not need to update the state. If you must update the state as well, + * prefer ixl_testandset_state. + */ +inline bool +ixl_test_state(volatile u32 *s, enum ixl_state bit) +{ + return !!(*s & BIT(bit)); +} + +/** + * ixl_testandset_state - Test and set the specified state + * @s: the state bitmap + * @bit: the bit to test + * + * Atomically update the state bitmap, setting the specified bit. Returns the + * previous value of the bit. + */ +inline u32 +ixl_testandset_state(volatile u32 *s, enum ixl_state bit) +{ + /* atomic_testandset_32 expects a bit position, as opposed to bitmask + expected by other atomic functions */ + return atomic_testandset_32(s, bit); +} + MALLOC_DEFINE(M_IXL, "ixl", "ixl driver allocations"); /* @@ -210,7 +275,7 @@ ixl_pf_reset(struct ixl_pf *pf) fw_mode = ixl_get_fw_mode(pf); ixl_dbg_info(pf, "%s: before PF reset FW mode: 0x%08x\n", __func__, fw_mode); if (fw_mode == IXL_FW_MODE_RECOVERY) { - atomic_set_32(&pf->state, IXL_PF_STATE_RECOVERY_MODE); + ixl_set_state(&pf->state, IXL_STATE_RECOVERY_MODE); /* Don't try to reset device if it's in recovery mode */ return (0); } @@ -224,7 +289,7 @@ ixl_pf_reset(struct ixl_pf *pf) fw_mode = ixl_get_fw_mode(pf); ixl_dbg_info(pf, "%s: after PF reset FW mode: 0x%08x\n", __func__, fw_mode); if (fw_mode == IXL_FW_MODE_RECOVERY) { - atomic_set_32(&pf->state, IXL_PF_STATE_RECOVERY_MODE); + ixl_set_state(&pf->state, IXL_STATE_RECOVERY_MODE); return (0); } @@ -387,7 +452,7 @@ retry: } /* Keep link active by default */ - atomic_set_32(&pf->state, IXL_PF_STATE_LINK_ACTIVE_ON_DOWN); + ixl_set_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN); /* Print a subset of the capability information. */ device_printf(dev, @@ -1869,7 +1934,7 @@ ixl_handle_mdd_event(struct ixl_pf *pf) ixl_handle_tx_mdd_event(pf); ixl_handle_rx_mdd_event(pf); - atomic_clear_32(&pf->state, IXL_PF_STATE_MDD_PENDING); + ixl_clear_state(&pf->state, IXL_STATE_MDD_PENDING); /* re-enable mdd interrupt cause */ reg = rd32(hw, I40E_PFINT_ICR0_ENA); @@ -1937,7 +2002,7 @@ ixl_handle_empr_reset(struct ixl_pf *pf) if (!IXL_PF_IN_RECOVERY_MODE(pf) && ixl_get_fw_mode(pf) == IXL_FW_MODE_RECOVERY) { - atomic_set_32(&pf->state, IXL_PF_STATE_RECOVERY_MODE); + ixl_set_state(&pf->state, IXL_STATE_RECOVERY_MODE); device_printf(pf->dev, "Firmware recovery mode detected. Limiting functionality. Refer to Intel(R) Ethernet Adapters and Devices User Guide for details on firmware recovery mode.\n"); pf->link_up = FALSE; @@ -1946,7 +2011,7 @@ ixl_handle_empr_reset(struct ixl_pf *pf) ixl_rebuild_hw_structs_after_reset(pf, is_up); - atomic_clear_32(&pf->state, IXL_PF_STATE_RESETTING); + ixl_clear_state(&pf->state, IXL_STATE_RESETTING); } void @@ -4464,7 +4529,7 @@ ixl_start_fw_lldp(struct ixl_pf *pf) } } - atomic_clear_32(&pf->state, IXL_PF_STATE_FW_LLDP_DISABLED); + ixl_clear_state(&pf->state, IXL_STATE_FW_LLDP_DISABLED); return (0); } @@ -4501,7 +4566,7 @@ ixl_stop_fw_lldp(struct ixl_pf *pf) } i40e_aq_set_dcb_parameters(hw, true, NULL); - atomic_set_32(&pf->state, IXL_PF_STATE_FW_LLDP_DISABLED); + ixl_set_state(&pf->state, IXL_STATE_FW_LLDP_DISABLED); return (0); } @@ -4511,7 +4576,7 @@ ixl_sysctl_fw_lldp(SYSCTL_HANDLER_ARGS) struct ixl_pf *pf = (struct ixl_pf *)arg1; int state, new_state, error = 0; - state = new_state = ((pf->state & IXL_PF_STATE_FW_LLDP_DISABLED) == 0); + state = new_state = !ixl_test_state(&pf->state, IXL_STATE_FW_LLDP_DISABLED); /* Read in new mode */ error = sysctl_handle_int(oidp, &new_state, 0, req); @@ -4537,7 +4602,7 @@ ixl_sysctl_eee_enable(SYSCTL_HANDLER_ARGS) enum i40e_status_code cmd_status; /* Init states' values */ - state = new_state = (!!(pf->state & IXL_PF_STATE_EEE_ENABLED)); + state = new_state = ixl_test_state(&pf->state, IXL_STATE_EEE_ENABLED); /* Get requested mode */ sysctl_handle_status = sysctl_handle_int(oidp, &new_state, 0, req); @@ -4554,9 +4619,9 @@ ixl_sysctl_eee_enable(SYSCTL_HANDLER_ARGS) /* Save new state or report error */ if (!cmd_status) { if (new_state == 0) - atomic_clear_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + ixl_clear_state(&pf->state, IXL_STATE_EEE_ENABLED); else - atomic_set_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + ixl_set_state(&pf->state, IXL_STATE_EEE_ENABLED); } else if (cmd_status == I40E_ERR_CONFIG) return (EPERM); else @@ -4571,17 +4636,16 @@ ixl_sysctl_set_link_active(SYSCTL_HANDLER_ARGS) struct ixl_pf *pf = (struct ixl_pf *)arg1; int error, state; - state = !!(atomic_load_acq_32(&pf->state) & - IXL_PF_STATE_LINK_ACTIVE_ON_DOWN); + state = ixl_test_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN); error = sysctl_handle_int(oidp, &state, 0, req); if ((error) || (req->newptr == NULL)) return (error); if (state == 0) - atomic_clear_32(&pf->state, IXL_PF_STATE_LINK_ACTIVE_ON_DOWN); + ixl_clear_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN); else - atomic_set_32(&pf->state, IXL_PF_STATE_LINK_ACTIVE_ON_DOWN); + ixl_set_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN); return (0); } @@ -4628,7 +4692,7 @@ ixl_sysctl_do_pf_reset(SYSCTL_HANDLER_ARGS) return (error); /* Initiate the PF reset later in the admin task */ - atomic_set_32(&pf->state, IXL_PF_STATE_PF_RESET_REQ); + ixl_set_state(&pf->state, IXL_STATE_PF_RESET_REQ); return (error); } From nobody Thu Jul 27 21:53:45 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 4RBkzs41HDz4ppJ2; Thu, 27 Jul 2023 21:53:45 +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 4RBkzs35hCz4MqP; Thu, 27 Jul 2023 21:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690494825; 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=Yay09+ZvyzV1NXRRm6lPeYVW1Q2gmgCcJYyCnU9VzF0=; b=XmeVGPOQFLjX6MOn6/K3sBh6y/rx3zDzTs6vtr/4yUDjJcoTFLzJpVe6iSS66yHTtUcY/E PPa+uPoDCSCjTDlJpb8wDh286NEOMw33K06LX5CC1YWXJs8gACGHSknzTtSPXKz7rNoxHG QtjlSdNa8EQisFmpisYo+cx4vVKpQxh4mQIn0B+uksvCaHfqizFZeeRLj+/Cy/ulHlOLW4 l6smvRgIzvOoQ2ygcS+DMRA2NyLTYdRaB4UNhp7FCoPVl6/0OYK0OLovOLIdPcRYW7NcHa ZvL5NTtAvuxkjJsVoXTItVJ98h0ahHC+M+E9PAVTCS5X1dD/39jIUOR5vU/m+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690494825; 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=Yay09+ZvyzV1NXRRm6lPeYVW1Q2gmgCcJYyCnU9VzF0=; b=wmExFMaPhioPJR07otZ0sv4zllxDCiTqn/GDvwKjIYzeEh8vJY/Z48/XEn7KmhQrphQ1lM qYXMHzjv5oSV5Ol7i+Ze7xrS28YLc+TvcXvQIBzzoj6mXERnHioR88OkNDaQBf9sX1aUUB ReOdhjH3v2Ms5Fg1UCKjm/QuriRZvbVUGk0B6Pb06ygeyvxrsKc7qFApQV5xMuO8tkjyA0 MybgcFBZTxPaReLFQVhC6bcRnvU/1hPzDE3gmHoVh1HZHRaLQVIsCiLSvkZidrEXEazx3X Aj2tqXsuDku9uhkVC+kH7LbukgLz2YZ7Bl2jAEY0Jb2YmZBip77ykCkZ01ZIMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690494825; a=rsa-sha256; cv=none; b=Ares2bV6x858rghfIKr2m+In61AV0dTSzJgX5Eq3Ag/DuYLRq2wDL04DHRC6JJrV6u24PB JuajNND8Mf7PuM68RC5gNuofNKRJGMdLz4ShZPJBcoCYetxQMRviQj/B7lbXhwyUWXDHDY vYax3hCCslKv0A8sQQrWYdmOYFSniZxCi0wKjFCrxRYYCCK6jC/41X01x5LoX+j5IrjZYM eFqO9YBcM37IQDqnE4ejKQ1/NodkZn5cY57/GdKi3Q0SmErNguXL8/2WztZ4QAvqww4ire ryBXtL5xDn+0lbVUA72yAnqO16X0ZvvY2KPfUaeyt0jc3CzUHMSX3g1LlIWL8g== 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 4RBkzs2CFGzR9j; Thu, 27 Jul 2023 21:53:45 +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 36RLrjSR052726; Thu, 27 Jul 2023 21:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RLrj30052725; Thu, 27 Jul 2023 21:53:45 GMT (envelope-from git) Date: Thu, 27 Jul 2023 21:53:45 GMT Message-Id: <202307272153.36RLrj30052725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 1f188b9af075 - stable/13 - ixl(4): Add link state polling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1f188b9af0755ee1aeb7e1211f274b96952a10f1 Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f188b9af0755ee1aeb7e1211f274b96952a10f1 commit 1f188b9af0755ee1aeb7e1211f274b96952a10f1 Author: Krzysztof Galazka AuthorDate: 2023-07-20 22:33:52 +0000 Commit: Eric Joyner CommitDate: 2023-07-27 21:49:13 +0000 ixl(4): Add link state polling In some cases driver may ask FW about link state before FW finishes configuration of a (Q)SFP+ transceiver. If first attempt of using Get Link Status AQC after loading driver or handling a reset fails, then re-try periodically for 5 seconds. Signed-off-by: Krzysztof Galazka Signed-off-by: Eric Joyner Tested by: jeffrey.e.pieper@intel.com Approved by: erj@ Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D40899 (cherry picked from commit ba2f531f816a6bc1ef5f2cba4a329ff7bdbec0f3) --- sys/dev/ixl/i40e_adminq_cmd.h | 2 +- sys/dev/ixl/if_ixl.c | 50 ++++++++++++++++++++++++++++++++++++------- sys/dev/ixl/ixl.h | 2 ++ sys/dev/ixl/ixl_debug.h | 2 ++ sys/dev/ixl/ixl_pf.h | 4 ++++ sys/dev/ixl/ixl_pf_iflib.c | 4 +--- sys/dev/ixl/ixl_pf_main.c | 30 ++++++++++++++++++++------ 7 files changed, 75 insertions(+), 19 deletions(-) diff --git a/sys/dev/ixl/i40e_adminq_cmd.h b/sys/dev/ixl/i40e_adminq_cmd.h index 564a076761d0..679e191412cd 100644 --- a/sys/dev/ixl/i40e_adminq_cmd.h +++ b/sys/dev/ixl/i40e_adminq_cmd.h @@ -44,7 +44,7 @@ #define I40E_FW_API_VERSION_MAJOR 0x0001 #define I40E_FW_API_VERSION_MINOR_X722 0x000C -#define I40E_FW_API_VERSION_MINOR_X710 0x000E +#define I40E_FW_API_VERSION_MINOR_X710 0x000F #define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \ I40E_FW_API_VERSION_MINOR_X710 : \ diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index 65f6a400569c..a18dd4361bac 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -449,6 +449,29 @@ ixl_admin_timer(void *arg) { struct ixl_pf *pf = (struct ixl_pf *)arg; + if (ixl_test_state(&pf->state, IXL_STATE_LINK_POLLING)) { + struct i40e_hw *hw = &pf->hw; + sbintime_t stime; + enum i40e_status_code status; + + hw->phy.get_link_info = TRUE; + status = i40e_get_link_status(hw, &pf->link_up); + if (status == I40E_SUCCESS) { + ixl_clear_state(&pf->state, IXL_STATE_LINK_POLLING); + /* OS link info is updated in the admin task */ + } else { + device_printf(pf->dev, + "%s: i40e_get_link_status status %s, aq error %s\n", + __func__, i40e_stat_str(hw, status), + i40e_aq_str(hw, hw->aq.asq_last_status)); + stime = getsbinuptime(); + if (stime - pf->link_poll_start > IXL_PF_MAX_LINK_POLL) { + device_printf(pf->dev, "Polling link status failed\n"); + ixl_clear_state(&pf->state, IXL_STATE_LINK_POLLING); + } + } + } + /* Fire off the admin task */ iflib_admin_intr_deferred(pf->vsi.ctx); @@ -711,12 +734,6 @@ ixl_if_attach_post(if_ctx_t ctx) return (0); } - /* Determine link state */ - if (ixl_attach_get_link_status(pf)) { - error = EINVAL; - goto err; - } - error = ixl_switch_config(pf); if (error) { device_printf(dev, "Initial ixl_switch_config() failed: %d\n", @@ -745,6 +762,11 @@ ixl_if_attach_post(if_ctx_t ctx) device_printf(dev, "Allocating %d queues for PF LAN VSI; %d queues active\n", pf->qtag.num_allocated, pf->qtag.num_active); + /* Determine link state */ + error = ixl_attach_get_link_status(pf); + if (error == EINVAL) + goto err; + /* Limit PHY interrupts to link, autoneg, and modules failure */ status = i40e_aq_set_phy_int_mask(hw, IXL_DEFAULT_PHY_INT_MASK, NULL); @@ -780,8 +802,20 @@ ixl_if_attach_post(if_ctx_t ctx) ixl_set_link(pf, ixl_test_state(&pf->state, IXL_STATE_LINK_ACTIVE_ON_DOWN)); hw->phy.get_link_info = true; - i40e_get_link_status(hw, &pf->link_up); - ixl_update_link_status(pf); + status = i40e_get_link_status(hw, &pf->link_up); + if (status != I40E_SUCCESS) { + device_printf(dev, + "%s get link status, status: %s aq_err=%s\n", + __func__, i40e_stat_str(hw, status), + i40e_aq_str(hw, hw->aq.asq_last_status)); + /* + * Most probably FW has not finished configuring PHY. + * Retry periodically in a timer callback. + */ + ixl_set_state(&pf->state, IXL_STATE_LINK_POLLING); + pf->link_poll_start = getsbinuptime(); + } else + ixl_update_link_status(pf); #ifdef PCI_IOV ixl_initialize_sriov(pf); diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index 9b49520a8851..2f6fe6c959d9 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -301,6 +301,8 @@ /* For stats sysctl naming */ #define IXL_QUEUE_NAME_LEN 32 +#define IXL_PF_MAX_LINK_POLL SBT_1S * 5 + MALLOC_DECLARE(M_IXL); #define IXL_DEV_ERR(_dev, _format, ...) \ diff --git a/sys/dev/ixl/ixl_debug.h b/sys/dev/ixl/ixl_debug.h index 0d8c624d2df9..818ba8a1df83 100644 --- a/sys/dev/ixl/ixl_debug.h +++ b/sys/dev/ixl/ixl_debug.h @@ -101,6 +101,8 @@ enum ixl_dbg_mask { IXL_DBG_SWITCH_INFO = 0x00010000, IXL_DBG_I2C = 0x00020000, + IXL_DBG_LINK = 0x00100000, + IXL_DBG_ALL = 0xFFFFFFFF }; diff --git a/sys/dev/ixl/ixl_pf.h b/sys/dev/ixl/ixl_pf.h index 6a73f5acc838..90236ac144c8 100644 --- a/sys/dev/ixl/ixl_pf.h +++ b/sys/dev/ixl/ixl_pf.h @@ -89,6 +89,7 @@ enum ixl_state { IXL_STATE_FW_LLDP_DISABLED = 9, IXL_STATE_EEE_ENABLED = 10, IXL_STATE_LINK_ACTIVE_ON_DOWN = 11, + IXL_STATE_LINK_POLLING = 12, }; #define IXL_PF_IN_RECOVERY_MODE(pf) \ @@ -172,6 +173,8 @@ struct ixl_pf { int num_vfs; uint16_t veb_seid; int vc_debug_lvl; + + sbintime_t link_poll_start; }; /* @@ -282,6 +285,7 @@ struct ixl_pf { #define ixl_dbg_info(pf, s, ...) ixl_debug_core((pf)->dev, (pf)->dbg_mask, IXL_DBG_INFO, s, ##__VA_ARGS__) #define ixl_dbg_filter(pf, s, ...) ixl_debug_core((pf)->dev, (pf)->dbg_mask, IXL_DBG_FILTER, s, ##__VA_ARGS__) #define ixl_dbg_iov(pf, s, ...) ixl_debug_core((pf)->dev, (pf)->dbg_mask, IXL_DBG_IOV, s, ##__VA_ARGS__) +#define ixl_dbg_link(pf, s, ...) ixl_debug_core((pf)->dev, (pf)->dbg_mask, IXL_DBG_LINK, s, ##__VA_ARGS__) /* PF-only function declarations */ void ixl_set_state(volatile u32 *s, enum ixl_state bit); diff --git a/sys/dev/ixl/ixl_pf_iflib.c b/sys/dev/ixl/ixl_pf_iflib.c index b70388bd6f6e..326c10ca8bfe 100644 --- a/sys/dev/ixl/ixl_pf_iflib.c +++ b/sys/dev/ixl/ixl_pf_iflib.c @@ -1028,9 +1028,7 @@ ixl_rebuild_hw_structs_after_reset(struct ixl_pf *pf, bool is_up) i40e_aq_set_vsi_broadcast(&pf->hw, vsi->seid, TRUE, NULL); /* Determine link state */ - if (ixl_attach_get_link_status(pf)) { - error = EINVAL; - } + ixl_attach_get_link_status(pf); i40e_aq_set_dcb_parameters(hw, TRUE, NULL); diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index 5cf686c5b7cf..23da241315e7 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -4656,22 +4656,38 @@ ixl_attach_get_link_status(struct ixl_pf *pf) { struct i40e_hw *hw = &pf->hw; device_t dev = pf->dev; - int error = 0; + enum i40e_status_code status; if (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) || (hw->aq.fw_maj_ver < 4)) { i40e_msec_delay(75); - error = i40e_aq_set_link_restart_an(hw, TRUE, NULL); - if (error) { - device_printf(dev, "link restart failed, aq_err=%d\n", - pf->hw.aq.asq_last_status); - return error; + status = i40e_aq_set_link_restart_an(hw, TRUE, NULL); + if (status != I40E_SUCCESS) { + device_printf(dev, + "%s link restart failed status: %s, aq_err=%s\n", + __func__, i40e_stat_str(hw, status), + i40e_aq_str(hw, hw->aq.asq_last_status)); + return (EINVAL); } } /* Determine link state */ hw->phy.get_link_info = TRUE; - i40e_get_link_status(hw, &pf->link_up); + status = i40e_get_link_status(hw, &pf->link_up); + if (status != I40E_SUCCESS) { + device_printf(dev, + "%s get link status, status: %s aq_err=%s\n", + __func__, i40e_stat_str(hw, status), + i40e_aq_str(hw, hw->aq.asq_last_status)); + /* + * Most probably FW has not finished configuring PHY. + * Retry periodically in a timer callback. + */ + ixl_set_state(&pf->state, IXL_STATE_LINK_POLLING); + pf->link_poll_start = getsbinuptime(); + return (EAGAIN); + } + ixl_dbg_link(pf, "%s link_up: %d\n", __func__, pf->link_up); /* Flow Control mode not set by user, read current FW settings */ if (pf->fc == -1) From nobody Fri Jul 28 01:26:26 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 4RBqjG5F6Vz4pTlM; Fri, 28 Jul 2023 01:26:26 +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 4RBqjG4pylz3rQH; Fri, 28 Jul 2023 01:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690507586; 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=/7EbIHfDscbl6oxtlWWmgLNQqFQ/cPXRd7SWZBGdxo4=; b=g+SDNcmLydbB4ehtof+Uv3zM4v53jedNxCNtXpDX9JkU/yGTqe+B7Md7XJYyOGSrloWuhA IRF/CEvWOFYsusoTBcY2k+doX9ts7Hln0HAVZmveiMJ/fWSns9FeCgCSRB0gaezeGF7sWc IHXgZBO8ecHS1Q+sE1YfrZzcvt0PiF9+MsalqcS3sIxLCYQO+vxTkZIAHxeztb8FTLMZWS v6XBSBEa8M+hUF7272QcQEjC/c9wmZTzSpSeVqzyXKxX6u2JFiU+ZQkSja2G47ZFrY8Veq fm+2WupfU5ue0YTRXMc1vnHwa24r8KG4bwH0nhBfIGGw7uuLsXXhO5zAxY+5wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690507586; 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=/7EbIHfDscbl6oxtlWWmgLNQqFQ/cPXRd7SWZBGdxo4=; b=alXtJdfeSJ0k3W9zIbKToRer+JAXpHkylUETdNTfVFdcqsP8VRG4aTq7fWr/1S3u3+M+mG A5y+vydzgDWOAMaBSHNzOR1xB1JCSzf3q455KPVfTQbGFbaRkMP4GU0WMi1bGM4Llg0fz4 aW4AYUyBuKNQKMCU+eCtsy2Q1GSvn0YcnI0eCm/xMv8KI3a3WMs1ap3LwzGSUcnhvdQEbD S9SRKO2pTRnAsicU4OyIHGtnAa6errFjY01oPPxpSIA8E1ZqmAvnBibFxIr3yeNdxk0Z9n a8L1yC0bUOk+7dENlnEwtREb3dUtwXsvspLm5/N/aGBftLNi2u43gjJJkzFXNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690507586; a=rsa-sha256; cv=none; b=W/vHgGRMgRZYQLTqBZen3Lr6o2KJmg8AzHyevGSdvnx4Jjhz+3cYNg7awBL7QqHabCicjC mx3v3GdvXLhybFDa3KDLDU6mTIZEm738IWnZJOcwhHccLfVa62II/9ucxV5S71on+v0c2r YivHRgab7pHfphidKk+xOtZOroYNUjsAfPPMULJkGoWulVXGgA6erqFn31j0uLUfryMc24 Rr165WPDQUE9RfgzO2jLvvG6BjX7m3388CCKDrBhSLrEr8b5B0q7+6HWa8puL1NoeI1G0q rWXhnNITW6FUdEfSwsiod5Hpl6X/oUysYW1wwgv+ZqB11Hy99DmNXRHfCxIIdw== 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 4RBqjG3txVzXW3; Fri, 28 Jul 2023 01:26:26 +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 36S1QQv0000541; Fri, 28 Jul 2023 01:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S1QQJD000540; Fri, 28 Jul 2023 01:26:26 GMT (envelope-from git) Date: Fri, 28 Jul 2023 01:26:26 GMT Message-Id: <202307280126.36S1QQJD000540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e3e7512e715c - stable/13 - thr_mutex.c: style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: e3e7512e715c8ff13e1f19008ac9443c1b578db2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e7512e715c8ff13e1f19008ac9443c1b578db2 commit e3e7512e715c8ff13e1f19008ac9443c1b578db2 Author: Konstantin Belousov AuthorDate: 2023-07-22 17:59:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-28 01:14:01 +0000 thr_mutex.c: style (cherry picked from commit 0a5c29a6ee0a4c2732977d6d832e7193dbddaf26) --- lib/libthr/thread/thr_mutex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 40e0b7382f95..8d64d26c12ab 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -291,8 +291,8 @@ mutex_init(pthread_mutex_t *mutex, if (error != 0) return (error); } - if ((pmutex = (pthread_mutex_t) - calloc_cb(1, sizeof(struct pthread_mutex))) == NULL) + if ((pmutex = (pthread_mutex_t)calloc_cb(1, + sizeof(struct pthread_mutex))) == NULL) return (ENOMEM); mutex_init_body(pmutex, attr); *mutex = pmutex; From nobody Fri Jul 28 01:26:27 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 4RBqjH6x7vz4pTht; Fri, 28 Jul 2023 01:26:27 +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 4RBqjH5l5Cz3rSp; Fri, 28 Jul 2023 01:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690507587; 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=X98//q5kc1OgxfSIp65yBlOfxpI/04oKEvlRfBHf2fk=; b=ZZfnrg5JSUeiDSNsc3sxmZWwosJjHL51v7SVYiYl2t1osQ1j91MYJD6LD34KJmhA9eTKBU ULlZFRdfG6UksUR7b+s0VPzF8U4AcF9TRA6LzcU/3ApGWZM7FvheVKjjqJV70qgUZlGvLl RqSeSe+LKhCD4aAJhpBSAelBo5pXEqlIBc31ByggZoIQOlddJv71NWwgn+5yLu/YFLO30m EHXTAUUGYbl0KdOsWuSGtSYNQQ9I6ur1IgLvXRFD6NP9J4T1EB4N8WW/+KdqU9eB4I5IiB nGzE3Z7WPJBBbbr4RjVo6V73qxqcL5Jd26u+cvzSIeDUdBzEAzHNtEfEO4Q3ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690507587; 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=X98//q5kc1OgxfSIp65yBlOfxpI/04oKEvlRfBHf2fk=; b=TahCA3dqNWmo18rYsINvNyWXUhxgjweIf7V2uNlFfRizucLfF0Sq6UPFg58a6qhR1+QdFN ToHJU4ouT9VCayQ0uD3152UZGRx+67tJuatzSYuGyPyv6fL0Iae/jfz0lrbag/84cX0u1Y n33HesIcX8X/nQ1/N6K8Cvb1qYQSjuLTx+JgmI24dczxBBPZzRvHRmJTvlcopLpX2Bgwp4 kNRYcx3fLx0o8mMaHdbdLaH+92ltrmygp2W30J+ypzMEQlshS6Doh4iQTEmCYGCQ161KCs GkLYxeVJQiUAqgM6E0HMhY53MTl7CsCbcfOQE/oRJR16vU/5VEOjbCpocPQ14g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690507587; a=rsa-sha256; cv=none; b=Z2j0J9u9z0vJIiOY8jjtRGfOqD4zm2rEPKpU/6M+VE761ajEJ9btH9/X242+51bAodUmqq 4loov6k6QV2Q5xMHWBMGQ1CDEqmGup1ATJlYHx6KDrvhL9xx4ZxvtZxit1T/OcgEcmbnvp 6WYa9WCFKrbRLAYX4fg/DiJTaqe7W90X52m6kcktWhGFkVSB5EIqLiI1atEK86xvc/wN4Y NUoZMaDhCt1vQ+Jd5Bq1Koul7AwZQjAqDLy9tHQND+r5BlFu7dphl0M6C3PkO9+Cr777PL u+ZoDKjc1OXSb9gQ0+BIMJgmLRa+Z51T3fEPmw2aaQdVV/CXEtX8eQeb0IzIBQ== 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 4RBqjH4Z9DzXcr; Fri, 28 Jul 2023 01:26:27 +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 36S1QRo1000567; Fri, 28 Jul 2023 01:26:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S1QRTM000566; Fri, 28 Jul 2023 01:26:27 GMT (envelope-from git) Date: Fri, 28 Jul 2023 01:26:27 GMT Message-Id: <202307280126.36S1QRTM000566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7b335e9f690e - stable/13 - ip output: ensure that mbufs are mapped if ipsec is enabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 7b335e9f690e77841e3eb7dbf3403429b10fe222 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7b335e9f690e77841e3eb7dbf3403429b10fe222 commit 7b335e9f690e77841e3eb7dbf3403429b10fe222 Author: Konstantin Belousov AuthorDate: 2023-07-20 12:08:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-28 01:14:01 +0000 ip output: ensure that mbufs are mapped if ipsec is enabled PR: 272616 (cherry picked from commit bc310a95c58a3c570ed7e5103371453881e36ba1) --- sys/netinet/ip_output.c | 6 ++++++ sys/netinet6/ip6_output.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 60aac79886c3..9b8e3b3eff7f 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -677,6 +677,12 @@ again: sendit: #if defined(IPSEC) || defined(IPSEC_SUPPORT) if (IPSEC_ENABLED(ipv4)) { + m = mb_unmapped_to_ext(m); + if (m == NULL) { + IPSTAT_INC(ips_odropped); + error = ENOBUFS; + goto bad; + } if ((error = IPSEC_OUTPUT(ipv4, m, inp)) != 0) { if (error == EINPROGRESS) error = 0; diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index f455c5ccbea2..88d7b2153991 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -461,6 +461,12 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, * XXX: need scope argument. */ if (IPSEC_ENABLED(ipv6)) { + m = mb_unmapped_to_ext(m); + if (m == NULL) { + IP6STAT_INC(ip6s_odropped); + error = ENOBUFS; + goto bad; + } if ((error = IPSEC_OUTPUT(ipv6, m, inp)) != 0) { if (error == EINPROGRESS) error = 0; From nobody Fri Jul 28 07:57:57 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 4RC0P21V9Gz4ppb3; Fri, 28 Jul 2023 07:57:58 +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 4RC0P20yYCz4JN5; Fri, 28 Jul 2023 07:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690531078; 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=KU+GhgTbq127zgxrltMnbh7PhFgfoO9WAzHVd7DNtVk=; b=mN526FtR3I88yEONY3SssUeRqIbcthxHUuvaNOgkitJzanRZB7WREA2pRTp+ARkM+auzW9 iOG+x5flba1CuxaIYrrth3ckETOj+0teYYtQu6R6E7x/eUIMUwg+VIQXYu4Qxnr+4pkh2y nw9v8IcfQfxfcbz2MuCdVEr3hMasud+XNcQFLlYwgCJWr/zItLng1Xye5h0JXEx2AkZLMU AaSc6XkRDT5CXNDJSEk2q7QBEt62K22v8hGfF7Ba1BtKs2mLr3pTK+CsBpeEmBKM1zKIJR jHCiAt7wDhPsouJxv6cRXyhVCE/WVFPMGygDGl/fmTatbi8l7kPTSP3sNCAioQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690531078; 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=KU+GhgTbq127zgxrltMnbh7PhFgfoO9WAzHVd7DNtVk=; b=b4jamHzkMx+iJL3PvN8Lx5hIZ1wP4CDA9MNL3rqUucSlEffbPs2h4XVVfjxNeqR/FmzDSo 9Jn9P0g9HtodzHl1mAOx4AgA/UwUn50BhupueQAkylk8wlYNIre46Yc3F0NOHF8wAW3mJl mjsqv1c6JBB9L3fTetbASTklpw82k8cLFoBeUDPv3IL5W/ThXHAF+h1TtxYNuoRNLzSvyf vI628dDBiWh6EnMHa8pGVM4z0hiMRVu+QdW0XMurugWukuApkJGZDOsoVMW8wo32kc1KGF esNYIZmWwJUIveO2zBfDOF3uN9cpyAzjkZoRAXH90Pk4FTFBf1pRldm8xzQZhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690531078; a=rsa-sha256; cv=none; b=BGBCofL4TFIfoRVdg2CcDxV+vxG71529G3JN4E8uEVTfKFGl6ONcF22cRlSlUrm7xwHOQY TrStY+Z35roAadQmpuGGp2iMelimQBVuW56FVfTmrrBdKHH5LnaXq5hXP7+fpKbZlxTOZz XyCTuht78cmnhlyIosZLYIV4Cko1zRHJsX0HRS/63+hPYh1r/MnQ6AA+FWOy+HYQ3K62LH 4rb88wGdSCh7oSPiunYM5IEb4TcV4fF2n9ByFFdiFm8/wiP4CpFrf/dGj0+eMVtZeOkhDV e9RAAU+kuyhrFRlI7r4MhHBKTs855I6/74BQQkpeHCF2bmMeM3c8/Yw86FJxXw== 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 4RC0P202nyzjwn; Fri, 28 Jul 2023 07:57:58 +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 36S7vvSF046634; Fri, 28 Jul 2023 07:57:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S7vvlK046633; Fri, 28 Jul 2023 07:57:57 GMT (envelope-from git) Date: Fri, 28 Jul 2023 07:57:57 GMT Message-Id: <202307280757.36S7vvlK046633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Graham Perrin Subject: git: e583c798d935 - stable/13 - gpart(8): slices are out of context for GPT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: grahamperrin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e583c798d93502752bd8d72da62beca5b3e342e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by grahamperrin: URL: https://cgit.FreeBSD.org/src/commit/?id=e583c798d93502752bd8d72da62beca5b3e342e4 commit e583c798d93502752bd8d72da62beca5b3e342e4 Author: Graham Perrin AuthorDate: 2023-07-07 22:05:46 +0000 Commit: Graham Perrin CommitDate: 2023-07-28 07:53:36 +0000 gpart(8): slices are out of context for GPT Correct the GPT example. Creation of a partition leaves free the rest of the device (not the slice). Approved-by: imp Fixes: ae1b731b5df0 Rewrite the GPT and MBR examples. For GPT, ensure that the boot partition is large enough for gptzfsboot, which has doubled in size since 10. MFC after: 1 week Pull-request: https://github.com/freebsd/freebsd-src/pull/795 (cherry picked from commit 3541d90836c0dde9734ea776f2b2b6c4ed8fd7f4) --- lib/geom/part/gpart.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index ffb048e9abf5..832f53d1bfc6 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 26, 2022 +.Dd July 7, 2023 .Dt GPART 8 .Os .Sh NAME @@ -1396,7 +1396,7 @@ sizes of up to 256 kB. .Pp Finally, we create and format an 8 GB .Cm freebsd-ufs -partition for the root filesystem, leaving the rest of the slice free +partition for the root filesystem, leaving the rest of the device free for additional filesystems: .Bd -literal -offset indent /sbin/gpart add -s 8G -t freebsd-ufs ada0 From nobody Fri Jul 28 08:17:38 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 4RC0ql1PQWz4q72T; Fri, 28 Jul 2023 08:17:39 +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 4RC0ql0yW8z3C9M; Fri, 28 Jul 2023 08:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690532259; 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=JSs1Tq/icdMImEvAlx2oB52nrgTP5h2iozFAQFNR1Ms=; b=Xg5FWq/huIrTtOWU+y/NsADax2bUdoRbdL2o30RoBujilcmEB3TGR4+NW2MJ5RbziL6Bwa ykILdBdfOHjnpnZlwvxb96kMXmr1dEkcQyXcr8xEYVIyK+LR/WfUlgPHrDwBCAtOasJuqX kderAGbRiPB5zspFQKnr/A9XH29NMiPYhMgdFEQZycUB0f4VwpSiHVBqLNdj77m5dddKgi 3uxlFwX3L/4T4Dd+khJI7MLhx0VMyZS5H8AzeoCWaTxPewve30KEvjxDJcmjraKS22A5JJ hLWsEvaI+nGDTlG6Pp8GM2gQYb+KJiuHhkrDgdjg/b4NVz8SH8sD/IBEcYxvzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690532259; 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=JSs1Tq/icdMImEvAlx2oB52nrgTP5h2iozFAQFNR1Ms=; b=xRZrR+yV05Nnd8DfkAhpS2Qgfq6pCjh1qjGbrNrGiXQTHjQR/s1PKnapnL+LYlc3cR0JU6 Kw1Z11NNAYBcxZ8ZNvEx8SQGFG71RDMz5Rf0tJgVSeidnQBY7XtPzgo0mHgDmrkMHTQ2HY z0NB/TDuSXzV4XAlnf5HlYikIK8066+OloTXscN+9T0ZnxMCJFhYGzZ+A6tfUQE7ldWqFw jxIEURTm1i3BPtTIP522l/8lK6t9pa4oVeDofsujKgXFThRQf/8mh+Qm0oBjU/GYUnC141 9ihSiQYUE/EdYX0Rdduq8h+VT04gRAtlr7aeCeq/3su5ml30LeBmPfwQ9f6x+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690532259; a=rsa-sha256; cv=none; b=Em/ZNiEYk4OFRVuzXoXhBGSBEfDa2LtBhJvG8hPvp+kfN5G1IfvR+gsiu8tfcOAZpIWaT1 6SQt2bghWcHyOd+E5JHv1tjJDhjjAJkKHNnLsUQdNCcTuxp/FH9ZkGFbyv3VUrbURPZ3OX reGge6G6HlHdWNCvxYcNZW0swTxydNhC0Ac1OhQ0kqPGPx6PDnlUX2cb3oIy86wuxYGZJc Le1NbSnxhE6KO/E2g9dGsHHTuB3P4PgbTGzGxleNK3pL/eANZd6In0rs/sLfHbjIp5oRNu n4SGrh9QUJcdfxYaLDxudcOPFsc4eUBMWk0lLo0v5V7bqapzQj6krq2ja1hSeQ== 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 4RC0ql02HRzkPR; Fri, 28 Jul 2023 08:17:39 +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 36S8Hc14080636; Fri, 28 Jul 2023 08:17:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S8Hc92080635; Fri, 28 Jul 2023 08:17:38 GMT (envelope-from git) Date: Fri, 28 Jul 2023 08:17:38 GMT Message-Id: <202307280817.36S8Hc92080635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Graham Perrin Subject: git: 542497245dca - stable/13 - hwpmc(4): instead of manual edition, use sysrc(8) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: grahamperrin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 542497245dca46237700a34aeab9e0de40fea6a6 Auto-Submitted: auto-generated The branch stable/13 has been updated by grahamperrin: URL: https://cgit.FreeBSD.org/src/commit/?id=542497245dca46237700a34aeab9e0de40fea6a6 commit 542497245dca46237700a34aeab9e0de40fea6a6 Author: Graham Perrin AuthorDate: 2023-07-08 06:24:18 +0000 Commit: Graham Perrin CommitDate: 2023-07-28 08:14:49 +0000 hwpmc(4): instead of manual edition, use sysrc(8) Exemplifying safe use of sysrc(8) has become commonplace in documentation such as the FreeBSD Handbook. Encourage its use. Consistency: 'the driver' (not 'this driver'). Co-authored-by: Mina Galić Reviewed-by: imp, Mina Galić Approved by: imp MFC after: 3 days Pull-request: https://github.com/freebsd/freebsd-src/pull/785 (cherry picked from commit 666c54d12ec941e1fa3741f28ba19223ec4d2c81) --- share/man/man4/hwpmc.4 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4 index bf9cb5e9e5e3..a15ca1451628 100644 --- a/share/man/man4/hwpmc.4 +++ b/share/man/man4/hwpmc.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 16, 2023 +.Dd July 8, 2023 .Dt HWPMC 4 .Os .Sh NAME @@ -47,14 +47,12 @@ Additionally, for i386 systems: .Cd "device apic" .Ed .Pp -To load the driver as a module at boot time, place the -following line in -.Xr rc.conf 5 : +To load the driver as a module at boot time: .Bd -literal -offset indent -kld_list="${kld_list} hwpmc" +sysrc kld_list+=hwpmc .Ed .Pp -Alternatively, to compile this driver into the kernel: +Alternatively, to compile the driver into the kernel: .Bd -ragged -offset indent .Cd "device hwpmc" .Ed