From 653487bbc8006839d0895811942bb8a2fcdd5aa8 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 7 Jan 2024 17:03:13 +0100 Subject: [PATCH] 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 40e6da8bc03..f52fb044129 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" -- 2.45.0