pkgsrc-WIP-changes archive

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

lldb-netbsd: Update to SVN 293902



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Feb 2 23:38:28 2017 +0100
Changeset:	71559fe1227ed36794296c9bb2df416eb5e63be1

Modified Files:
	lldb-netbsd/Makefile
	lldb-netbsd/PLIST
	lldb-netbsd/distinfo
Removed Files:
	lldb-netbsd/patches/patch-include_lldb_Core_Debugger.h
	lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
	lldb-netbsd/patches/patch-source_Core_ConstString.cpp
	lldb-netbsd/patches/patch-source_Core_Debugger.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_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_Windows_Common_ProcessWindowsLog.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_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h
	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-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp

Log Message:
lldb-netbsd: Update to SVN 293902

Drop llvm::call_once patch, will be redone for 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=71559fe1227ed36794296c9bb2df416eb5e63be1

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

diffstat:
 lldb-netbsd/Makefile                               |   2 +-
 lldb-netbsd/PLIST                                  |  45 +++---
 lldb-netbsd/distinfo                               |  35 -----
 .../patches/patch-include_lldb_Core_Debugger.h     |  12 --
 ...patch-source_Commands_CommandObjectPlatform.cpp |  23 ---
 .../patches/patch-source_Core_ConstString.cpp      |  25 ---
 lldb-netbsd/patches/patch-source_Core_Debugger.cpp |  35 -----
 .../patches/patch-source_Core_ModuleList.cpp       |  24 ---
 .../patches/patch-source_Host_common_Editline.cpp  |  23 ---
 .../patch-source_Host_common_HostInfoBase.cpp      | 175 ---------------------
 .../patch-source_Host_windows_HostInfoWindows.cpp  |  15 --
 ...pressionParser_Clang_ClangModulesDeclVendor.cpp |  16 --
 ...lugins_Language_CPlusPlus_CPlusPlusLanguage.cpp |  53 -------
 ...patch-source_Plugins_Language_Go_GoLanguage.cpp |  30 ----
 ...h-source_Plugins_Language_Java_JavaLanguage.cpp |  25 ---
 ...h-source_Plugins_Language_ObjC_ObjCLanguage.cpp |  17 --
 ...gins_Platform_MacOSX_PlatformAppleSimulator.cpp |  15 --
 ...urce_Plugins_Platform_MacOSX_PlatformDarwin.cpp |  34 ----
 ...urce_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp |  16 --
 ...ce_Plugins_Process_Linux_NativeProcessLinux.cpp |  16 --
 ...ce_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp |  16 --
 ...ource_Plugins_Process_POSIX_ProcessPOSIXLog.cpp |  25 ---
 ...ugins_Process_Windows_Common_ProcessWindows.cpp |  16 --
 ...ns_Process_Windows_Common_ProcessWindowsLog.cpp |  19 ---
 ...rce_Plugins_Process_elf-core_ProcessElfCore.cpp |  24 ---
 ...remote_GDBRemoteCommunicationServerPlatform.cpp |  25 ---
 ...Plugins_Process_gdb-remote_ProcessGDBRemote.cpp |  24 ---
 ...gins_Process_gdb-remote_ProcessGDBRemoteLog.cpp |  25 ---
 ...e_Plugins_Process_mach-core_ProcessMachCore.cpp |  25 ---
 ...ce_Plugins_Process_minidump_ProcessMinidump.cpp |  25 ---
 ...criptInterpreter_None_ScriptInterpreterNone.cpp |  25 ---
 ...tInterpreter_Python_ScriptInterpreterPython.cpp |  24 ---
 ...ce_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp |  23 ---
 ...urce_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h |  12 --
 .../patch-source_Symbol_ClangASTContext.cpp        |  26 ---
 .../patches/patch-source_Symbol_GoASTContext.cpp   |  24 ---
 .../patches/patch-source_Target_Language.cpp       |  37 -----
 ..._source_MacOSX_DarwinLog_DarwinLogCollector.cpp |  17 --
 38 files changed, 21 insertions(+), 1027 deletions(-)

diffs:
diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
index 3c22622..5fddbed 100644
--- a/lldb-netbsd/Makefile
+++ b/lldb-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	lldb
 SVN_REPO.lldb=		http://llvm.org/svn/llvm-project/lldb/trunk
-SVN_REVISION.lldb=	293770
+SVN_REVISION.lldb=	293902
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://lldb.org/
diff --git a/lldb-netbsd/PLIST b/lldb-netbsd/PLIST
index 2a0a095..be49b8e 100644
--- a/lldb-netbsd/PLIST
+++ b/lldb-netbsd/PLIST
@@ -1,28 +1,8 @@
 @comment $NetBSD$
-${PYSITELIB}/lldb/__init__.py
-${PYSITELIB}/lldb/_lldb.so
-${PYSITELIB}/lldb/embedded_interpreter.py
-${PYSITELIB}/lldb/formatters/Logger.py
-${PYSITELIB}/lldb/formatters/__init__.py
-${PYSITELIB}/lldb/formatters/attrib_fromdict.py
-${PYSITELIB}/lldb/formatters/cache.py
-${PYSITELIB}/lldb/formatters/cpp/__init__.py
-${PYSITELIB}/lldb/formatters/cpp/gnu_libstdcpp.py
-${PYSITELIB}/lldb/formatters/cpp/libcxx.py
-${PYSITELIB}/lldb/formatters/metrics.py
-${PYSITELIB}/lldb/formatters/synth.py
-${PYSITELIB}/lldb/lldb-argdumper
-${PYSITELIB}/lldb/runtime/__init__.py
-${PYSITELIB}/lldb/utils/__init__.py
-${PYSITELIB}/lldb/utils/symbolication.py
-${PYSITELIB}/six.py
-bin/${PKGNAME}
 bin/lldb
 bin/lldb-argdumper
 bin/lldb-mi
-bin/lldb-mi-${PKGVERSION}
 bin/lldb-server
-bin/lldb-server-${PKGVERSION}
 include/lldb/API/LLDB.h
 include/lldb/API/SBAddress.h
 include/lldb/API/SBAttachInfo.h
@@ -305,7 +285,6 @@ include/lldb/Host/msvc/Config.h
 include/lldb/Host/netbsd/Config.h
 include/lldb/Host/netbsd/HostInfoNetBSD.h
 include/lldb/Host/netbsd/HostThreadNetBSD.h
