pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lldb-netbsd: Revamp llvm::once_flag initialization



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Feb 5 04:06:18 2017 +0100
Changeset:	ce7cb673b3f8c4190d98bca7e2d043fee3c5ea60

Modified Files:
	lldb-netbsd/distinfo
	lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
	lldb-netbsd/patches/patch-source_Core_ModuleList.cpp
	lldb-netbsd/patches/patch-source_Host_common_Editline.cpp
	lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp
	lldb-netbsd/patches/patch-source_Host_linux_HostInfoLinux.cpp
	lldb-netbsd/patches/patch-source_Host_windows_HostInfoWindows.cpp
	lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
	lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
	lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
	lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
	lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
	lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
	lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
	lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
	lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
	lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
	lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp
	lldb-netbsd/patches/patch-source_Symbol_GoASTContext.cpp
	lldb-netbsd/patches/patch-source_Target_Language.cpp
	lldb-netbsd/patches/patch-source_Utility_ConstString.cpp
	lldb-netbsd/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp

Log Message:
lldb-netbsd: Revamp llvm::once_flag initialization

Catch up after upstream.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ce7cb673b3f8c4190d98bca7e2d043fee3c5ea60

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-netbsd/distinfo                               | 64 +++++++++++-----------
 ...patch-source_Commands_CommandObjectPlatform.cpp |  2 +-
 .../patches/patch-source_Core_ModuleList.cpp       |  2 +-
 .../patches/patch-source_Host_common_Editline.cpp  |  2 +-
 .../patch-source_Host_common_HostInfoBase.cpp      | 28 +++++-----
 .../patch-source_Host_linux_HostInfoLinux.cpp      | 18 ++++++
 .../patch-source_Host_windows_HostInfoWindows.cpp  |  2 +-
 ...pressionParser_Clang_ClangModulesDeclVendor.cpp |  2 +-
 ...lugins_Language_CPlusPlus_CPlusPlusLanguage.cpp |  6 +-
 ...patch-source_Plugins_Language_Go_GoLanguage.cpp |  4 +-
 ...h-source_Plugins_Language_Java_JavaLanguage.cpp |  2 +-
 ...h-source_Plugins_Language_ObjC_ObjCLanguage.cpp |  2 +-
 ...gins_Platform_MacOSX_PlatformAppleSimulator.cpp |  2 +-
 ...urce_Plugins_Platform_MacOSX_PlatformDarwin.cpp |  4 +-
 ...urce_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp |  2 +-
 ...ce_Plugins_Process_Linux_NativeProcessLinux.cpp |  2 +-
 ...ce_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp |  2 +-
 ...ource_Plugins_Process_POSIX_ProcessPOSIXLog.cpp |  2 +-
 ...ugins_Process_Windows_Common_ProcessWindows.cpp |  2 +-
 ...rce_Plugins_Process_elf-core_ProcessElfCore.cpp |  2 +-
 ...remote_GDBRemoteCommunicationServerPlatform.cpp |  2 +-
 ...Plugins_Process_gdb-remote_ProcessGDBRemote.cpp |  2 +-
 ...gins_Process_gdb-remote_ProcessGDBRemoteLog.cpp |  2 +-
 ...e_Plugins_Process_mach-core_ProcessMachCore.cpp |  2 +-
 ...ce_Plugins_Process_minidump_ProcessMinidump.cpp |  2 +-
 ...criptInterpreter_None_ScriptInterpreterNone.cpp |  2 +-
 ...tInterpreter_Python_ScriptInterpreterPython.cpp |  2 +-
 ...ce_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp |  8 ++-
 .../patch-source_Symbol_ClangASTContext.cpp        |  4 +-
 .../patches/patch-source_Symbol_GoASTContext.cpp   |  2 +-
 .../patches/patch-source_Target_Language.cpp       |  4 +-
 .../patches/patch-source_Utility_ConstString.cpp   |  2 +-
 ..._source_MacOSX_DarwinLog_DarwinLogCollector.cpp |  2 +-
 33 files changed, 105 insertions(+), 83 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index adefd2a3c9..7d4f668cbc 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -16,52 +16,52 @@ SHA1 (patch-cmake_LLDBDependencies.cmake) = 2577a759167675d3a89915bebad05c815979
 SHA1 (patch-include_lldb_Core_Debugger.h) = b7317cec334b7ace74f288fc76992958ac0ec2d1
 SHA1 (patch-include_lldb_Host_netbsd_HostThreadNetBSD.h) = 79f207cdb9da2ef57d39eeb307ec6d10cf828925
 SHA1 (patch-source_CMakeLists.txt) = 5dacabc3f39c23bdfd432b5a4895866157b97aa0
-SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = 63bea8439489648d2719d6173812867c3e4aa618
+SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = dea62af88752f32e07c495ef19b4b56762a6a97a
 SHA1 (patch-source_Core_Debugger.cpp) = 3124999e93329392df332580bd4130c329225427
-SHA1 (patch-source_Core_ModuleList.cpp) = ff470cfe29d4702d5be6c5a096d5a8db700547e7
-SHA1 (patch-source_Host_common_Editline.cpp) = 5c6aa92ae3e83476ae6cdf74c54db175ba8cac88
+SHA1 (patch-source_Core_ModuleList.cpp) = 0159d567b88eb87612ca0822ea4d55c71c34df88
+SHA1 (patch-source_Host_common_Editline.cpp) = 1d855e30315a99fa9d1205a78a643ed366e20c07
 SHA1 (patch-source_Host_common_Host.cpp) = 7d48b8bb1e4350ba6d3ddc6357b9b8dc82d6b32d
-SHA1 (patch-source_Host_common_HostInfoBase.cpp) = 74215c4c46ea96f32bca20eb52967a73318700e3
+SHA1 (patch-source_Host_common_HostInfoBase.cpp) = c2a5d2b5b8906be080343683d3897df67003b9a6
 SHA1 (patch-source_Host_common_NativeProcessProtocol.cpp) = 23cc7da280b2123cf0206f3d5660d2647935edbc
-SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = efa27e26e57b9fb8b2153b177c7f4f2ffd195243
+SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = 3c90c4d29e2866d45cc5da25721891a82d4d1cec
 SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = a1b0fbdad062309a845cfefe4469614fbbe9d20e
 SHA1 (patch-source_Host_netbsd_ThisThread.cpp) = f0d32c81bc1b8fe9aeb86519ea46ba2cb16571c2
-SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = 3ae5729ed6a9a79f47fb63cc54e464760d0e2ac7
+SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = c4d7feb9a4fbd1cbe8e22e99e442ccb2cba03c42
 SHA1 (patch-source_Initialization_SystemInitializerCommon.cpp) = 80c850b980fe2902f10e441df7a18f428dd1154a
-SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = 0405684c5440935d78451725383fb1ca47ec7c78
-SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = 4fa921eaffa2750cebe46ac52817b46739d0d1d5
-SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = 5f498c648f06535c2a2f80d8bf1c2ee40c782a05
-SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = 960b3bc5de14a872a7d4e9e26a3019435ae07e9e
-SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = 018caf2ea5a3b867986a03ae0337c3ced01fe040
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp) = 4c7a6d571d194fc767f268a327a2d4bef8bde0de
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = 75b5190bec7299b59083f73af9b5f97df0cbde2a
+SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = 7342bcf1155f975e9b5b2b6e3ee0eca074fb273f
+SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = 95ce17781a61a8649227f2c24e24fe39158065af
+SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = 98254e714dd77ae44c94c41d8cade812a7cb9484
+SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = 1b27fb6081dbe24c1a9d96611ec782adab7a8f2f
+SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = fe708ec744784191cff5c128cfba733951c885c1
+SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp) = a6da3097b3e3ee53112c3fe2b934aa65652b2aa2
+SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = 10d44e6bc73944677274669b91a740521b35f80e
 SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 347acfd6a40de060a950dcec4c67467a01d73fcc
 SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h) = 3cf5ac4116e42610b32cf2fb446713cf1208ef53
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c689ff4ec455234f8d506dc9eb8e0ed7f750d426
-SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = 49c782a47840578716009abf3093cba731551bb9
-SHA1 (patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp) = 9d7ec5c7cb34120814d9cd2b039f2f64aa3c1451
-SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = d6162941eba2011128b5db1aa50f0aa4983a45e5
+SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = 294baa209d9050c44a00cade9f2eede7c0f34eae
+SHA1 (patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp) = 7b4813954ae7e32a544d038ab83db2a4b8eb5883
+SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = 7b405517c2e828eb85ec9997f8f3cda0231fd94e
 SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = 483584dad2dba01dccd065435a5d75eedf11b3c6
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = af6aceac694ed5c94538a6851e8d7f85a0726709
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = c48bb2dd45682164ab904b8b3f7664b91ac35d5b
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp) = 4369b37e51c367787a12c7f935a8f5daf274841e
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h) = 22e5c436baea68b38058c8387318d08c7a43c149
-SHA1 (patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp) = 8821c2c0a64e43cbb80434ab3a2ed91d33607c3a
-SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp) = cb664f5faf4449c9e26bf06399da27732ece3c44
+SHA1 (patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp) = 77e83b70a578438755c963984298d7bd5d4219a0
+SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp) = 9cea9007b3cefa8a7c4530d491431bb0160df987
 SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp) = 4f5bcdab8258ed899ecbcacacb61b02250a6f1d7
-SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = 00c84d42a1a177f6e5059f7e8ce4a9e8d254bc5a
-SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = 7d36e6e4baf1e4eb2da72c91dd3c3d5608d1ff3b
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = e03b0010b08c662016289b74dd518ba013301f1b
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = 69386fbf89dfa55ca90d024b648a8b7cb7bd5ca5
-SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = 80aa50ca12dd3fd55039da7c7cd42cf0660e39c8
-SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = 0f275d25be7db7f38bfcf55fad6690507be20ffd
-SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = db75b4162b7a2fd5df64f8cd98da71d6d5b6b43e
-SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = 291e3b9b9b36ff58d9885616ad0d57e6965173a2
-SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = 9858932e20d0e0e7cd9030dd7f5ec265d5eb7f40
+SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = 158bf7a886f3156c13154b9ef7098f3147bc91d4
+SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = 1d85104d260da7e8db6827039fb39ba577a50bd6
+SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = 6c1efa00af6825446bebdc31bde1a77ee7c16199
+SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = 3f4207e07fbc2592bd010965687e76a55b389fe8
+SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = 1b3c5e85413e5516ed810e713f4be65313c0d6a1
+SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = 1ed1584e4e44d58bb5dd591817a131d92a764c50
+SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = 495838b9a4bf4c925ac8dac41e1c3397865e3d71
+SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = 4e1ffccfe0cfdf60e161297d14c4333616037e7f
+SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = 3c4faec58ba009c75c75f426b457398e2eac044f
 SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h) = bf7700554b950064706d6bb4f96e4d1f13e08bf7
-SHA1 (patch-source_Symbol_ClangASTContext.cpp) = 051af87aef7f26b025f1a3ce49b0999f43a10b47
-SHA1 (patch-source_Symbol_GoASTContext.cpp) = f6ea8faca07b6ac41e9d42341ed0f56b33ebfb7c
-SHA1 (patch-source_Target_Language.cpp) = 6cc1acc02ad0fbfc0a645dbca0ac763a474bd120
-SHA1 (patch-source_Utility_ConstString.cpp) = 2af56d90458de32963a1c3c01cc5018a008ce422
-SHA1 (patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp) = fb52ca3a5f1aa6763b689c1692718248ad871c6f
+SHA1 (patch-source_Symbol_ClangASTContext.cpp) = 54e3d440145d614e8391402903f01bb2f832e363
+SHA1 (patch-source_Symbol_GoASTContext.cpp) = 766ddc8aff2f8d544cad9f4ba63583ea34f807bf
+SHA1 (patch-source_Target_Language.cpp) = d23b0751f0e91c27268a3a97caa96aaff50170aa
+SHA1 (patch-source_Utility_ConstString.cpp) = ac2f3f642f71dce7626fc1fbd317416194b0207b
+SHA1 (patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp) = cc7175484f5a59f69d8cabaa349ba05fe45d86a4
 SHA1 (patch-tools_lldb-server_CMakeLists.txt) = 7a25edbff78d8091fa907b01c2c01c3e51579c15
