From nobody Sat Apr 20 10:32:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM79p6QtRz5HVtH; Sat, 20 Apr 2024 10:32: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 4VM79p52HWz4PT4; Sat, 20 Apr 2024 10:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609134; 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=aV/Yk+5tM1yQj1xsx4v2CvPGqKwWNMcRjpCuQzWB9w8=; b=Wwr7jR2qqCoyRShLB3HZBRIoMIWx1h0WQ0/b5ixHFLgy4/UK5wQLk6uS/jRQYR94B3OjjL Oagb86sEDzsdxek1fB9Ky8MI2Po7e0VtSNfpFj+utoAKybDE3kxO5osCdC8TOFQdTzn43l L3ch8koUsf97/zIL0BnfrktRuxrKDHHf6779v4+9NPsq0pGl05x/LVYPrBtVqDWyvnlL4z 5g2XY6JyFEawV5rnjXSbm1puxUWINJ38LkFXgmpJprKGE2IKyKAVA3cleftL9NXYPlB/zt 9qikkvcWE8voj0lTOt0FCFkDeenPlqs7B1xCBdIOGhXLKPebOOgrcggWKnFBRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609134; a=rsa-sha256; cv=none; b=V0AeVZCaLbw4jIKpwtSukkyg2LIGQ2U2pi4hPlJ9z8nCKUfI7KTiEdcscHFsX9ml+VsZv2 Wyo6ftYmFOjj1zYBfYknuvckrL7zhtifVQqI/1EhAIYmORatkWast9N9gmUiDWjAXzXlXa gGeb8yyX6cD2GpW/LzveS4uOwEpZDCQOlHhM5E6oZN0UEiChdgjFq+U/VBhL4nJjoerXaS KifWIWxxfU543l8PXouQoeq8pY3n3IKfE8iESkhQHnBcGIU8WjDRIKfPGRNmfVukDQA7Z3 i473jDHu/svjQ0berLeBP/Jjygzpsu3YMwLxDyX/GelsmPzwoUHmcH/endFh7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609134; 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=aV/Yk+5tM1yQj1xsx4v2CvPGqKwWNMcRjpCuQzWB9w8=; b=TKcQkjzgW7N1cbbD5n3EmOgCdIrpeIbmIKvICZWmNsMQStCcxDwn7DZFOwZByB61r7xExE wV+ME18fxUm21TJscoiQEk07QhhPc5eu9eweV9/i29CiD18Xlk+g3ecpxj3y/ZTsBsZUcD wrppituRrB89LjmzE9Tq02Ig6Is93ujY3GMUvJYsbi7JPHppNf2jN+AKXasz4TsCPEnaeU wlZzp0AoEZhvzdcKnTgfezDDTi7VjYLDblyVXEogV8I8xdtwj0VczMIprh8+PGomOxabS4 nhh1yupczaGE5dNEGt6WRmYJnytluPZOl5/pfWMR/PmGCciWeuSKm5JXCzK30w== 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 4VM79p4fgtzZ0v; Sat, 20 Apr 2024 10:32: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 43KAWEQ6009522; Sat, 20 Apr 2024 10:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAWE7k009519; Sat, 20 Apr 2024 10:32:14 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:32:14 GMT Message-Id: <202404201032.43KAWE7k009519@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: 7a0ffb5e054a - stable/14 - Tentatively merge https://github.com/llvm/llvm-project/pull/77242 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 7a0ffb5e054a644a21b6de36a8f1ae51b223eed0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7a0ffb5e054a644a21b6de36a8f1ae51b223eed0 commit 7a0ffb5e054a644a21b6de36a8f1ae51b223eed0 Author: Dimitry Andric AuthorDate: 2024-01-07 16:03:13 +0000 Commit: Dimitry Andric CommitDate: 2024-04-19 21:14:10 +0000 Tentatively merge https://github.com/llvm/llvm-project/pull/77242 [libcxx] Re-include in __config for FreeBSD In 0a97720d0197 some changes were made to `__config` for assuming that `__BYTE_ORDER__` is always present. However, this deleted a `` include for FreeBSD, which is required to get the value of `__FreeBSD_version`, and that is used later in the file to determine whether `_LIBCPP_C_HAS_NO_GETS` needs to be enabled. Include `` just after the other includes used for feature detection, to fix this. Note that when FreeBSD 13 is EOLed, this can be removed, as then all supported FreeBSD versions will no longer have `gets()`. PR: 276104 MFC after: 1 month (cherry picked from commit 653487bbc8006839d0895811942bb8a2fcdd5aa8) --- contrib/llvm-project/libcxx/include/__config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 40e6da8bc03a..f52fb0441293 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -477,6 +477,10 @@ _LIBCPP_HARDENING_MODE_DEBUG # include // for __NATIVE_ASCII_F # endif +# ifdef __FreeBSD__ +# include // for __FreeBSD_version +# endif + # ifndef __BYTE_ORDER__ # error \ "Your compiler doesn't seem to define __BYTE_ORDER__, which is required by libc++ to know the endianness of your target platform"