Toolchain: Update LLVM to 20.1.0

Recently, LLVM refactored the way locale support is implemented, which
means that the old way in which we stubbed that out no longer works, as
the base implementations now expects far greater locale support than
what we have. To work around that, we now use the same built-in locale
implementation as z/OS does, which appears to work with fairly minimal
changes.

Author: implicitfield

CMakeLists.txt

@@ -18,7 +18,7 @@ endif()
 
 # Check for toolchain mismatch, user might need to rebuild toolchain
 set(GCC_VERSION "13.2.0")
-set(LLVM_VERSION "19.1.0")
+set(LLVM_VERSION "20.1.0")
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(EXPECTED_COMPILER_VERSION "${GCC_VERSION}")
 else()

Ports/AvailablePorts.md

@@ -192,7 +192,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`libzip`](libzip/)                           | libzip                                                        | 1.10.1                   | https://libzip.org/                                                  |
 | [`links`](links/)                             | Links web browser                                             | 2.29                     | http://links.twibright.com/                                          |
 | [`lite-xl`](lite-xl/)                         | Lite-XL                                                       | 2.1.3                    | https://lite-xl.com/                                                 |
-| [`llvm`](llvm/)                               | LLVM                                                          | 19.1.0                   | https://llvm.org/                                                    |
+| [`llvm`](llvm/)                               | LLVM                                                          | 20.1.0                   | https://llvm.org/                                                    |
 | [`lolcat`](lolcat/)                           | lolcat                                                        | 1212a9c                  | https://github.com/jaseg/lolcat/                                     |
 | [`lowdown`](lowdown/)                         | lowdown                                                       | 1.0.2                    | https://kristaps.bsd.lv/lowdown/                                     |
 | [`lrzip`](lrzip/)                             | lrzip                                                         | 0.651                    | https://github.com/ckolivas/lrzip                                    |

Ports/llvm/package.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port='llvm'
 useconfigure='true'
-version='19.1.0'
+version='20.1.0'
 workdir="llvm-project-${version}.src"
 configopts=(
     "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"

Toolchain/BuildClang.sh

@@ -64,8 +64,8 @@ echo PREFIX is "$PREFIX"
 
 mkdir -p "$DIR/Tarballs"
 
-LLVM_VERSION="19.1.0"
-LLVM_MD5SUM="cfecaf29f50dce67836d32ca6b927e1d"
+LLVM_VERSION="20.1.0"
+LLVM_MD5SUM="6d38445b43b3d347daee0423e23bbeec"
 LLVM_NAME="llvm-project-$LLVM_VERSION.src"
 LLVM_PKG="$LLVM_NAME.tar.xz"
 LLVM_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/$LLVM_PKG"

Toolchain/Patches/llvm/0001-clang-Add-support-for-SerenityOS.patch

@@ -43,10 +43,10 @@ Co-authored-by: Dan Klishch <danilklishch@gmail.com>
  create mode 100644 clang/test/Driver/serenity.cpp
 
 diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
-index 29133f9ee8fc..a2c48ce382f2 100644
+index 281aebdb1c35..c9da76cae09b 100644
 --- a/clang/lib/Basic/Targets.cpp
 +++ b/clang/lib/Basic/Targets.cpp
-@@ -166,6 +166,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
+@@ -170,6 +170,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
      case llvm::Triple::OpenBSD:
        return std::make_unique<OpenBSDTargetInfo<AArch64leTargetInfo>>(Triple,
                                                                        Opts);
@@ -56,7 +56,7 @@ index 29133f9ee8fc..a2c48ce382f2 100644
      case llvm::Triple::Win32:
        switch (Triple.getEnvironment()) {
        case llvm::Triple::GNU:
-@@ -463,6 +466,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
+@@ -466,6 +469,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
          return std::make_unique<OHOSTargetInfo<RISCV64TargetInfo>>(Triple,
                                                                     Opts);
        }
@@ -66,7 +66,7 @@ index 29133f9ee8fc..a2c48ce382f2 100644
      default:
        return std::make_unique<RISCV64TargetInfo>(Triple, Opts);
      }