-include/lldb/Host/netbsd/ProcessLauncherNetBSD.h
 include/lldb/Host/posix/ConnectionFileDescriptorPosix.h
 include/lldb/Host/posix/DomainSocket.h
 include/lldb/Host/posix/Fcntl.h
@@ -316,6 +295,7 @@ include/lldb/Host/posix/LockFilePosix.h
 include/lldb/Host/posix/MainLoopPosix.h
 include/lldb/Host/posix/PipePosix.h
 include/lldb/Host/posix/ProcessLauncherPosix.h
+include/lldb/Host/posix/ProcessLauncherPosixFork.h
 include/lldb/Host/windows/AutoHandle.h
 include/lldb/Host/windows/ConnectionGenericFileWindows.h
 include/lldb/Host/windows/HostInfoWindows.h
@@ -481,13 +461,11 @@ include/lldb/Target/Unwind.h
 include/lldb/Target/UnwindAssembly.h
 include/lldb/Utility/AnsiTerminal.h
 include/lldb/Utility/CleanUp.h
-include/lldb/Utility/ConvertEnum.h
 include/lldb/Utility/Either.h
 include/lldb/Utility/Iterable.h
 include/lldb/Utility/JSON.h
 include/lldb/Utility/LLDBAssert.h
 include/lldb/Utility/NameMatches.h
-include/lldb/Utility/PriorityPointerPair.h
 include/lldb/Utility/ProcessStructReader.h
 include/lldb/Utility/PseudoTerminal.h
 include/lldb/Utility/Range.h
@@ -500,7 +478,6 @@ include/lldb/Utility/StringExtractor.h
 include/lldb/Utility/StringLexer.h
 include/lldb/Utility/TaskPool.h
 include/lldb/Utility/Timeout.h
-include/lldb/Utility/Utils.h
 include/lldb/lldb-defines.h
 include/lldb/lldb-enumerations.h
 include/lldb/lldb-forward.h
@@ -514,8 +491,8 @@ include/lldb/lldb-public.h
 include/lldb/lldb-types.h
 include/lldb/lldb-versioning.h
 lib/liblldb.so
-lib/liblldb.so.${PKGVERSION}
 lib/liblldb.so.5
+lib/liblldb.so.${PKGVERSION}
 lib/liblldbBase.a
 lib/liblldbBreakpoint.a
 lib/liblldbCommands.a
@@ -602,3 +579,21 @@ lib/liblldbPluginUnwindAssemblyX86.a
 lib/liblldbSymbol.a
 lib/liblldbTarget.a
 lib/liblldbUtility.a
+${PYSITELIB}/lldb/__init__.py
+${PYSITELIB}/lldb/_lldb.so
+${PYSITELIB}/lldb/embedded_interpreter.py
+${PYSITELIB}/lldb/formatters/Logger.py
+${PYSITELIB}/lldb/formatters/__init__.py
+${PYSITELIB}/lldb/formatters/attrib_fromdict.py
+${PYSITELIB}/lldb/formatters/cache.py
+${PYSITELIB}/lldb/formatters/cpp/__init__.py
+${PYSITELIB}/lldb/formatters/cpp/gnu_libstdcpp.py
+${PYSITELIB}/lldb/formatters/cpp/libcxx.py
+${PYSITELIB}/lldb/formatters/metrics.py
+${PYSITELIB}/lldb/formatters/synth.py
+${PYSITELIB}/lldb/lldb-argdumper
+${PYSITELIB}/lldb/runtime/__init__.py
+${PYSITELIB}/lldb/utils/__init__.py
+${PYSITELIB}/lldb/utils/symbolication.py
+${PYSITELIB}/six.py
+@pkgdir include/lldb/Host/windows/getopt
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 460e76d..967fb31 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -13,55 +13,20 @@ 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-cmake_LLDBDependencies.cmake) = 2577a759167675d3a89915bebad05c8159798e8a
-SHA1 (patch-include_lldb_Core_Debugger.h) = 20d7995866bfe129ab532e470509d8ff9f4ebdea
 SHA1 (patch-include_lldb_Host_netbsd_HostThreadNetBSD.h) = 79f207cdb9da2ef57d39eeb307ec6d10cf828925
 SHA1 (patch-source_CMakeLists.txt) = 5dacabc3f39c23bdfd432b5a4895866157b97aa0
-SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = c578e1b7e787a92b453b343ac8b63583f47585f7
-SHA1 (patch-source_Core_ConstString.cpp) = e79f25d82a90afa3d8a75098d66cab15c13d799f
-SHA1 (patch-source_Core_Debugger.cpp) = 6b284cafa93a30d3ea5d4f88478efb0ada659249
-SHA1 (patch-source_Core_ModuleList.cpp) = ff470cfe29d4702d5be6c5a096d5a8db700547e7
-SHA1 (patch-source_Host_common_Editline.cpp) = 6bc60cc72e5a6148add175cb276bb445bb3ee0f5
 SHA1 (patch-source_Host_common_Host.cpp) = 7d48b8bb1e4350ba6d3ddc6357b9b8dc82d6b32d
-SHA1 (patch-source_Host_common_HostInfoBase.cpp) = 402e11c3c8775ba993159cb27c30b2ed9fa82076
 SHA1 (patch-source_Host_common_NativeProcessProtocol.cpp) = 23cc7da280b2123cf0206f3d5660d2647935edbc
 SHA1 (patch-source_Host_linux_HostInfoLinux.cpp) = fb375b959fe0f08c9e888194c58af356edeee441
 SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = a1b0fbdad062309a845cfefe4469614fbbe9d20e
 SHA1 (patch-source_Host_netbsd_ThisThread.cpp) = f0d32c81bc1b8fe9aeb86519ea46ba2cb16571c2
-SHA1 (patch-source_Host_windows_HostInfoWindows.cpp) = 73be6130bfc54bde057c23eee23aecd09c200b8d
 SHA1 (patch-source_Initialization_SystemInitializerCommon.cpp) = 80c850b980fe2902f10e441df7a18f428dd1154a
