From c9157d925c489f07ba9c0b2ce47e5149b75969a5 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 18 Dec 2023 21:30:12 +0100 Subject: Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb. PR: 276104 MFC after: 1 month (cherry picked from commit 5f757f3ff9144b609b3c433dfd370cc6bdc191ad) --- contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h') diff --git a/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h b/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h index d4dcd3af447a..360910c48d4f 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h +++ b/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h @@ -28,7 +28,9 @@ enum TBDFlags : unsigned { FlatNamespace = 1U << 0, NotApplicationExtensionSafe = 1U << 1, InstallAPI = 1U << 2, - LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/InstallAPI), + SimulatorSupport = 1U << 3, + OSLibNotForSharedCache = 1U << 4, + LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/OSLibNotForSharedCache), }; // clang-format on @@ -47,7 +49,7 @@ Expected> getInterfaceFileFromJSON(StringRef JSON); Error serializeInterfaceFileToJSON(raw_ostream &OS, const InterfaceFile &File, - bool Compact); + const FileType FileKind, bool Compact); } // namespace MachO namespace yaml { -- cgit v1.2.3