-@@ -586,6 +592,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
+@@ -591,6 +597,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
        return std::make_unique<MCUX86_32TargetInfo>(Triple, Opts);
      case llvm::Triple::Hurd:
        return std::make_unique<HurdTargetInfo<X86_32TargetInfo>>(Triple, Opts);
@@ -76,7 +76,7 @@ index 29133f9ee8fc..a2c48ce382f2 100644
      default:
        return std::make_unique<X86_32TargetInfo>(Triple, Opts);
      }
-@@ -646,6 +655,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
+@@ -654,6 +663,9 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
        return std::make_unique<PS5OSTargetInfo<X86_64TargetInfo>>(Triple, Opts);
      case llvm::Triple::Hurd:
        return std::make_unique<HurdTargetInfo<X86_64TargetInfo>>(Triple, Opts);
@@ -87,10 +87,10 @@ index 29133f9ee8fc..a2c48ce382f2 100644
        return std::make_unique<X86_64TargetInfo>(Triple, Opts);
      }
 diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h
-index 5f27c3469f86..854fd14cb39b 100644
+index 991efd2bde01..0b67528245fd 100644
 --- a/clang/lib/Basic/Targets/OSTargets.h
 +++ b/clang/lib/Basic/Targets/OSTargets.h
-@@ -1001,6 +1001,23 @@ public:
+@@ -1040,6 +1040,23 @@ public:
    }
  };
 
@@ -115,7 +115,7 @@ index 5f27c3469f86..854fd14cb39b 100644
  } // namespace clang
  #endif // LLVM_CLANG_LIB_BASIC_TARGETS_OSTARGETS_H
 diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