-SHA1 (patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp) = a7f61c10f28fdc3280fdd81b2719f014e854c4fa
-SHA1 (patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp) = 5cb3541392d313714c23b737bbaa12cafe8d7c93
-SHA1 (patch-source_Plugins_Language_Go_GoLanguage.cpp) = bc470b574171eb46036eac90c977ce4cadcaefb6
-SHA1 (patch-source_Plugins_Language_Java_JavaLanguage.cpp) = b894be0215a1079c81db4d65ccedc7798369f93a
-SHA1 (patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp) = 8b3e09479f8d242c3e6bf16129206aa1474b9366
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp) = 70955caefbeeae6f938337bc35aac8cc57a143b7
-SHA1 (patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp) = 99761cb3d3dd3bf7786dace0ef7b7178c4ca12b1
 SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 129e853c1f93f063a0d30c737bcd82e3e589539b
 SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h) = 4327a21e79378b8f35adb07614adb41c37bbaf61
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c689ff4ec455234f8d506dc9eb8e0ed7f750d426
-SHA1 (patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp) = 125cf947d59593d7be7dd90419a1e8f89104b4fc
-SHA1 (patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp) = d260fdfdc464b1bfb1822e9be17c04480b0d2af4
-SHA1 (patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp) = 2f4e5859d80f8b0e55554eeb8955bf482cb04b57
 SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = 483584dad2dba01dccd065435a5d75eedf11b3c6
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 1553f31a05d79c6df6212836d5e83c6bd7003b3e
 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) = 819ea02c833cd80ae2c749accd0f74e6ff95b8bc
-SHA1 (patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp) = 4baf3afe84d6689c554c5708cabd83d196266b36
-SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = dff1a42d1ef11956cd26d16881a772c8c3e15011
-SHA1 (patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp) = b9fe1cac11219549e33397353393fd9ce60e9a2b
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp) = 03e085ae30119c0081944800137c1321bef3ad40
-SHA1 (patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp) = 69386fbf89dfa55ca90d024b648a8b7cb7bd5ca5
-SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = c4662ce90748668c61e61bdf3be23676577a750f
-SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = 0f275d25be7db7f38bfcf55fad6690507be20ffd
-SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = 641daf2e5b97fe216b66b1ae40f176dca7c9771c
-SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = 6c9a61972e640756bb8e1fbb14329a04961a28db
-SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = 88d298fabaf94cedef24cb2a1e880815a65ca88f
-SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h) = be1f74bfa4bd3b1ab2ce1760d6e375ccd53c1292
-SHA1 (patch-source_Symbol_ClangASTContext.cpp) = 0148bcb2ff278fc76f87320085af712fe033c208
-SHA1 (patch-source_Symbol_GoASTContext.cpp) = f6ea8faca07b6ac41e9d42341ed0f56b33ebfb7c
-SHA1 (patch-source_Target_Language.cpp) = 11f75093db8373193558a0ae484c57ee2fefd44d
-SHA1 (patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp) = fb52ca3a5f1aa6763b689c1692718248ad871c6f
 SHA1 (patch-tools_lldb-server_CMakeLists.txt) = 7a25edbff78d8091fa907b01c2c01c3e51579c15
