From nobody Sat Apr 06 20:17:48 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 4VBmqx2HLbz5HGf0; Sat, 6 Apr 2024 20:17:49 +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 4VBmqx0zSwz4KG4; Sat, 6 Apr 2024 20:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434669; 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=Is7Dfo5uYXyrbITwlV0SUxxhiezyCSLI+phzRBD205U=; b=v1zg7YAyqMxuivABWesNg3OT2hIOBlBaNDPN0oFD7jO2n8TNHvVADmVXw8pPV0FwZG8aol P6tZ3qwzG4yVUFT7+YfwywTuL3efj5J+p5Q+8xu7rVzNfYNI2oPR0Srs2HhTDxzf6EqKq/ ah7PFz3tu/zExprtIv6VPQGxnitAhYwSV/YWplGyyezOP9fg/r8rauGnGxdK0tAyO2rO79 WHdIOmCKImMObfq2jrDBpi03VsG+NB0Tk7MExAAXYBiRUiFYJN3RPgUp/e8H+ur8BCAuxD 843Frt+0kKsSI7/ODq0pHQT6soYZvleeAGPvudMHF5aLEYwb490pYVINjlJVZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434669; a=rsa-sha256; cv=none; b=Dkd0OYUKo/RmmfHUKoEwmURUmBrUdGICzPzNzX7ulQoZGzgBP2oqCnjm8yCx/TYIALphTD wgpLKBdVDg11t+X2EkcX/t6Gd0SRzYh3UnUJnvzPTnPpfGsScjo2rIiy2jZYauVSUxmPIz tC6R1EAv/0hsBhwD6+kE5i7HZxXwusbJ9kLq0FGTydloKlZ8DE/vR9VhX1lh+BqxYlx37s bePShCyIkhNN+RjJLEq89EEilP2QUyPFc9UxM+ADaQdiUD2/ocAE+KDW3/P/grtyV9zlwc OhSpj0rbwpf0KYCTaD4iuNvf/OCK7USTLMWxoQ3Op8uotWvfMaaXBvSBX6HHsw== 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=1712434669; 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=Is7Dfo5uYXyrbITwlV0SUxxhiezyCSLI+phzRBD205U=; b=ItviWI0Pf/NF5u/1I4OX1bVtnL0ZiTyXU489bzV0fMDsm/U8gcyL+AEWGi9eFNm2xaoEWv a1es97X1gNHC1V2BIpuCOrsWpqqKpojOZ2+E3fyPKPcp5afG253vPMyeaOfUKbcH4YIP5e 85Wp2gZP3RJNkptOzYwMm9YV0PACjgNWWoPBFzMJt8fBWabV6oP3m8QRgh1almo8Q9yn6i kkG8kij4SI40rc/dHy3apDD59YgN9awJ4c8qaHVnK3H30oQsLvXNSKCW6XEHSqZ5yLqXFV DG3m+1Dn2C8KNyphRumX/WIp2Kep8Zpgjqtdvf7T9vcx1mhM6FmIyIFsSi5TmQ== 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 4VBmqx0bXFzxrM; Sat, 6 Apr 2024 20:17:49 +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 436KHmhH029529; Sat, 6 Apr 2024 20:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHm36029526; Sat, 6 Apr 2024 20:17:48 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:48 GMT Message-Id: <202404062017.436KHm36029526@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: 653487bbc800 - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 653487bbc8006839d0895811942bb8a2fcdd5aa8 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=653487bbc8006839d0895811942bb8a2fcdd5aa8 commit 653487bbc8006839d0895811942bb8a2fcdd5aa8 Author: Dimitry Andric AuthorDate: 2024-01-07 16:03:13 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:24 +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 --- 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"