From nobody Sat May 14 11:50:14 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9224F1ACD0A1; Sat, 14 May 2022 11:50:18 +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 4L0kN95Nxnz3rwj; Sat, 14 May 2022 11:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652529017; 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=1caYO9dY7KDqijfumuMIpjSMj1K7ZphXBGqQjKLzMVc=; b=ZQ5f92NSx1UvEj0RYrOSpeLG8grM55uWGWZjCrICHeHqva8Lrq3oTtp4rQa9/ZrKAk7yQ1 SJUjxRgzP/PRjzhv8mItZ5st+36RO0lgKiCsewgU8QMjRSG3nEyZ0fNgRTj1fKHb3dRHoF DBLsGxcmp9UmsLG+0lOZcZefOPWndoFi5qHWYCX+oNr6CNuP6rUM9q4xV61dAoAMMrYS8e lBKiZ0xHcEv+XeqyExjSEaNLwEoIeLRaHF8eg53l776t9FGGTKZDFwocFIaUYOY8dCkMto xFCQLdRwsZtkW3kbiOCdvq/Lkjy9JgwsTqW/NrC18xPbi/+ki1Qg9LGSYd8QiQ== 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 DCACD16C9E; Sat, 14 May 2022 11:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24EBoGq3021979; Sat, 14 May 2022 11:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EBoEcq020923; Sat, 14 May 2022 11:50:14 GMT (envelope-from git) Date: Sat, 14 May 2022 11:50:14 GMT Message-Id: <202205141150.24EBoEcq020923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: dbc822f3bc53 - main - Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbc822f3bc537e0d8350f63178397156bc163b1c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652529017; 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=1caYO9dY7KDqijfumuMIpjSMj1K7ZphXBGqQjKLzMVc=; b=OtP2HUkDs4j1tQ9cDKhDc41hYXYqxgbYqX1Z+l7MXhd6RtLKp1uslXOlPnDRR//HakGn8o 7ngbFR3ZiEPXmn/pv08ihpWLRJxR7mMjJxtL+NeeGclZZaA4DSfvJTvzezcXdPW9NUNFnn DMZ8s9nnmWxAjHvp5/mUNf29x+5E4Nf5Q5Y/NXZAjzJxljY6cMOOAZEPf6yjkm5M9fTG0p /otS9rzOZsoyF4ApwSI6jA/u+Sg1VQUK1cTAuNlQdLSiaulrEVnh5cyHavQ3Csm73RKBVd fk/LKx+zxHlBPfuD5vCk3HGalkcpaAbAcSQnGm2cTLdYtnFenAWAYLDWAJWBcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652529017; a=rsa-sha256; cv=none; b=uhagy/HDw0XWy8KlMCRYtAKVKWCbRmpV+pmXiKLZql4VgQOhBNcQZC2KLTBAyXwrK6cKEv Tz3K5RIg1u79F3aO/eYfDECctS/vUqmh/uycTZKrTUGm82m+37lBkStvL5H/1f2kF1SpHT WmJttwG8gcnGgNsZvm9omrJUqEwxIm0F+uzJt/o4AcumhmZhRINrAxaXMLf/9Vus+z7lcB Dsiubz8NGftO/vMGGmsUz37n04ph4Qet6bek9rXCbjFOnP69GZVIzSVQJ7LQulvRfg4ZpM z4iJ8zbi+4jsLFET7y6VEr8IUv3rAypSIHvZgTyOQ30g9RKU9+byxDB2Db5xcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dbc822f3bc537e0d8350f63178397156bc163b1c commit dbc822f3bc537e0d8350f63178397156bc163b1c Merge: fb03ea46eb85 8a0619680e19 Author: Dimitry Andric AuthorDate: 2022-03-29 20:16:50 +0000 Commit: Dimitry Andric CommitDate: 2022-05-14 11:46:31 +0000 Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14.0.0-2-g3f43d803382d. PR: 261742 MFC after: 2 weeks contrib/llvm-project/libcxx/include/span | 8 +++++++- lib/clang/include/VCSVersion.inc | 6 +++--- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index f5ca305f872e,000000000000..bed489b0b0fb mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,10 @@@ +// $FreeBSD$ + - #define LLVM_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" ++#define LLVM_REVISION "llvmorg-14.0.0-2-g3f43d803382d" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" ++#define CLANG_REVISION "llvmorg-14.0.0-2-g3f43d803382d" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" ++#define LLDB_REVISION "llvmorg-14.0.0-2-g3f43d803382d" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index 29771a0900ff,000000000000..a469435359e8 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400003 + - #define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-2-g3f43d803382d-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index fd42c33018a7,000000000000..5a7906b88e4d mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,3 -1,0 +1,3 @@@ +/* $FreeBSD$ */ - #define LLVM_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" ++#define LLVM_REVISION "llvmorg-14.0.0-2-g3f43d803382d" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"