diff --git a/lldb-netbsd/patches/patch-include_lldb_Core_Debugger.h b/lldb-netbsd/patches/patch-include_lldb_Core_Debugger.h
deleted file mode 100644
index f2bd90f..0000000
--- a/lldb-netbsd/patches/patch-include_lldb_Core_Debugger.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- include/lldb/Core/Debugger.h.orig	2016-12-17 10:34:06.000000000 +0000
-+++ include/lldb/Core/Debugger.h
-@@ -374,7 +374,6 @@ protected:
-   HostThread m_io_handler_thread;
-   Broadcaster m_sync_broadcaster;
-   lldb::ListenerSP m_forward_listener_sp;
--  std::once_flag m_clear_once;
- 
-   //----------------------------------------------------------------------
-   // Events for m_sync_broadcaster
diff --git a/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp b/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
deleted file mode 100644
index 0ec7a76..0000000
--- a/lldb-netbsd/patches/patch-source_Commands_CommandObjectPlatform.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- source/Commands/CommandObjectPlatform.cpp.orig	2016-12-17 10:29:27.000000000 +0000
-+++ source/Commands/CommandObjectPlatform.cpp
-@@ -30,6 +30,7 @@
- #include "lldb/Utility/Utils.h"
- 
- #include "llvm/ADT/SmallString.h"
-+#include "llvm/Support/Threading.h"
- 
- using namespace lldb;
- using namespace lldb_private;
-@@ -1249,8 +1250,8 @@ protected:
-   public:
-     CommandOptions()
-         : 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);
-+      llvm::call_once(g_once_flag, []() {
-         PosixPlatformCommandOptionValidator *posix_validator =
-             new PosixPlatformCommandOptionValidator();
-         for (auto &Option : g_platform_process_list_options) {
diff --git a/lldb-netbsd/patches/patch-source_Core_ConstString.cpp b/lldb-netbsd/patches/patch-source_Core_ConstString.cpp
deleted file mode 100644
index 37798cd..0000000
--- a/lldb-netbsd/patches/patch-source_Core_ConstString.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Core/ConstString.cpp.orig	2016-12-17 10:30:30.000000000 +0000
-+++ source/Core/ConstString.cpp
-@@ -18,6 +18,7 @@
- #include "llvm/ADT/StringExtras.h"
- #include "llvm/ADT/StringMap.h"
- #include "llvm/Support/RWMutex.h"
-+#include "llvm/Support/Threading.h"
- 
- // Project includes
- #include "lldb/Core/Stream.h"
-@@ -191,10 +192,10 @@ protected:
- // touch ConstStrings is difficult.  So we leak the pool instead.
- //----------------------------------------------------------------------
- static Pool &StringPool() {
--  static std::once_flag g_pool_initialization_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_pool_initialization_flag);
-   static Pool *g_string_pool = nullptr;
- 
--  std::call_once(g_pool_initialization_flag,
-+  llvm::call_once(g_pool_initialization_flag,
-                  []() { g_string_pool = new Pool(); });
- 
-   return *g_string_pool;
diff --git a/lldb-netbsd/patches/patch-source_Core_Debugger.cpp b/lldb-netbsd/patches/patch-source_Core_Debugger.cpp
deleted file mode 100644
index f1df293..0000000
--- a/lldb-netbsd/patches/patch-source_Core_Debugger.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
---- source/Core/Debugger.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Core/Debugger.cpp
-@@ -61,8 +61,11 @@
- #include "lldb/Utility/AnsiTerminal.h"
- #include "lldb/lldb-private.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- using namespace lldb;
- using namespace lldb_private;
-+using namespace llvm;
- 
- static lldb::user_id_t g_unique_id = 1;
- static size_t g_debugger_event_thread_stack_bytes = 8 * 1024 * 1024;
-@@ -710,7 +713,7 @@ Debugger::Debugger(lldb::LogOutputCallba
-       m_input_reader_stack(), m_instance_name(), m_loaded_plugins(),
-       m_event_handler_thread(), m_io_handler_thread(),
-       m_sync_broadcaster(nullptr, "lldb.debugger.sync"),
--      m_forward_listener_sp(), m_clear_once() {
-+      m_forward_listener_sp() {
-   char instance_cstr[256];
-   snprintf(instance_cstr, sizeof(instance_cstr), "debugger_%d", (int)GetID());
-   m_instance_name.SetCString(instance_cstr);
-@@ -762,7 +765,8 @@ void Debugger::Clear() {
-   //     static void Debugger::Destroy(lldb::DebuggerSP &debugger_sp);
-   //     static void Debugger::Terminate();
-   //----------------------------------------------------------------------
--  std::call_once(m_clear_once, [this]() {
-+  LLVM_DEFINE_ONCE_FLAG(m_clear_once);
-+  llvm::call_once(m_clear_once, [this]() {
-     ClearIOHandlers();
-     StopIOHandlerThread();
-     StopEventHandlerThread();
diff --git a/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp b/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp
deleted file mode 100644
index 1d145f7..0000000
--- a/lldb-netbsd/patches/patch-source_Core_ModuleList.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- source/Core/ModuleList.cpp.orig	2016-12-17 10:30:30.000000000 +0000
-+++ source/Core/ModuleList.cpp
-@@ -26,6 +26,8 @@
- #include "lldb/Symbol/SymbolFile.h"
- #include "lldb/Symbol/VariableList.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- using namespace lldb;
- using namespace lldb_private;
- 
-@@ -644,8 +646,8 @@ size_t ModuleList::GetIndexForModule(con
- 
- static ModuleList &GetSharedModuleList() {
-   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);
-+  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
-     // doing a bunch of cleanup that isn't required.
diff --git a/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp b/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp
deleted file mode 100644
index bfb3805..0000000
--- a/lldb-netbsd/patches/patch-source_Host_common_Editline.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- source/Host/common/Editline.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Host/common/Editline.cpp
-@@ -24,6 +24,7 @@
- 
- using namespace lldb_private;
- using namespace lldb_private::line_editor;
-+using namespace llvm;
- 
- // Workaround for what looks like an OS X-specific issue, but other platforms
- // may benefit from something similar if issues arise.  The libedit library
-@@ -1151,8 +1152,8 @@ Editline::Editline(const char *editline_
-     if (term_fd != -1) {
-       static std::mutex *g_init_terminal_fds_mutex_ptr = nullptr;
-       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);
-+      llvm::call_once(g_once_flag, [&]() {
-         g_init_terminal_fds_mutex_ptr =
-             new std::mutex(); // NOTE: Leak to avoid C++ destructor chain issues
-         g_init_terminal_fds_ptr = new std::set<int>(); // NOTE: Leak to avoid
diff --git a/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp b/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp
deleted file mode 100644
index e833153..0000000
--- a/lldb-netbsd/patches/patch-source_Host_common_HostInfoBase.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-$NetBSD$
-
---- source/Host/common/HostInfoBase.cpp.orig	2016-12-17 10:30:38.000000000 +0000
-+++ source/Host/common/HostInfoBase.cpp
-@@ -22,6 +22,7 @@
- #include "llvm/Support/Host.h"
- #include "llvm/Support/Path.h"
- #include "llvm/Support/ScopedPrinter.h"
-+#include "llvm/Support/Threading.h"
- #include "llvm/Support/raw_ostream.h"
- 
- #include <mutex> // std::once
-@@ -79,8 +80,8 @@ void HostInfoBase::Terminate() {
- }
- 
- uint32_t HostInfoBase::GetNumberCPUS() {
--  static std::once_flag g_once_flag;
--  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-+  llvm::call_once(g_once_flag, []() {
-     g_fields->m_number_cpus = std::thread::hardware_concurrency();
-   });
-   return g_fields->m_number_cpus;
-@@ -89,8 +90,8 @@ uint32_t HostInfoBase::GetNumberCPUS() {
- uint32_t HostInfoBase::GetMaxThreadNameLength() { return 0; }
- 
- llvm::StringRef HostInfoBase::GetVendorString() {
--  static std::once_flag g_once_flag;
--  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-+  llvm::call_once(g_once_flag, []() {
-     g_fields->m_vendor_string =
-         HostInfo::GetArchitecture().GetTriple().getVendorName().str();
-   });
-@@ -98,8 +99,8 @@ llvm::StringRef HostInfoBase::GetVendorS
- }
- 
- llvm::StringRef HostInfoBase::GetOSString() {
--  static std::once_flag g_once_flag;
--  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-+  llvm::call_once(g_once_flag, []() {
-     g_fields->m_os_string =
-         std::move(HostInfo::GetArchitecture().GetTriple().getOSName());
-   });
-@@ -107,8 +108,8 @@ llvm::StringRef HostInfoBase::GetOSStrin
- }
- 
- llvm::StringRef HostInfoBase::GetTargetTriple() {
--  static std::once_flag g_once_flag;
--  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-+  llvm::call_once(g_once_flag, []() {
-     g_fields->m_host_triple =
-         HostInfo::GetArchitecture().GetTriple().getTriple();
-   });
-@@ -116,8 +117,8 @@ llvm::StringRef HostInfoBase::GetTargetT
- }
- 
- 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);
-+  llvm::call_once(g_once_flag, []() {
-     HostInfo::ComputeHostArchitectureSupport(g_fields->m_host_arch_32,
-                                              g_fields->m_host_arch_64);
-   });
-@@ -144,9 +145,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-   FileSpec *result = nullptr;
-   switch (type) {
-   case lldb::ePathTypeLLDBShlibDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success =
-           HostInfo::ComputeSharedLibraryDirectory(g_fields->m_lldb_so_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -158,9 +159,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_so_dir;
-   } break;
-   case lldb::ePathTypeSupportExecutableDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputeSupportExeDirectory(
-           g_fields->m_lldb_support_exe_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -173,9 +174,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_support_exe_dir;
-   } break;
-   case lldb::ePathTypeHeaderDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputeHeaderDirectory(g_fields->m_lldb_headers_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-       if (log)
-@@ -186,9 +187,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_headers_dir;
-   } break;
-   case lldb::ePathTypePythonDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputePythonDirectory(g_fields->m_lldb_python_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-       if (log)
-@@ -199,9 +200,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_python_dir;
-   } break;
-   case lldb::ePathTypeClangDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success =
-           HostInfo::ComputeClangDirectory(g_fields->m_lldb_clang_resource_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -214,9 +215,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_clang_resource_dir;
-   } break;
-   case lldb::ePathTypeLLDBSystemPlugins: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputeSystemPluginsDirectory(
-           g_fields->m_lldb_system_plugin_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -229,9 +230,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_system_plugin_dir;
-   } break;
-   case lldb::ePathTypeLLDBUserPlugins: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputeUserPluginsDirectory(
-           g_fields->m_lldb_user_plugin_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -244,9 +245,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_user_plugin_dir;
-   } break;
-   case lldb::ePathTypeLLDBTempSystemDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputeProcessTempFileDirectory(
-           g_fields->m_lldb_process_tmp_dir);
-       Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
-@@ -259,9 +260,9 @@ bool HostInfoBase::GetLLDBPath(lldb::Pat
-       result = &g_fields->m_lldb_process_tmp_dir;
-   } break;
-   case lldb::ePathTypeGlobalLLDBTempSystemDir: {
--    static std::once_flag g_once_flag;
-+    LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-     static bool success = false;
--    std::call_once(g_once_flag, []() {
-+    llvm::call_once(g_once_flag, []() {
-       success = HostInfo::ComputeGlobalTempFileDirectory(
-           g_fields->m_lldb_global_tmp_dir);
-       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
deleted file mode 100644
index 5fc2487..0000000
--- a/lldb-netbsd/patches/patch-source_Host_windows_HostInfoWindows.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- source/Host/windows/HostInfoWindows.cpp.orig	2016-12-17 10:30:35.000000000 +0000
-+++ source/Host/windows/HostInfoWindows.cpp
-@@ -90,8 +90,8 @@ bool HostInfoWindows::GetHostname(std::s
- }
- 
- FileSpec HostInfoWindows::GetProgramFileSpec() {
--  static std::once_flag g_once_flag;
--  std::call_once(g_once_flag, []() {
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
-+  llvm::call_once(g_once_flag, []() {
-     std::vector<wchar_t> buffer(PATH_MAX);
-     ::GetModuleFileNameW(NULL, buffer.data(), buffer.size());
-     std::string path;
diff --git a/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp b/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
deleted file mode 100644
index 8085ee1..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_ExpressionParser_Clang_ClangModulesDeclVendor.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
-@@ -143,9 +143,9 @@ void StoringDiagnosticConsumer::DumpDiag
- static FileSpec GetResourceDir() {
-   static FileSpec g_cached_resource_dir;
- 
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     HostInfo::GetLLDBPath(lldb::ePathTypeClangDir, g_cached_resource_dir);
-   });
- 
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
deleted file mode 100644
index 060c770..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_CPlusPlus_CPlusPlusLanguage.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
-@@ -33,6 +33,7 @@
- #include "lldb/DataFormatters/DataVisualization.h"
- #include "lldb/DataFormatters/FormattersHelpers.h"
- #include "lldb/DataFormatters/VectorType.h"
-+#include "llvm/Support/Threading.h"
- 
- #include "BlockPointer.h"
- #include "CxxStringTypes.h"
-@@ -1036,10 +1037,10 @@ std::unique_ptr<Language::TypeScavenger>
- }
- 
- lldb::TypeCategoryImplSP CPlusPlusLanguage::GetFormatters() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static TypeCategoryImplSP g_category;
- 
--  std::call_once(g_initialize, [this]() -> void {
-+  llvm::call_once(g_initialize, [this]() -> void {
-     DataVisualization::Categories::GetCategory(GetPluginName(), g_category);
-     if (g_category) {
-       LoadLibCxxFormatters(g_category);
-@@ -1052,11 +1053,11 @@ lldb::TypeCategoryImplSP CPlusPlusLangua
- 
- HardcodedFormatters::HardcodedSummaryFinder
- CPlusPlusLanguage::GetHardcodedSummaries() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static ConstString g_vectortypes("VectorTypes");
-   static HardcodedFormatters::HardcodedSummaryFinder g_formatters;
- 
--  std::call_once(g_initialize, []() -> void {
-+  llvm::call_once(g_initialize, []() -> void {
-     g_formatters.push_back(
-         [](lldb_private::ValueObject &valobj, lldb::DynamicValueType,
-            FormatManager &) -> TypeSummaryImpl::SharedPointer {
-@@ -1116,11 +1117,11 @@ CPlusPlusLanguage::GetHardcodedSummaries
- 
- HardcodedFormatters::HardcodedSyntheticFinder
- CPlusPlusLanguage::GetHardcodedSynthetics() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static ConstString g_vectortypes("VectorTypes");
-   static HardcodedFormatters::HardcodedSyntheticFinder g_formatters;
- 
--  std::call_once(g_initialize, []() -> void {
-+  llvm::call_once(g_initialize, []() -> void {
-     g_formatters.push_back([](lldb_private::ValueObject &valobj,
-                               lldb::DynamicValueType,
-                               FormatManager &
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
deleted file mode 100644
index 84c9533..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_Go_GoLanguage.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Language/Go/GoLanguage.cpp.orig	2016-12-17 10:29:28.000000000 +0000
-+++ source/Plugins/Language/Go/GoLanguage.cpp
-@@ -62,10 +62,10 @@ Language *GoLanguage::CreateInstance(lld
- 
- HardcodedFormatters::HardcodedSummaryFinder
- GoLanguage::GetHardcodedSummaries() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static HardcodedFormatters::HardcodedSummaryFinder g_formatters;
- 
--  std::call_once(g_initialize, []() -> void {
-+  llvm::call_once(g_initialize, []() -> void {
-     g_formatters.push_back(
-         [](lldb_private::ValueObject &valobj, lldb::DynamicValueType,
-            FormatManager &) -> TypeSummaryImpl::SharedPointer {
-@@ -104,10 +104,10 @@ GoLanguage::GetHardcodedSummaries() {
- 
- HardcodedFormatters::HardcodedSyntheticFinder
- GoLanguage::GetHardcodedSynthetics() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static HardcodedFormatters::HardcodedSyntheticFinder g_formatters;
- 
--  std::call_once(g_initialize, []() -> void {
-+  llvm::call_once(g_initialize, []() -> void {
-     g_formatters.push_back(
-         [](lldb_private::ValueObject &valobj, lldb::DynamicValueType,
-            FormatManager &fmt_mgr) -> SyntheticChildren::SharedPointer {
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
deleted file mode 100644
index 7afafd2..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_Java_JavaLanguage.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Language/Java/JavaLanguage.cpp.orig	2016-12-17 10:29:28.000000000 +0000
-+++ source/Plugins/Language/Java/JavaLanguage.cpp
-@@ -15,6 +15,7 @@
- 
- // Other libraries and framework includes
- #include "llvm/ADT/StringRef.h"
-+#include "llvm/Support/Threading.h"
- 
- // Project includes
- #include "JavaFormatterFunctions.h"
-@@ -64,10 +65,10 @@ bool JavaLanguage::IsNilReference(ValueO
- }
- 
- lldb::TypeCategoryImplSP JavaLanguage::GetFormatters() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static TypeCategoryImplSP g_category;
- 
--  std::call_once(g_initialize, [this]() -> void {
-+  llvm::call_once(g_initialize, [this]() -> void {
-     DataVisualization::Categories::GetCategory(GetPluginName(), g_category);
-     if (g_category) {
-       llvm::StringRef array_regexp("^.*\\[\\]&?$");
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp b/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
deleted file mode 100644
index 84a6133..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Language_ObjC_ObjCLanguage.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Language/ObjC/ObjCLanguage.cpp.orig	2016-12-17 10:29:29.000000000 +0000
-+++ source/Plugins/Language/ObjC/ObjCLanguage.cpp
-@@ -857,10 +857,10 @@ static void LoadCoreMediaFormatters(Type
- }
- 
- lldb::TypeCategoryImplSP ObjCLanguage::GetFormatters() {
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
-   static TypeCategoryImplSP g_category;
- 
--  std::call_once(g_initialize, [this]() -> void {
-+  llvm::call_once(g_initialize, [this]() -> void {
-     DataVisualization::Categories::GetCategory(GetPluginName(), g_category);
-     if (g_category) {
-       LoadCoreMediaFormatters(g_category);
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp b/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
deleted file mode 100644
index 14755f4..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformAppleSimulator.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp.orig	2016-12-17 10:29:32.000000000 +0000
-+++ source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
-@@ -242,8 +242,8 @@ FileSpec PlatformAppleSimulator::GetCore
- 
- void PlatformAppleSimulator::LoadCoreSimulator() {
- #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);
-+  llvm::call_once(g_load_core_sim_flag, [this] {
-     const std::string core_sim_path(GetCoreSimulatorPath().GetPath());
-     if (core_sim_path.size())
-       dlopen(core_sim_path.c_str(), RTLD_LAZY);
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp b/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
deleted file mode 100644
index 595be23..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_MacOSX_PlatformDarwin.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Platform/MacOSX/PlatformDarwin.cpp.orig	2016-12-17 10:29:32.000000000 +0000
-+++ source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
-@@ -40,6 +40,7 @@
- #include "lldb/Target/Process.h"
- #include "lldb/Target/Target.h"
- #include "llvm/ADT/STLExtras.h"
-+#include "llvm/Support/Threading.h"
- 
- #if defined(__APPLE__)
- #include <TargetConditionals.h> // for TARGET_OS_TV, TARGET_OS_WATCH
-@@ -1452,8 +1453,8 @@ static FileSpec CheckPathForXcode(const 
- 
- static FileSpec GetXcodeContentsPath() {
-   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);
-+  llvm::call_once(g_once_flag, []() {
- 
-     FileSpec fspec;
- 
-@@ -1835,8 +1836,8 @@ lldb_private::FileSpec PlatformDarwin::L
- 
-   // Find the global list of directories that we will search for
-   // 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);
-+  llvm::call_once(g_once_flag, []() {
- 
-     // When locating executables, trust the DEVELOPER_DIR first if it is set
-     FileSpec xcode_contents_dir = GetXcodeContentsPath();
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
deleted file mode 100644
index 762186b..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
-@@ -71,9 +71,9 @@ ProcessFreeBSD::CreateInstance(lldb::Tar
- }
- 
- void ProcessFreeBSD::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(), CreateInstance);
-     ProcessPOSIXLog::Initialize(GetPluginNameStatic());
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
deleted file mode 100644
index 33b7575..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_Linux_NativeProcessLinux.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/Linux/NativeProcessLinux.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/Process/Linux/NativeProcessLinux.cpp
-@@ -75,9 +75,9 @@ using namespace llvm;
- 
- static bool ProcessVmReadvSupported() {
-   static bool is_supported;
--  static std::once_flag flag;
-+  LLVM_DEFINE_ONCE_FLAG(flag);
- 
--  std::call_once(flag, [] {
-+  llvm::call_once(flag, [] {
-     Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PROCESS));
- 
-     uint32_t source = 0x47424742;
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
deleted file mode 100644
index 4f87fc0..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_MacOSX-Kernel_ProcessKDP.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
-@@ -718,9 +718,9 @@ Error ProcessKDP::DoSignal(int signo) {
- }
- 
- void ProcessKDP::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(), CreateInstance,
-                                   DebuggerInitialize);
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
deleted file mode 100644
index 8467984..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_POSIX_ProcessPOSIXLog.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/POSIX/ProcessPOSIXLog.cpp.orig	2016-12-17 10:29:54.000000000 +0000
-+++ source/Plugins/Process/POSIX/ProcessPOSIXLog.cpp
-@@ -15,6 +15,8 @@
- #include "lldb/Core/StreamFile.h"
- #include "lldb/Interpreter/Args.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- #include "ProcessPOSIXLog.h"
- 
- using namespace lldb;
-@@ -33,9 +35,9 @@ static Log *GetLog() {
- }
- 
- void ProcessPOSIXLog::Initialize(ConstString name) {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, [name]() {
-+  llvm::call_once(g_once_flag, [name]() {
-     Log::Callbacks log_callbacks = {DisableLog, EnableLog, ListLogCategories};
- 
-     Log::RegisterLogChannel(name, log_callbacks);
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
deleted file mode 100644
index 813fb55..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindows.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/Windows/Common/ProcessWindows.cpp.orig	2016-12-17 10:30:06.000000000 +0000
-+++ source/Plugins/Process/Windows/Common/ProcessWindows.cpp
-@@ -102,9 +102,9 @@ ProcessSP ProcessWindows::CreateInstance
- }
- 
- void ProcessWindows::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(), CreateInstance);
-   });
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
deleted file mode 100644
index 97d7dc4..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_Windows_Common_ProcessWindowsLog.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp.orig	2016-12-17 10:30:06.000000000 +0000
-+++ source/Plugins/Process/Windows/Common/ProcessWindowsLog.cpp
-@@ -25,12 +25,12 @@ using namespace lldb_private;
- static bool g_log_enabled = false;
- static Log *g_log = nullptr;
- 
--static llvm::ManagedStatic<std::once_flag> g_once_flag;
-+LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
- void ProcessWindowsLog::Initialize() {
-   static ConstString g_name("windows");
- 
--  std::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-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
deleted file mode 100644
index c9132a9..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/elf-core/ProcessElfCore.cpp.orig	2016-12-17 10:30:06.000000000 +0000
-+++ source/Plugins/Process/elf-core/ProcessElfCore.cpp
-@@ -27,6 +27,7 @@
- #include "lldb/Target/UnixSignals.h"
- 
- #include "llvm/Support/ELF.h"
-+#include "llvm/Support/Threading.h"
- 
- #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
- #include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
-@@ -398,9 +399,9 @@ void ProcessElfCore::Clear() {
- }
- 
- void ProcessElfCore::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(), CreateInstance);
-   });
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
deleted file mode 100644
index 5f2e871..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_GDBRemoteCommunicationServerPlatform.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
-@@ -36,6 +36,8 @@
- #include "lldb/Target/UnixSignals.h"
- #include "lldb/Utility/JSON.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- // Project includes
- #include "Utility/StringExtractorGDBRemote.h"
- #include "Utility/UriParser.h"
-@@ -528,9 +530,9 @@ bool GDBRemoteCommunicationServerPlatfor
- 
- const FileSpec &GDBRemoteCommunicationServerPlatform::GetDomainSocketDir() {
-   static FileSpec g_domainsocket_dir;
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     const char *domainsocket_dir_env =
-         ::getenv("LLDB_DEBUGSERVER_DOMAINSOCKET_DIR");
-     if (domainsocket_dir_env != nullptr)
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
deleted file mode 100644
index e4e4f7a..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemote.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
-@@ -81,6 +81,7 @@
- 
- #include "llvm/ADT/StringSwitch.h"
- #include "llvm/Support/raw_ostream.h"
-+#include "llvm/Support/Threading.h"
- 
- #define DEBUGSERVER_BASENAME "debugserver"
- using namespace lldb;
-@@ -3434,9 +3435,9 @@ void ProcessGDBRemote::KillDebugserverPr
- }
- 
- void ProcessGDBRemote::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(), CreateInstance,
-                                   DebuggerInitialize);
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
deleted file mode 100644
index 8dc47a9..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_gdb-remote_ProcessGDBRemoteLog.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp.orig	2016-12-17 10:30:03.000000000 +0000
-+++ source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
-@@ -14,6 +14,8 @@
- #include "lldb/Core/StreamFile.h"
- #include "lldb/Interpreter/Args.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- #include "ProcessGDBRemote.h"
- 
- using namespace lldb;
-@@ -34,9 +36,9 @@ static Log *GetLog() {
- 
- void ProcessGDBRemoteLog::Initialize() {
-   static ConstString g_name("gdb-remote");
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::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-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
deleted file mode 100644
index e94e597..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/mach-core/ProcessMachCore.cpp.orig	2016-12-17 10:30:06.000000000 +0000
-+++ source/Plugins/Process/mach-core/ProcessMachCore.cpp
-@@ -39,6 +39,8 @@
- // Needed for the plug-in names for the dynamic loaders.
- #include "lldb/Utility/SafeMachO.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
- #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"
- #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
-@@ -579,9 +581,9 @@ Error ProcessMachCore::GetMemoryRegionIn
- void ProcessMachCore::Clear() { m_thread_list.Clear(); }
- 
- void ProcessMachCore::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(), CreateInstance);
-   });
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
deleted file mode 100644
index 136a402..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_minidump_ProcessMinidump.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/Process/minidump/ProcessMinidump.cpp.orig	2016-12-17 10:29:54.000000000 +0000
-+++ source/Plugins/Process/minidump/ProcessMinidump.cpp
-@@ -25,6 +25,8 @@
- #include "lldb/Target/UnixSignals.h"
- #include "lldb/Utility/LLDBAssert.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- // C includes
- // C++ includes
- 
-@@ -92,9 +94,9 @@ ProcessMinidump::~ProcessMinidump() {
- }
- 
- void ProcessMinidump::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(),
-                                   ProcessMinidump::CreateInstance);
diff --git a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp b/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
deleted file mode 100644
index 1a29262..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp.orig	2016-12-17 10:29:35.000000000 +0000
-+++ source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
-@@ -15,6 +15,8 @@
- #include "lldb/Core/StringList.h"
- #include "lldb/Interpreter/CommandInterpreter.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- #include <mutex>
- 
- using namespace lldb;
-@@ -39,9 +41,9 @@ void ScriptInterpreterNone::ExecuteInter
- }
- 
- void ScriptInterpreterNone::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(),
-                                   lldb::eScriptLanguageNone, CreateInstance);
diff --git a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp b/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
deleted file mode 100644
index 85e9ae3..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-@@ -51,6 +51,7 @@
- 
- #include "llvm/ADT/STLExtras.h"
- #include "llvm/ADT/StringRef.h"
-+#include "llvm/Support/Threading.h"
- 
- using namespace lldb;
- using namespace lldb_private;
-@@ -338,9 +339,9 @@ ScriptInterpreterPython::~ScriptInterpre
- }
- 
- void ScriptInterpreterPython::Initialize() {
--  static std::once_flag g_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(g_once_flag);
- 
--  std::call_once(g_once_flag, []() {
-+  llvm::call_once(g_once_flag, []() {
-     PluginManager::RegisterPlugin(GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(),
-                                   lldb::eScriptLanguagePython, CreateInstance);
diff --git a/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp b/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
deleted file mode 100644
index b003093..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp.orig	2016-12-17 10:29:45.000000000 +0000
-+++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
-@@ -11,6 +11,7 @@
- 
- // Other libraries and framework includes
- #include "llvm/Support/Casting.h"
-+#include "llvm/Support/Threading.h"
- 
- #include "lldb/Core/ArchSpec.h"
- #include "lldb/Core/Module.h"
-@@ -553,8 +554,8 @@ 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_DEFINE_ONCE_FLAG(m_flag);
-+  llvm::call_once(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-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h b/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h
deleted file mode 100644
index ed496b8..0000000
--- a/lldb-netbsd/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h.orig	2016-12-17 10:29:45.000000000 +0000
-+++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
-@@ -305,7 +305,6 @@ protected:
-   typedef llvm::DenseMap<lldb::opaque_compiler_type_t, DIERef> ClangTypeToDIE;
- 
-   struct DWARFDataSegment {
--    std::once_flag m_flag;
-     lldb_private::DWARFDataExtractor m_data;
-   };
- 
diff --git a/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp b/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp
deleted file mode 100644
index f770377..0000000
--- a/lldb-netbsd/patches/patch-source_Symbol_ClangASTContext.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- source/Symbol/ClangASTContext.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ source/Symbol/ClangASTContext.cpp
-@@ -127,8 +127,8 @@ typedef lldb_private::ThreadSafeDenseMap
- 
- static ClangASTMap &GetASTMap() {
-   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);
-+  llvm::call_once(g_once_flag, []() {
-     g_map_ptr = new ClangASTMap(); // leaked on purpose to avoid spins
-   });
-   return *g_map_ptr;
-@@ -954,8 +954,8 @@ ClangASTContext::GetBasicTypeEnumeration
-   if (name) {
-     typedef UniqueCStringMap<lldb::BasicType> TypeNameToBasicTypeMap;
-     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);
-+    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
deleted file mode 100644
index 8dd0486..0000000
--- a/lldb-netbsd/patches/patch-source_Symbol_GoASTContext.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- source/Symbol/GoASTContext.cpp.orig	2016-12-17 10:30:17.000000000 +0000
-+++ source/Symbol/GoASTContext.cpp
-@@ -25,6 +25,8 @@
- #include "lldb/Target/ExecutionContext.h"
- #include "lldb/Target/Target.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- #include "Plugins/ExpressionParser/Go/GoUserExpression.h"
- #include "Plugins/SymbolFile/DWARF/DWARFASTParserGo.h"
- 
-@@ -593,8 +595,8 @@ GoASTContext::GetBasicTypeEnumeration(ll
-   if (name) {
-     typedef UniqueCStringMap<lldb::BasicType> TypeNameToBasicTypeMap;
-     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);
-+    llvm::call_once(g_once_flag, []() {
-       // "void"
-       g_type_map.Append(ConstString("void").GetStringRef(), eBasicTypeVoid);
-       // "int"
diff --git a/lldb-netbsd/patches/patch-source_Target_Language.cpp b/lldb-netbsd/patches/patch-source_Target_Language.cpp
deleted file mode 100644
index 916cecc..0000000
--- a/lldb-netbsd/patches/patch-source_Target_Language.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
---- source/Target/Language.cpp.orig	2016-12-17 10:30:23.000000000 +0000
-+++ source/Target/Language.cpp
-@@ -20,6 +20,8 @@
- #include "lldb/Symbol/TypeList.h"
- #include "lldb/Target/Target.h"
- 
-+#include "llvm/Support/Threading.h"
-+
- using namespace lldb;
- using namespace lldb_private;
- using namespace lldb_private::formatters;
-@@ -29,9 +31,9 @@ typedef std::map<lldb::LanguageType, Lan
- 
- static LanguagesMap &GetLanguagesMap() {
-   static LanguagesMap *g_map = nullptr;
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
- 
--  std::call_once(g_initialize, [] {
-+  llvm::call_once(g_initialize, [] {
-     g_map = new LanguagesMap(); // NOTE: INTENTIONAL LEAK due to global
-                                 // destructor chain
-   });
-@@ -40,9 +42,9 @@ static LanguagesMap &GetLanguagesMap() {
- }
- static std::mutex &GetLanguagesMutex() {
-   static std::mutex *g_mutex = nullptr;
--  static std::once_flag g_initialize;
-+  LLVM_DEFINE_ONCE_FLAG(g_initialize);
- 
--  std::call_once(g_initialize, [] {
-+  llvm::call_once(g_initialize, [] {
-     g_mutex = new std::mutex(); // NOTE: INTENTIONAL LEAK due to global
-                                 // destructor chain
-   });
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
deleted file mode 100644
index c0b0930..0000000
--- a/lldb-netbsd/patches/patch-tools_debugserver_source_MacOSX_DarwinLog_DarwinLogCollector.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp.orig	2017-01-31 17:20:57.000000000 +0000
-+++ tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp
-@@ -46,10 +46,10 @@ static os_activity_stream_set_event_hand
-     s_os_activity_stream_set_event_handler;
- 
- bool LookupSPICalls() {
--  static std::once_flag s_once_flag;
-+  LLVM_DEFINE_ONCE_FLAG(s_once_flag);
-   static bool s_has_spi;
- 
--  std::call_once(s_once_flag, [] {
-+  llvm::call_once(s_once_flag, [] {
-     dlopen ("/System/Library/PrivateFrameworks/LoggingSupport.framework/LoggingSupport", RTLD_NOW);
-     s_os_activity_stream_for_pid = (os_activity_stream_for_pid_t)dlsym(
-         RTLD_DEFAULT, "os_activity_stream_for_pid");


Home | Main Index | Thread Index | Old Index