pkgsrc-WIP-changes archive

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

lldb-git: Catch up llvm::once_flag patch with upstream review



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Feb 5 17:51:32 2017 +0100
Changeset:	f76cd6c6c7bdf796010690379315105006898e4f

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

Log Message:
lldb-git: Catch up llvm::once_flag patch with upstream review

https://reviews.llvm.org/D29566

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=f76cd6c6c7bdf796010690379315105006898e4f

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

diffstat:
 lldb-git/distinfo                                  | 66 +++++++++++-----------
 ...patch-source_Commands_CommandObjectPlatform.cpp |  2 +-
 lldb-git/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      |  4 +-
 .../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 +-
 ...ns_Process_Windows_Common_ProcessWindowsLog.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 |  6 +-
 ...ce_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp | 10 ++--
 .../patch-source_Symbol_ClangASTContext.cpp        |  4 +-
 .../patches/patch-source_Symbol_GoASTContext.cpp   |  2 +-
 lldb-git/patches/patch-source_Target_Language.cpp  |  4 +-
 .../patches/patch-source_Utility_ConstString.cpp   |  4 +-
 ..._source_MacOSX_DarwinLog_DarwinLogCollector.cpp |  2 +-
 34 files changed, 92 insertions(+), 94 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 88a5a0218c..4781a48bce 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -13,38 +13,38 @@ SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
 SHA1 (patch-include_lldb_Core_Debugger.h) = 136fc7a23b424adf286a0dced98cece5a423d9af
-SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = a038fecd3ad31bd6a11095ad7f4ac5b92847c78b
+SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = 1dc605c11892b620f00d57fecff5bd779437f712
 SHA1 (patch-source_Core_Debugger.cpp) = affa76051734351b7f9cfa6542f918930949ee38
-SHA1 (patch-source_Core_ModuleList.cpp) = 1dc5f5d9309646f5ca0119bbbd30e8d9c3146c4d
-SHA1 (patch-source_Host_common_Editline.cpp) = e31fbfa6b8a56579c1504c5b09a76cdffcd8a915
-SHA1 (patch-source_Host_common_HostInfoBase.cpp) = 2f34f16d3266f56518c0637ad7e10ce1452f567c
-SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = efd7bbd090b918bb8ddc6edc4e7593cf7c77445b
-SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = b13f2d0401145310198d4f0ed40d7273c95c92dc
-SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = eef9f8a5b4804f62364051a8a0dbbea13c5f4b10
-SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = bb8f0b98167b602822b0f319c10fa115c088e2fa
-SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = 9dcb766d46e213b13d7feda60e00db1853b310d6
-SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = 6010d8f1c7af01433ac310b6284307ba9c0e408e
-SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = a11841320c84dc924999288cd820aadb404f8688
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp) = a9c011f1b4d6f846a5e887816757a834c694d455
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = 034017d75449bda239d4aede8c4a337be62a775c
-SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = e7ca69579e31d3793ac0ba2a85d3cda70e08268e
-SHA1 (patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp) = 883b37dd759954f51c525975eba2895162d6e8d4
-SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = ec95aa1b3ffb2182dd72f962600d317399bc0b26
-SHA1 (patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp) = 9b2c481c12a6a2289af26e933fc7ed6a9286c078
-SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp) = 90db20235357b0b1068e002c359ec5e2ff37d8b8
-SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp) = 71b10e6e61d97077a00be5adb6721db44a395f9f
-SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = 2ce43ac8303884e6f9ab1480264a68b540c05e5d
-SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = 7ae01ae61f8ea49e786c1b64dbdceeba5f48b524
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = 228924bea36bd4de7ce6cb379faa159f1729e529
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = 98952ab28a057b2e3f77904b97795d6f40d55b6a
-SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = a9ce6650ad60ce6d42241919a1310235e689db48
-SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = 5bb3d20526a09a7d22dff4611ca25f79df1fbfc5
-SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = f548c5f9b614eac02f8487dc8ee33bfb5521c013
-SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = fb7f548497fa0eb004b42c7254669c9d86d3abc7
-SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = 4598ffd3d986aca7f1189d8da2d5593b389e6def
+SHA1 (patch-source_Core_ModuleList.cpp) = c215888b1e2a990cce410e8a2afd20e7443f6b1f
+SHA1 (patch-source_Host_common_Editline.cpp) = f6fa3105740bb4f8a0301871368ed05b62cc6cd4
+SHA1 (patch-source_Host_common_HostInfoBase.cpp) = 76417bebe68e7fa0c135949d2215162629942315
+SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = 6b9aa347f8a03c80d0e9ca9722aa477d8bbbcfa6
+SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = 79cccb8394a11b149607c62a92c6fb23852f81cd
+SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = 7f30b2fa0476f03901a123fb9345a85d3819a09e
+SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = 041e76c8f5461bd8cff7cf486c41cc0811a20b30
+SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = a57ea08893add846ab36c81493815f55657a7028
+SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = 61cf12d83007a82169230873b9cfa8e807429a33
+SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = 25c717c1b5d78f3343912ffd317e4387ba760eb8
+SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp) = 15ca392fa6431f1b8588da0b0fe400725b0680c3
+SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = d74bdd0057cfa28de738731d9958ea851f141f9f
+SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = f2cf8a2aca3ab9a2e17ad93fff8785ce947152a4
+SHA1 (patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp) = f687128d56d1376ea5d6263639dc17e48e0df0e2
+SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = 8111f87fa8e852fea3f85f914a9e30e0fcf4668a
+SHA1 (patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp) = 565535da1dd9ad70caa4b81a2785f7fa362db44b
+SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp) = f96454d69da637c364482109c14197afb057aa01
+SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp) = f214dad27e51c42dbc8a03bb4672315c6cdef8d0
+SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = 07fc7e4fbc341ae106e7ef55172d4cdc01cce63e
+SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = 9010eecff6463bb27f6d049071a0a71c469dac25
+SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = b91452e8e932402f81cbbfaa64e28bf91b4b2291
+SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = 16e24f4bb34598a1eba6f3d984c78e2a06a2063d
+SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = d8041d71ff2702f0eb6d9c8be9a0d490ac96efcc
+SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = 8ea8bf682e0d330c5cc08462b0fe91fa4ba2f4c5
+SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = 7c2517b1948f204ee98e3db22733e4592f7bf2ea
+SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = 535898fdc3247f12a7ee26be56b60cebfdc8e1dc
+SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = 47d55ee5e26494c8444faa03aabe9c1caee1dcd0
 SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h) = 3db332ef2dfd8551c864fa2149571b05a00e8a1b