-index 32a4378ab499..7aab8da3b0e4 100644
+index 5bdb6614389c..0b147a4754db 100644
 --- a/clang/lib/Driver/CMakeLists.txt
 +++ b/clang/lib/Driver/CMakeLists.txt
 @@ -75,6 +75,7 @@ add_clang_library(clangDriver
@@ -125,20 +125,20 @@ index 32a4378ab499..7aab8da3b0e4 100644
 +  ToolChains/Serenity.cpp
    ToolChains/Solaris.cpp
    ToolChains/SPIRV.cpp
-   ToolChains/TCE.cpp
+   ToolChains/SPIRVOpenMP.cpp
 diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
-index 8e44d5afa40e..1cea1f1138d1 100644
+index 87855fdb7997..2549f5940ff4 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
-@@ -43,6 +43,7 @@
- #include "ToolChains/PS4CPU.h"
- #include "ToolChains/RISCVToolchain.h"
+@@ -45,6 +45,7 @@
  #include "ToolChains/SPIRV.h"
+ #include "ToolChains/SPIRVOpenMP.h"
+ #include "ToolChains/SYCL.h"
 +#include "ToolChains/Serenity.h"
  #include "ToolChains/Solaris.h"
  #include "ToolChains/TCE.h"
- #include "ToolChains/VEToolchain.h"
-@@ -6398,6 +6399,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
+ #include "ToolChains/UEFI.h"
+@@ -6663,6 +6664,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
      case llvm::Triple::Fuchsia:
        TC = std::make_unique<toolchains::Fuchsia>(*this, Target, Args);
        break;
@@ -149,10 +149,10 @@ index 8e44d5afa40e..1cea1f1138d1 100644
        TC = std::make_unique<toolchains::Solaris>(*this, Target, Args);
        break;
 diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index 20a555afb809..0f9c4694e7c7 100644
+index acf9d264d631..5653b07368c4 100644
 --- a/clang/lib/Driver/ToolChain.cpp
 +++ b/clang/lib/Driver/ToolChain.cpp
-@@ -613,6 +613,8 @@ StringRef ToolChain::getOSLibName() const {
+@@ -702,6 +702,8 @@ StringRef ToolChain::getOSLibName() const {
      return "sunos";
    case llvm::Triple::AIX:
      return "aix";
@@ -161,7 +161,7 @@ index 20a555afb809..0f9c4694e7c7 100644
    default:
      return getOS();
    }
-@@ -1128,7 +1130,8 @@ ToolChain::UnwindLibType ToolChain::GetUnwindLibType(
+@@ -1225,7 +1227,8 @@ ToolChain::UnwindLibType ToolChain::GetUnwindLibType(
    else if (LibName == "platform" || LibName == "") {
      ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args);
      if (RtLibType == ToolChain::RLT_CompilerRT) {
@@ -476,17 +476,17 @@ index 000000000000..2a1f685cb662
 +
 +#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_SERENITY_H
 diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp
-index 2218db15013d..36a6cd6425dd 100644
+index bb2a21356fa8..6a8922661285 100644
 --- a/clang/lib/Lex/InitHeaderSearch.cpp
 +++ b/clang/lib/Lex/InitHeaderSearch.cpp
-@@ -304,6 +304,7 @@ bool InitHeaderSearch::ShouldAddDefaultIncludePaths(
+@@ -300,6 +300,7 @@ bool InitHeaderSearch::ShouldAddDefaultIncludePaths(
    case llvm::Triple::PS4:
    case llvm::Triple::PS5:
    case llvm::Triple::RTEMS:
 +  case llvm::Triple::Serenity:
    case llvm::Triple::Solaris:
+   case llvm::Triple::UEFI:
    case llvm::Triple::WASI:
-   case llvm::Triple::ZOS:
 diff --git a/clang/test/Driver/Inputs/serenity_x86_64_tree/usr/include/c++/v1/.keep b/clang/test/Driver/Inputs/serenity_x86_64_tree/usr/include/c++/v1/.keep
 new file mode 100644
 index 000000000000..e69de29bb2d1

Toolchain/Patches/llvm/0002-llvm-Add-support-for-building-LLVM-on-SerenityOS.patch

@@ -25,10 +25,10 @@ Co-Authored-By: Tim Schumacher <timschumi@gmx.de>
  6 files changed, 20 insertions(+), 5 deletions(-)
 
 diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
-index 5ca580fbb59c..a7fe41b0ab06 100644
+index 5db06ccdadbe..e82cda307ddf 100644
 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake
 +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
-@@ -534,6 +534,9 @@ elseif(MINGW OR CYGWIN)
+@@ -550,6 +550,9 @@ elseif(MINGW OR CYGWIN)
    if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
      append("-Wa,-mbig-obj" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
    endif()
@@ -52,10 +52,10 @@ index c42b5e686bdc..ad4ad534f40c 100644
  #elif defined(_AIX)
  #include <sys/machine.h>
 diff --git a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
-index bba3329e8cc2..81455916a546 100644
+index 944fca000d61..492ceb2d2ece 100644
 --- a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
 +++ b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
-@@ -219,7 +219,8 @@ SharedMemoryMapper::Create(ExecutorProcessControl &EPC, SymbolAddrs SAs) {
+@@ -218,7 +218,8 @@ SharedMemoryMapper::Create(ExecutorProcessControl &EPC, SymbolAddrs SAs) {
 
  void SharedMemoryMapper::reserve(size_t NumBytes,
                                   OnReservedFunction OnReserved) {
@@ -66,10 +66,10 @@ index bba3329e8cc2..81455916a546 100644
    EPC.callSPSWrapperAsync<
        rt::SPSExecutorSharedMemoryMapperServiceReserveSignature>(
 diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
-index f5118c0f2bfa..426497a45a47 100644
+index 4fbf232008c8..579b5c7c40ea 100644
 --- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
 +++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
-@@ -51,7 +51,8 @@ static DWORD getWindowsProtectionFlags(MemProt MP) {
+@@ -50,7 +50,8 @@ static DWORD getWindowsProtectionFlags(MemProt MP) {
 
  Expected<std::pair<ExecutorAddr, std::string>>
  ExecutorSharedMemoryMapperService::reserve(uint64_t Size) {
@@ -80,10 +80,10 @@ index f5118c0f2bfa..426497a45a47 100644
  #if defined(LLVM_ON_UNIX)
 
 diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
-index cf05db546e02..7f60a5d56789 100644
+index 6004e007c0c7..8564c69a28a2 100644
 --- a/llvm/lib/Support/Unix/Path.inc
 +++ b/llvm/lib/Support/Unix/Path.inc
-@@ -112,7 +112,7 @@ typedef uint_t uint;
+@@ -107,7 +107,7 @@ typedef uint_t uint;
  #endif
 
  #if defined(__NetBSD__) || defined(__DragonFly__) || defined(__GNU__) ||       \
@@ -92,7 +92,7 @@ index cf05db546e02..7f60a5d56789 100644
  #define STATVFS_F_FLAG(vfs) (vfs).f_flag
  #else
  #define STATVFS_F_FLAG(vfs) (vfs).f_flags
-@@ -511,6 +511,9 @@ static bool is_local_impl(struct STATVFS &Vfs) {
+@@ -506,6 +506,9 @@ static bool is_local_impl(struct STATVFS &Vfs) {
  #elif defined(__HAIKU__)
    // Haiku doesn't expose this information.
    return false;
@@ -103,10 +103,10 @@ index cf05db546e02..7f60a5d56789 100644
    // statvfs::f_basetype contains a null-terminated FSType name of the mounted
    // target
 diff --git a/llvm/lib/Support/Unix/Program.inc b/llvm/lib/Support/Unix/Program.inc
-index 2742734bb11e..a5fd340a452b 100644
+index 0708df1eed0a..a6103e357593 100644
 --- a/llvm/lib/Support/Unix/Program.inc
 +++ b/llvm/lib/Support/Unix/Program.inc
-@@ -352,7 +352,7 @@ static bool Execute(ProcessInfo &PI, StringRef Program,
+@@ -342,7 +342,7 @@ static bool Execute(ProcessInfo &PI, StringRef Program,
  namespace llvm {
  namespace sys {
 
@@ -115,7 +115,7 @@ index 2742734bb11e..a5fd340a452b 100644
  static pid_t(wait4)(pid_t pid, int *status, int options, struct rusage *usage);
  #elif !defined(__Fuchsia__)
  using ::wait4;
-@@ -395,6 +395,13 @@ pid_t(llvm::sys::wait4)(pid_t pid, int *status, int options,
+@@ -385,6 +385,13 @@ pid_t(llvm::sys::wait4)(pid_t pid, int *status, int options,
  }
  #endif
 

Toolchain/Patches/llvm/0003-tools-Support-building-shared-libLLVM-and-libClang-f.patch

@@ -16,10 +16,10 @@ it, and the ELF sections that store version data would just waste space.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
-index a7fe41b0ab06..b7dd800003c0 100644
+index e82cda307ddf..ffb11803c545 100644
 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake
 +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
-@@ -212,7 +212,7 @@ if(WIN32)
+@@ -222,7 +222,7 @@ if(WIN32)
  elseif(FUCHSIA OR UNIX)
    set(LLVM_ON_WIN32 0)
    set(LLVM_ON_UNIX 1)
@@ -29,15 +29,15 @@ index a7fe41b0ab06..b7dd800003c0 100644
    else()
      set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
 diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt
-index b20ac318e768..d3df0de2f694 100644
+index ede3c5034e04..dcef1e89845d 100644
 --- a/llvm/tools/llvm-shlib/CMakeLists.txt
 +++ b/llvm/tools/llvm-shlib/CMakeLists.txt
-@@ -51,7 +51,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
- 
-     # GNU ld doesn't resolve symbols in the version script.
-     set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
--    if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW)
-+    if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW AND NOT SERENITYOS)
-       # Solaris ld does not accept global: *; so there is no way to version *all* global symbols
-       set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES})
-     endif()
+@@ -57,7 +57,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
+     else()
+       # GNU ld doesn't resolve symbols in the version script.
+       set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
+-      if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW)
++      if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW AND NOT SERENITYOS)
+         # Solaris ld does not accept global: *; so there is no way to version *all* global symbols
+         set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES})
+       endif()

Toolchain/Patches/llvm/0004-compiler-rt-Enable-profile-instrumentation-for-Seren.patch

@@ -9,8 +9,8 @@ enough to linux to use the pre-canned InstrProfiling implementation.
  clang/lib/Driver/ToolChains/Serenity.cpp      |  3 +++
  clang/test/Driver/instrprof-ld.c              | 20 +++++++++++++++++++
  compiler-rt/cmake/config-ix.cmake             |  2 +-
- .../lib/profile/InstrProfilingPlatformLinux.c |  2 +-
- .../lib/profile/InstrProfilingPlatformOther.c |  3 ++-
+ .../lib/profile/InstrProfilingPlatformLinux.c |  3 ++-
+ .../lib/profile/InstrProfilingPlatformOther.c |  2 +-
  5 files changed, 27 insertions(+), 3 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Serenity.cpp b/clang/lib/Driver/ToolChains/Serenity.cpp
@@ -66,42 +66,42 @@ index a96bba4a1e76..4b099da9e2d2 100644
  // RUN:     --target=x86_64-apple-darwin14 -fprofile-instr-generate -fuse-ld=ld \
  // RUN:     -resource-dir=%S/Inputs/resource_dir \
 diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
-index dad557af2ae8..b3c46ae85554 100644
+index cf729c3adb1f..76d42499daf0 100644
 --- a/compiler-rt/cmake/config-ix.cmake
 +++ b/compiler-rt/cmake/config-ix.cmake
-@@ -816,7 +816,7 @@ else()
+@@ -836,7 +836,7 @@ else()
  endif()
 
  if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX|SerenityOS")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX|WASI|Haiku")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX|WASI|Haiku|SerenityOS")
    set(COMPILER_RT_HAS_PROFILE TRUE)
  else()
    set(COMPILER_RT_HAS_PROFILE FALSE)
 diff --git a/compiler-rt/lib/profile/InstrProfilingPlatformLinux.c b/compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
-index b766436497b7..848df63fe0b8 100644
+index 5b230c1b2006..3641479114d6 100644
 --- a/compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
 +++ b/compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
 
- #if defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__) || \
-     (defined(__sun__) && defined(__svr4__)) || defined(__NetBSD__) || \
--    defined(_AIX)
-+    defined(_AIX) || defined(__serenity__)
+ #if defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__) ||      \
+     (defined(__sun__) && defined(__svr4__)) || defined(__NetBSD__) ||          \
+-    defined(_AIX) || defined(__wasm__) || defined(__HAIKU__)
++    defined(_AIX) || defined(__wasm__) || defined(__HAIKU__) ||                \
++    defined(__serenity__)
 
- #if !defined(_AIX)
+ #if !defined(_AIX) && !defined(__wasm__)
  #include <elf.h>
 diff --git a/compiler-rt/lib/profile/InstrProfilingPlatformOther.c b/compiler-rt/lib/profile/InstrProfilingPlatformOther.c
-index aa79a5641cec..e07284e06427 100644
+index 29e570b9fba9..483b836b0a55 100644
 --- a/compiler-rt/lib/profile/InstrProfilingPlatformOther.c
 +++ b/compiler-rt/lib/profile/InstrProfilingPlatformOther.c
-@@ -8,7 +8,8 @@
- 
+@@ -9,7 +9,7 @@
  #if !defined(__APPLE__) && !defined(__linux__) && !defined(__FreeBSD__) &&     \
      !defined(__Fuchsia__) && !(defined(__sun__) && defined(__svr4__)) &&       \
--    !defined(__NetBSD__) && !defined(_WIN32) && !defined(_AIX)
-+    !defined(__NetBSD__) && !defined(_WIN32) && !defined(_AIX) &&              \
-+    !defined(__serenity__)
+     !defined(__NetBSD__) && !defined(_WIN32) && !defined(_AIX) &&              \
+-    !defined(__wasm__) && !defined(__HAIKU__)
++    !defined(__wasm__) && !defined(__HAIKU__) && !defined(__serenity__)
 
  #include <stdlib.h>
  #include <stdio.h>