From nobody Sat Apr 20 10:34:21 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 4VM7DF4frfz5HWWg; Sat, 20 Apr 2024 10:34:21 +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 4VM7DF1bB1z4SGZ; Sat, 20 Apr 2024 10:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609261; 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=0ls0aZ4POMrOsG7Eab8n4LSDzJBAFtA+u0NMUnDz0do=; b=SL/wF8oBRNj9fJC9ABYPXe8NN2Xq7uOIzdENFoSdhbKY/Ip+lHXUoO/Qub5f/hyvniba1o NV6E1jpRXO8esyCYoHAffPXktEefBOHLpetgJfRjNgInYyO6XlZFq+cs1PvaNUeZEmT/wr A452ZFRAYL4mNH1DmcAoLjI9Sfljzp+R+IvfySEIbep+NKplNK84MTfAjbEsOp65UjVhus X3gmJOjncwZDlsTRVmaKxtK0jlSus4Zol7yTX9xc7yDB5LQLzJTD+gdab14MJbBfjd4MMF OKdLSTP298qH1+smrxhKnhNpIU77NxLZh5mvxaJoBCs8k3kSiZIwAnh2I/QzTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609261; a=rsa-sha256; cv=none; b=giNE+g3GQGgNfcxpt0RhddLUgDJUBMFCdzHUNrdQwRReIwR22tGqMMctrY3OhSvJvn+B4Q jg4mnceBTsjXOfe1HH74mxC40z5SQ8hDcBAW9/+M6DRaop+aNTxP/hLKkWy4+3tSmBQ0fx kUrEmWDLF9wlyXdilV1TAB1gDr5I0umy06SYtvgGCVDj1FaDyPjurTRjZ8jr2mFADr7gnR X8yehWGP+soyoyeIvhy1/8WwXbYdTmTo4BBvoVpyfAA9md3m3qGLcXQwcxe0BCBnw33xwI I+OHSaS9Iw10xzLp19F6U2u7OKM+P/gmTHIe4zaI8TPfiS95e7LScMh1dkfHyA== 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=1713609261; 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=0ls0aZ4POMrOsG7Eab8n4LSDzJBAFtA+u0NMUnDz0do=; b=iSs0zkdCwDNOeNZ/NEd1QjcACvIvd/A3dJ/WsYx0vV99AcIsC/Zu+E6TLqBSauEbnPbTJr R8FDkIcMwJ9ZCVpBlqrVdyOzJyLxpncXDvBbXt+3rXNIPXX1WJHHaPotpQsHYRaeK6tF2q 10w1SWNNuQAY06Pf+LgTQqvfn3jCJBvMhUirVr2I0ZNyB8v8AZpPPhdrcYOMfLVF6G11u2 bXTwZyxyg4dPkw8vF2Z/t023lMcNNXRBOQ+RWwa9LwlDtg1tlMPy4Lu5HMu/xCfWWplAQr SOrGO0USqsJ9joSpHbl+VHWNbsNBge7nFPhX3TOROJI7F9eoHZqRk3RizcLoWQ== 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 4VM7DF188gzYqs; Sat, 20 Apr 2024 10:34:21 +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 43KAYLCj013413; Sat, 20 Apr 2024 10:34:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYL6r013410; Sat, 20 Apr 2024 10:34:21 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:21 GMT Message-Id: <202404201034.43KAYL6r013410@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: 15ce79bc8b1f - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 15ce79bc8b1f02ad1dbab2f2d7f6806b4801c09b Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=15ce79bc8b1f02ad1dbab2f2d7f6806b4801c09b commit 15ce79bc8b1f02ad1dbab2f2d7f6806b4801c09b Author: Dimitry Andric AuthorDate: 2024-01-07 16:03:13 +0000 Commit: Dimitry Andric CommitDate: 2024-04-19 21:24:41 +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"