-SHA1 (patch-source_Symbol_ClangASTContext.cpp) = 4357bd58e77e234fb91603c010e12386414e768e
-SHA1 (patch-source_Symbol_GoASTContext.cpp) = b7d407ae128f00655a032b42629a6ca8bdcf5941
-SHA1 (patch-source_Target_Language.cpp) = b8047399c369af3a860863579d04b1ad122f6cb0
-SHA1 (patch-source_Utility_ConstString.cpp) = 564c2df272d114363ed8e7584dd37513dd61aa0f
-SHA1 (patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp) = 4f6f70ab211d852b0e521ad9e0a8233734707351
+SHA1 (patch-source_Symbol_ClangASTContext.cpp) = a2d6d6af10d6b98534393b7ee254fa3db3482a77
+SHA1 (patch-source_Symbol_GoASTContext.cpp) = 24a060d8ca43d4fd63ea60c4a0724ef8c1ed22ff
+SHA1 (patch-source_Target_Language.cpp) = 0e104ca53b6d160e3f402f0773185196bf7025c5
+SHA1 (patch-source_Utility_ConstString.cpp) = 80c5d08502878d0865157df8c40d8fdaffb15dc3
+SHA1 (patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp) = e8a8544051368a63f926ab981f6d8e2d4296fb6c
diff --git a/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp b/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp
index dda9d14f7d..fdff4d71fe 100644
--- a/lldb-git/patches/patch-source_Commands_CommandObjectPlatform.cpp
+++ b/lldb-git/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-git/patches/patch-source_Core_ModuleList.cpp b/lldb-git/patches/patch-source_Core_ModuleList.cpp
index 5bd0c7f016..37ad229663 100644
--- a/lldb-git/patches/patch-source_Core_ModuleList.cpp
+++ b/lldb-git/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-git/patches/patch-source_Host_common_Editline.cpp b/lldb-git/patches/patch-source_Host_common_Editline.cpp
index 9184e55c02..d1a54e09ab 100644
--- a/lldb-git/patches/patch-source_Host_common_Editline.cpp
+++ b/lldb-git/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-git/patches/patch-source_Host_common_HostInfoBase.cpp b/lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp
index 415a7ff333..c0277e3b5b 100644
--- a/lldb-git/patches/patch-source_Host_common_HostInfoBase.cpp
+++ b/lldb-git/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-git/patches/patch-source_Host_linux_HostInfoLinux.cpp b/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
index bcc0102e48..b44b5fa9d9 100644
--- a/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
+++ b/lldb-git/patches/patch-source_Host_linux_HostInfoLinux.cpp
@@ -17,7 +17,7 @@ $NetBSD$
    static bool success = 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, []() {
  
      struct utsname un;
@@ -28,7 +28,7 @@ $NetBSD$
    // for the distribution id.
 -  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, []() {
  
      Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST));