diff --git a/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp b/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
index 92d80923af..6d7c8d854e 100644
--- a/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
+++ b/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
@@ -16,7 +16,7 @@ $NetBSD$
          : Options(), match_info(), show_args(false), verbose(false) {
 -      static std::once_flag g_once_flag;
 -      std::call_once(g_once_flag, []() {
-+      LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++      static llvm::once_flag g_once_flag;
 +      llvm::call_once(g_once_flag, []() {
          PosixPlatformCommandOptionValidator *posix_validator =
              new PosixPlatformCommandOptionValidator();
diff --git a/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp b/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp
index 1d145f7b33..680c07f710 100644
--- a/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp
+++ b/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp
@@ -17,7 +17,7 @@ $NetBSD$
    static ModuleList *g_shared_module_list = nullptr;
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      // NOTE: Intentionally leak the module list so a program doesn't have to
      // cleanup all modules and object files as it exits. This just wastes time
diff --git a/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp b/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp
index c47872d895..dfaec5aca1 100644
--- a/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp
+++ b/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp
@@ -17,7 +17,7 @@ $NetBSD$
        static std::set<int> *g_init_terminal_fds_ptr = nullptr;
 -      static std::once_flag g_once_flag;
 -      std::call_once(g_once_flag, [&]() {
-+      LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++      static llvm::once_flag g_once_flag;
 +      llvm::call_once(g_once_flag, [&]() {
          g_init_terminal_fds_mutex_ptr =
              new std::mutex(); // NOTE: Leak to avoid C++ destructor chain issues
diff --git a/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp b/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp
index 7e811ebf8c..fd3b07f6e0 100644
--- a/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp
+++ b/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp
@@ -20,7 +20,7 @@ $NetBSD$
  uint32_t HostInfoBase::GetNumberCPUS() {
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      g_fields->m_number_cpus = std::thread::hardware_concurrency();
    });
@@ -31,7 +31,7 @@ $NetBSD$
  llvm::StringRef HostInfoBase::GetVendorString() {
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      g_fields->m_vendor_string =
          HostInfo::GetArchitecture().GetTriple().getVendorName().str();
@@ -42,7 +42,7 @@ $NetBSD$
  llvm::StringRef HostInfoBase::GetOSString() {
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      g_fields->m_os_string =
          std::move(HostInfo::GetArchitecture().GetTriple().getOSName());
@@ -53,7 +53,7 @@ $NetBSD$
  llvm::StringRef HostInfoBase::GetTargetTriple() {
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      g_fields->m_host_triple =
          HostInfo::GetArchitecture().GetTriple().getTriple();
@@ -64,7 +64,7 @@ $NetBSD$
  const ArchSpec &HostInfoBase::GetArchitecture(ArchitectureKind arch_kind) {
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      HostInfo::ComputeHostArchitectureSupport(g_fields->m_host_arch_32,
                                               g_fields->m_host_arch_64);
@@ -74,7 +74,7 @@ $NetBSD$
    switch (type) {
    case lldb::ePathTypeLLDBShlibDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -86,7 +86,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeSupportExecutableDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -98,7 +98,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeHeaderDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -110,7 +110,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypePythonDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -122,7 +122,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeClangDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -134,7 +134,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeLLDBSystemPlugins: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -146,7 +146,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeLLDBUserPlugins: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -158,7 +158,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeLLDBTempSystemDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
@@ -170,7 +170,7 @@ $NetBSD$
    } break;
    case lldb::ePathTypeGlobalLLDBTempSystemDir: {
 -    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
      static bool success = false;
 -    std::call_once(g_once_flag, []() {
 +    llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Host_linux_HostInfoLinux.cpp b/lldb-netbsd/patches/patch-source_Host_linux_HostInfoLinux.cpp
index 020a9f30da..8419d6e8e5 100644
--- a/lldb-netbsd/patches/patch-source_Host_linux_HostInfoLinux.cpp
+++ b/lldb-netbsd/patches/patch-source_Host_linux_HostInfoLinux.cpp
@@ -11,3 +11,21 @@ $NetBSD$
  #include <limits.h>
  #include <stdio.h>
  #include <string.h>
+@@ -44,7 +46,7 @@ uint32_t HostInfoLinux::GetMaxThreadName
+ bool HostInfoLinux::GetOSVersion(uint32_t &major, uint32_t &minor,
+                                  uint32_t &update) {
+   static bool success = false;
+-  static std::once_flag g_once_flag;
++  static llvm::once_flag g_once_flag;
+   std::call_once(g_once_flag, []() {
+ 
+     struct utsname un;
+@@ -100,7 +102,7 @@ bool HostInfoLinux::GetOSKernelDescripti
+ llvm::StringRef HostInfoLinux::GetDistributionId() {
+   // Try to run 'lbs_release -i', and use that response
+   // for the distribution id.
+-  static std::once_flag g_once_flag;
++  static llvm::once_flag g_once_flag;
+   std::call_once(g_once_flag, []() {
+ 
+     Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST));
diff --git a/lldb-netbsd/patches/patch-source_Host_windows_HostInfoWindows.cpp b/lldb-netbsd/patches/patch-source_Host_windows_HostInfoWindows.cpp
index 99079cc774..6987451872 100644
--- a/lldb-netbsd/patches/patch-source_Host_windows_HostInfoWindows.cpp
+++ b/lldb-netbsd/patches/patch-source_Host_windows_HostInfoWindows.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  FileSpec HostInfoWindows::GetProgramFileSpec() {
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      std::vector<wchar_t> buffer(PATH_MAX);
      ::GetModuleFileNameW(NULL, buffer.data(), buffer.size());
diff --git a/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp b/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
index a119ced7cd..2a8402ea92 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
@@ -15,7 +15,7 @@ $NetBSD$
    static FileSpec g_cached_resource_dir;
  
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
index 56dfcf863a..08d12a26ea 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  
  lldb::TypeCategoryImplSP CPlusPlusLanguage::GetFormatters() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static TypeCategoryImplSP g_category;
  
 -  std::call_once(g_initialize, [this]() -> void {
@@ -28,7 +28,7 @@ $NetBSD$
  HardcodedFormatters::HardcodedSummaryFinder
  CPlusPlusLanguage::GetHardcodedSummaries() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static ConstString g_vectortypes("VectorTypes");
    static HardcodedFormatters::HardcodedSummaryFinder g_formatters;
  
@@ -42,7 +42,7 @@ $NetBSD$
  HardcodedFormatters::HardcodedSyntheticFinder
  CPlusPlusLanguage::GetHardcodedSynthetics() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static ConstString g_vectortypes("VectorTypes");
    static HardcodedFormatters::HardcodedSyntheticFinder g_formatters;
  
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
index 6c0e4ffc61..04a8373c58 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  HardcodedFormatters::HardcodedSummaryFinder
  GoLanguage::GetHardcodedSummaries() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static HardcodedFormatters::HardcodedSummaryFinder g_formatters;
  
 -  std::call_once(g_initialize, []() -> void {
@@ -28,7 +28,7 @@ $NetBSD$
  HardcodedFormatters::HardcodedSyntheticFinder
  GoLanguage::GetHardcodedSynthetics() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static HardcodedFormatters::HardcodedSyntheticFinder g_formatters;
  
 -  std::call_once(g_initialize, []() -> void {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
index 15b5997446..fbdeff92c8 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  
  lldb::TypeCategoryImplSP JavaLanguage::GetFormatters() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static TypeCategoryImplSP g_category;
  
 -  std::call_once(g_initialize, [this]() -> void {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
index 842183a9e2..e5d5f21d54 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  
  lldb::TypeCategoryImplSP ObjCLanguage::GetFormatters() {
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
    static TypeCategoryImplSP g_category;
  
 -  std::call_once(g_initialize, [this]() -> void {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp b/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
index d57ccd764b..80b2661f18 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
@@ -8,7 +8,7 @@ $NetBSD$
  #if defined(__APPLE__)
 -  static std::once_flag g_load_core_sim_flag;
 -  std::call_once(g_load_core_sim_flag, [this] {
-+  LLVM_DEFINE_ONCE_FLAG(g_load_core_sim_flag);
++  static llvm::once_flag g_load_core_sim_flag;
 +  llvm::call_once(g_load_core_sim_flag, [this] {
      const std::string core_sim_path(GetCoreSimulatorPath().GetPath());
      if (core_sim_path.size())
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp b/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
index cbb83e76d1..913474d65e 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
@@ -16,7 +16,7 @@ $NetBSD$
    static FileSpec g_xcode_filespec;
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
  
      FileSpec fspec;
@@ -27,7 +27,7 @@ $NetBSD$
    // executables once so we don't keep doing the work over and over.
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
  
      // When locating executables, trust the DEVELOPER_DIR first if it is set
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
index ac07227a80..118e39eb9b 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  
  void ProcessFreeBSD::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
index 12c54c7173..2defddd734 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
@@ -7,7 +7,7 @@ $NetBSD$
  static bool ProcessVmReadvSupported() {
    static bool is_supported;
 -  static std::once_flag flag;
-+  LLVM_DEFINE_ONCE_FLAG(flag);
++  static llvm::once_flag flag;
  
 -  std::call_once(flag, [] {
 +  llvm::call_once(flag, [] {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
index 1d8b06e861..8261abc5da 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  
  void ProcessKDP::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
index 84679841ca..8a0aeb2ea7 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  
  void ProcessPOSIXLog::Initialize(ConstString name) {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, [name]() {
 +  llvm::call_once(g_once_flag, [name]() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
index 8d29862cca..9b02dabaa9 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  
  void ProcessWindows::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
index 4c8e83e0c8..cd29647aa5 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  
  void ProcessElfCore::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
index d70d976097..c07a6208e8 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  const FileSpec &GDBRemoteCommunicationServerPlatform::GetDomainSocketDir() {
    static FileSpec g_domainsocket_dir;
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
index f93ddb0083..41db4cab3d 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  
  void ProcessGDBRemote::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
index 8dc47a9d92..7e34a3691c 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  void ProcessGDBRemoteLog::Initialize() {
    static ConstString g_name("gdb-remote");
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
index d850547c66..907f8aff5e 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  
  void ProcessMachCore::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
index 136a4026fb..9a51949fc6 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  
  void ProcessMinidump::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp b/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
index eec3444614..1c9bf5072b 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  
  void ScriptInterpreterNone::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp b/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
index 34ef8bb9d6..cb11b4dab9 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
@@ -7,7 +7,7 @@ $NetBSD$
  
  void ScriptInterpreterPython::Initialize() {
 -  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
  
 -  std::call_once(g_once_flag, []() {
 +  llvm::call_once(g_once_flag, []() {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp b/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
index 27050162d5..8c666fc42e 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
@@ -10,17 +10,21 @@ $NetBSD$
  
  #include "lldb/Core/ArchSpec.h"
  #include "lldb/Core/Module.h"
-@@ -553,8 +554,11 @@ uint32_t SymbolFileDWARF::CalculateAbili
+@@ -553,8 +554,16 @@ uint32_t SymbolFileDWARF::CalculateAbili
  const DWARFDataExtractor &
  SymbolFileDWARF::GetCachedSectionData(lldb::SectionType sect_type,
                                        DWARFDataSegment &data_segment) {
 -  std::call_once(data_segment.m_flag, &SymbolFileDWARF::LoadSectionData, this,
--                 sect_type, std::ref(data_segment.m_data));
++#if 0
++  llvm::call_once(data_segment.m_flag, &SymbolFileDWARF::LoadSectionData, this,
+                  sect_type, std::ref(data_segment.m_data));
++#else
 +  llvm::call_once(data_segment.m_flag,
 +    [this, sect_type, &data_segment] {
 +      this->LoadSectionData(sect_type, std::ref(data_segment.m_data));
 +    }
 +  );
++#endif
    return data_segment.m_data;
  }
  
diff --git a/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp b/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp
index 9c5b853218..4e3af1710e 100644
--- a/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp
+++ b/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp
@@ -25,7 +25,7 @@ $NetBSD$
    static ClangASTMap *g_map_ptr = nullptr;
 -  static std::once_flag g_once_flag;
 -  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++  static llvm::once_flag g_once_flag;
 +  llvm::call_once(g_once_flag, []() {
      g_map_ptr = new ClangASTMap(); // leaked on purpose to avoid spins
    });
@@ -36,7 +36,7 @@ $NetBSD$
      static TypeNameToBasicTypeMap g_type_map;
 -    static std::once_flag g_once_flag;
 -    std::call_once(g_once_flag, []() {
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
 +    llvm::call_once(g_once_flag, []() {
        // "void"
        g_type_map.Append(ConstString("void").GetStringRef(), eBasicTypeVoid);
diff --git a/lldb-netbsd/patches/patch-source_Symbol_GoASTContext.cpp b/lldb-netbsd/patches/patch-source_Symbol_GoASTContext.cpp
index 8dd0486a5e..385aa47748 100644
--- a/lldb-netbsd/patches/patch-source_Symbol_GoASTContext.cpp
+++ b/lldb-netbsd/patches/patch-source_Symbol_GoASTContext.cpp
@@ -17,7 +17,7 @@ $NetBSD$
      static TypeNameToBasicTypeMap g_type_map;
 -    static std::once_flag g_once_flag;
 -    std::call_once(g_once_flag, []() {
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
++    static llvm::once_flag g_once_flag;
 +    llvm::call_once(g_once_flag, []() {
        // "void"
        g_type_map.Append(ConstString("void").GetStringRef(), eBasicTypeVoid);
diff --git a/lldb-netbsd/patches/patch-source_Target_Language.cpp b/lldb-netbsd/patches/patch-source_Target_Language.cpp
index d7b4c5c14d..85ea770237 100644
--- a/lldb-netbsd/patches/patch-source_Target_Language.cpp
+++ b/lldb-netbsd/patches/patch-source_Target_Language.cpp
@@ -16,7 +16,7 @@ $NetBSD$
  static LanguagesMap &GetLanguagesMap() {
    static LanguagesMap *g_map = nullptr;
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
  
 -  std::call_once(g_initialize, [] {
 +  llvm::call_once(g_initialize, [] {
@@ -28,7 +28,7 @@ $NetBSD$
  static std::mutex &GetLanguagesMutex() {
    static std::mutex *g_mutex = nullptr;
 -  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
++  static llvm::once_flag g_initialize;
  
 -  std::call_once(g_initialize, [] {
 +  llvm::call_once(g_initialize, [] {
diff --git a/lldb-netbsd/patches/patch-source_Utility_ConstString.cpp b/lldb-netbsd/patches/patch-source_Utility_ConstString.cpp
index 2d01bc4528..923481b964 100644
--- a/lldb-netbsd/patches/patch-source_Utility_ConstString.cpp
+++ b/lldb-netbsd/patches/patch-source_Utility_ConstString.cpp
@@ -15,7 +15,7 @@ $NetBSD$
  //----------------------------------------------------------------------
  static Pool &StringPool() {
 -  static std::once_flag g_pool_initialization_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_pool_initialization_flag);
++  static llvm::once_flag g_pool_initialization_flag;
    static Pool *g_string_pool = nullptr;
  
 -  std::call_once(g_pool_initialization_flag,
diff --git a/lldb-netbsd/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp b/lldb-netbsd/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp
index c0b0930d22..75f2236866 100644
--- a/lldb-netbsd/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp
+++ b/lldb-netbsd/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp
@@ -7,7 +7,7 @@ $NetBSD$
  
  bool LookupSPICalls() {
 -  static std::once_flag s_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(s_once_flag);
++  static llvm::once_flag s_once_flag;
    static bool s_has_spi;
  
 -  std::call_once(s_once_flag, [] {



Home | Main Index | Thread Index | Old Index