diff --git a/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp b/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp
index 17e28e454a..73bfb6a42d 100644
--- a/lldb-git/patches/patch-source_Host_windows_HostInfoWindows.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp b/lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
index a8c734be07..09af3274cf 100644
--- a/lldb-git/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
index e2b5282213..30dbb0c7ea 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
index 8b51c797eb..2ab89c4b7a 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
index 632904597f..c65d5ebe14 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp b/lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
index 981f7ad717..5e13c51bce 100644
--- a/lldb-git/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp b/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
index d28c9c1e63..2b49d8b7e2 100644
--- a/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp b/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
index b15f708162..c2a23989bf 100644
--- a/lldb-git/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp b/lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
index 693f5fde40..b7c57eeff6 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp b/lldb-git/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
index 950cb6fc13..a3984fee77 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp b/lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
index 060df62db8..48ef426911 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp b/lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
index 2d46b597fc..2d88b5847e 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
index afc58c070b..b9194d8319 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
index 6254692d5d..dc02157af5 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
@@ -21,7 +21,7 @@ $NetBSD$
    static ConstString g_name("windows");
  
 -  std::call_once(*g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
++  llvm::call_once(*g_once_flag, []() {
      Log::Callbacks log_callbacks = {DisableLog, EnableLog, ListLogCategories};
  
      Log::RegisterLogChannel(g_name, log_callbacks);
diff --git a/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp b/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
index 988c324083..2c5897d95b 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
index eca654ba37..910a680aec 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
index e2c89e15a6..cdfbf29113 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp b/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
index 8f7c33e65b..a835c33e2d 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp b/lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
index d41070c46f..15d0e5b45a 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp b/lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
index 2ed067fe1c..392990352b 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
index aa21fb2f56..c62d9e9a26 100644
--- a/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
+++ b/lldb-git/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-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
index 60937794ad..28a3dea427 100644
--- a/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
+++ b/lldb-git/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp.orig	2017-01-28 19:35:15.000000000 +0000
+--- source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp.orig	2017-02-05 16:52:24.757230241 +0000
 +++ source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-@@ -338,9 +338,9 @@ ScriptInterpreterPython::~ScriptInterpre
+@@ -326,9 +326,9 @@ ScriptInterpreterPython::~ScriptInterpre
  }
  
  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-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp b/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
index c3983edc8e..4a87889fcb 100644
--- a/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
+++ b/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
@@ -10,17 +10,15 @@ $NetBSD$
  
  #include "lldb/Core/ArchSpec.h"
  #include "lldb/Core/Module.h"
-@@ -553,8 +554,11 @@ uint32_t SymbolFileDWARF::CalculateAbili
+@@ -553,8 +554,9 @@ 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));
-+  llvm::call_once(data_segment.m_flag,
-+    [this, sect_type, &data_segment] {
-+      this->LoadSectionData(sect_type, std::ref(data_segment.m_data));
-+    }
-+  );
++  llvm::call_once(data_segment.m_flag, [this, sect_type, &data_segment] {
++    this->LoadSectionData(sect_type, std::ref(data_segment.m_data));
++  });
    return data_segment.m_data;
  }
  
diff --git a/lldb-git/patches/patch-source_Symbol_ClangASTContext.cpp b/lldb-git/patches/patch-source_Symbol_ClangASTContext.cpp
index 0c07f3cb2b..8dfbf7975d 100644
--- a/lldb-git/patches/patch-source_Symbol_ClangASTContext.cpp
+++ b/lldb-git/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-git/patches/patch-source_Symbol_GoASTContext.cpp b/lldb-git/patches/patch-source_Symbol_GoASTContext.cpp
index f723d4e9b4..9a59f6e92d 100644
--- a/lldb-git/patches/patch-source_Symbol_GoASTContext.cpp
+++ b/lldb-git/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-git/patches/patch-source_Target_Language.cpp b/lldb-git/patches/patch-source_Target_Language.cpp
index 5706ef002d..a32efe59ff 100644
--- a/lldb-git/patches/patch-source_Target_Language.cpp
+++ b/lldb-git/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-git/patches/patch-source_Utility_ConstString.cpp b/lldb-git/patches/patch-source_Utility_ConstString.cpp
index 3aa25365b4..b9a612a6a3 100644
--- a/lldb-git/patches/patch-source_Utility_ConstString.cpp
+++ b/lldb-git/patches/patch-source_Utility_ConstString.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Utility/ConstString.cpp.orig	2017-02-02 23:56:41.000000000 +0000
+--- source/Utility/ConstString.cpp.orig	2017-02-05 16:52:24.757854153 +0000
 +++ source/Utility/ConstString.cpp
 @@ -20,6 +20,7 @@
  #include "llvm/Support/RWMutex.h"
@@ -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-git/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp b/lldb-git/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp
index 55ca341902..1527ea7894 100644
--- a/lldb-git/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp
+++ b/lldb-git/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