summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2010-11-29 18:16:10 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2010-11-29 18:16:10 +0000
commit1f6efa3996dd1929fbc129203ce5009b620e6969 (patch)
tree6b782914982f90d3a983bcefef98b8ef68ab2961 /lib
parent9363f739cdc3bd02e8516a25de0090f52ae12fbb (diff)
Merge System into Support.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120298 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Analysis/ConstantFolding.cpp2
-rw-r--r--lib/Archive/Archive.cpp2
-rw-r--r--lib/Archive/ArchiveInternals.h2
-rw-r--r--lib/Archive/ArchiveWriter.cpp4
-rw-r--r--lib/Bitcode/Writer/BitcodeWriter.cpp2
-rw-r--r--lib/CodeGen/AsmPrinter/DwarfDebug.cpp2
-rw-r--r--lib/CodeGen/ELF.h2
-rw-r--r--lib/CodeGen/PseudoSourceValue.cpp2
-rw-r--r--lib/CodeGen/SelectionDAG/SDNodeDbgValue.h2
-rw-r--r--lib/CodeGen/SelectionDAG/SelectionDAG.cpp2
-rw-r--r--lib/ExecutionEngine/ExecutionEngine.cpp4
-rw-r--r--lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp4
-rw-r--r--lib/ExecutionEngine/Interpreter/Interpreter.h2
-rw-r--r--lib/ExecutionEngine/JIT/Intercept.cpp2
-rw-r--r--lib/ExecutionEngine/JIT/JIT.cpp2
-rw-r--r--lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp2
-rw-r--r--lib/ExecutionEngine/JIT/JITDebugRegisterer.h2
-rw-r--r--lib/ExecutionEngine/JIT/JITEmitter.cpp4
-rw-r--r--lib/ExecutionEngine/JIT/JITMemoryManager.cpp2
-rw-r--r--lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp2
-rw-r--r--lib/ExecutionEngine/JIT/TargetSelect.cpp2
-rw-r--r--lib/ExecutionEngine/MCJIT/MCJIT.cpp2
-rw-r--r--lib/ExecutionEngine/MCJIT/TargetSelect.cpp2
-rw-r--r--lib/Linker/LinkItems.cpp2
-rw-r--r--lib/Linker/LinkModules.cpp2
-rw-r--r--lib/Linker/Linker.cpp2
-rw-r--r--lib/MC/MCAsmInfo.cpp2
-rw-r--r--lib/MC/MCDisassembler/EDDisassembler.h2
-rw-r--r--lib/MC/MCDisassembler/EDInst.h2
-rw-r--r--lib/MC/MCDisassembler/EDOperand.h2
-rw-r--r--lib/MC/MCDisassembler/EDToken.h2
-rw-r--r--lib/MC/WinCOFFObjectWriter.cpp2
-rw-r--r--lib/Object/MachOObject.cpp4
-rw-r--r--lib/Object/ObjectFile.cpp2
-rw-r--r--lib/Support/Alarm.cpp (renamed from lib/System/Alarm.cpp)6
-rw-r--r--lib/Support/Allocator.cpp4
-rw-r--r--lib/Support/Atomic.cpp (renamed from lib/System/Atomic.cpp)2
-rw-r--r--lib/Support/CMakeLists.txt50
-rw-r--r--lib/Support/CommandLine.cpp4
-rw-r--r--lib/Support/CrashRecoveryContext.cpp4
-rw-r--r--lib/Support/Debug.cpp2
-rw-r--r--lib/Support/Disassembler.cpp (renamed from lib/System/Disassembler.cpp)2
-rw-r--r--lib/Support/DynamicLibrary.cpp (renamed from lib/System/DynamicLibrary.cpp)10
-rw-r--r--lib/Support/Errno.cpp (renamed from lib/System/Errno.cpp)2
-rw-r--r--lib/Support/ErrorHandling.cpp4
-rw-r--r--lib/Support/FileUtilities.cpp2
-rw-r--r--lib/Support/FoldingSet.cpp2
-rw-r--r--lib/Support/GraphWriter.cpp4
-rw-r--r--lib/Support/Host.cpp (renamed from lib/System/Host.cpp)4
-rw-r--r--lib/Support/IncludeFile.cpp (renamed from lib/System/IncludeFile.cpp)4
-rw-r--r--lib/Support/Makefile5
-rw-r--r--lib/Support/ManagedStatic.cpp2
-rw-r--r--lib/Support/Memory.cpp (renamed from lib/System/Memory.cpp)8
-rw-r--r--lib/Support/MemoryBuffer.cpp18
-rw-r--r--lib/Support/Mutex.cpp (renamed from lib/System/Mutex.cpp)5
-rw-r--r--lib/Support/Path.cpp (renamed from lib/System/Path.cpp)5
-rw-r--r--lib/Support/PluginLoader.cpp4
-rw-r--r--lib/Support/PrettyStackTrace.cpp4
-rw-r--r--lib/Support/Process.cpp (renamed from lib/System/Process.cpp)4
-rw-r--r--lib/Support/Program.cpp (renamed from lib/System/Program.cpp)4
-rw-r--r--lib/Support/README.txt.system (renamed from lib/System/README.txt)14
-rw-r--r--lib/Support/RWMutex.cpp (renamed from lib/System/RWMutex.cpp)4
-rw-r--r--lib/Support/SearchForAddressOfSpecialSymbol.cpp (renamed from lib/System/SearchForAddressOfSpecialSymbol.cpp)0
-rw-r--r--lib/Support/Signals.cpp (renamed from lib/System/Signals.cpp)4
-rw-r--r--lib/Support/Statistic.cpp2
-rw-r--r--lib/Support/SystemUtils.cpp4
-rw-r--r--lib/Support/TargetRegistry.cpp2
-rw-r--r--lib/Support/ThreadLocal.cpp (renamed from lib/System/ThreadLocal.cpp)5
-rw-r--r--lib/Support/Threading.cpp (renamed from lib/System/Threading.cpp)14
-rw-r--r--lib/Support/TimeValue.cpp (renamed from lib/System/TimeValue.cpp)5
-rw-r--r--lib/Support/Timer.cpp4
-rw-r--r--lib/Support/ToolOutputFile.cpp2
-rw-r--r--lib/Support/Unix/Alarm.inc (renamed from lib/System/Unix/Alarm.inc)0
-rw-r--r--lib/Support/Unix/Host.inc (renamed from lib/System/Unix/Host.inc)8
-rw-r--r--lib/Support/Unix/Memory.inc (renamed from lib/System/Unix/Memory.inc)12
-rw-r--r--lib/Support/Unix/Mutex.inc (renamed from lib/System/Unix/Mutex.inc)8
-rw-r--r--lib/Support/Unix/Path.inc (renamed from lib/System/Unix/Path.inc)0
-rw-r--r--lib/Support/Unix/Process.inc (renamed from lib/System/Unix/Process.inc)26
-rw-r--r--lib/Support/Unix/Program.inc (renamed from lib/System/Unix/Program.inc)0
-rw-r--r--lib/Support/Unix/README.txt (renamed from lib/System/Unix/README.txt)6
-rw-r--r--lib/Support/Unix/RWMutex.inc (renamed from lib/System/Unix/RWMutex.inc)4
-rw-r--r--lib/Support/Unix/Signals.inc (renamed from lib/System/Unix/Signals.inc)18
-rw-r--r--lib/Support/Unix/ThreadLocal.inc (renamed from lib/System/Unix/ThreadLocal.inc)4
-rw-r--r--lib/Support/Unix/TimeValue.inc (renamed from lib/System/Unix/TimeValue.inc)12
-rw-r--r--lib/Support/Unix/Unix.h (renamed from lib/System/Unix/Unix.h)0
-rw-r--r--lib/Support/Unix/system_error.inc (renamed from lib/System/Unix/system_error.inc)0
-rw-r--r--lib/Support/Valgrind.cpp (renamed from lib/System/Valgrind.cpp)2
-rw-r--r--lib/Support/Windows/Alarm.inc (renamed from lib/System/Win32/Alarm.inc)0
-rw-r--r--lib/Support/Windows/DynamicLibrary.inc (renamed from lib/System/Win32/DynamicLibrary.inc)15
-rw-r--r--lib/Support/Windows/Host.inc (renamed from lib/System/Win32/Host.inc)2
-rw-r--r--lib/Support/Windows/Memory.inc (renamed from lib/System/Win32/Memory.inc)12
-rw-r--r--lib/Support/Windows/Mutex.inc (renamed from lib/System/Win32/Mutex.inc)14
-rw-r--r--lib/Support/Windows/Path.inc (renamed from lib/System/Win32/Path.inc)2
-rw-r--r--lib/Support/Windows/Process.inc (renamed from lib/System/Win32/Process.inc)14
-rw-r--r--lib/Support/Windows/Program.inc (renamed from lib/System/Win32/Program.inc)2
-rw-r--r--lib/Support/Windows/RWMutex.inc (renamed from lib/System/Win32/RWMutex.inc)8
-rw-r--r--lib/Support/Windows/Signals.inc (renamed from lib/System/Win32/Signals.inc)3
-rw-r--r--lib/Support/Windows/ThreadLocal.inc (renamed from lib/System/Win32/ThreadLocal.inc)8
-rw-r--r--lib/Support/Windows/TimeValue.inc (renamed from lib/System/Win32/TimeValue.inc)6
-rw-r--r--lib/Support/Windows/Windows.h (renamed from lib/System/Win32/Win32.h)0
-rw-r--r--lib/Support/Windows/system_error.inc (renamed from lib/System/Win32/system_error.inc)0
-rw-r--r--lib/Support/raw_ostream.cpp4
-rw-r--r--lib/Support/system_error.cpp (renamed from lib/System/system_error.cpp)6
-rw-r--r--lib/System/CMakeLists.txt52
-rw-r--r--lib/System/Makefile20
-rw-r--r--lib/Target/TargetData.cpp2
-rw-r--r--lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h2
-rw-r--r--lib/Target/X86/X86JITInfo.cpp2
-rw-r--r--lib/Target/X86/X86Subtarget.cpp2
-rw-r--r--lib/VMCore/Attributes.cpp4
-rw-r--r--lib/VMCore/Function.cpp4
-rw-r--r--lib/VMCore/LeakDetector.cpp4
-rw-r--r--lib/VMCore/PassManager.cpp2
-rw-r--r--lib/VMCore/PassRegistry.cpp2
-rw-r--r--lib/VMCore/Type.cpp2
115 files changed, 287 insertions, 310 deletions
diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp
index 9d92853c431..a5804208c46 100644
--- a/lib/Analysis/ConstantFolding.cpp
+++ b/lib/Analysis/ConstantFolding.cpp
@@ -30,7 +30,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Support/MathExtras.h"
-#include "llvm/System/FEnv.h"
+#include "llvm/Support/FEnv.h"
#include <cerrno>
#include <cmath>
using namespace llvm;
diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp
index 54c715c604d..e2e5593c6bf 100644
--- a/lib/Archive/Archive.cpp
+++ b/lib/Archive/Archive.cpp
@@ -16,7 +16,7 @@
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Module.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/Process.h"
+#include "llvm/Support/Process.h"
#include <memory>
#include <cstring>
using namespace llvm;
diff --git a/lib/Archive/ArchiveInternals.h b/lib/Archive/ArchiveInternals.h
index 08f20e74811..55684f7023d 100644
--- a/lib/Archive/ArchiveInternals.h
+++ b/lib/Archive/ArchiveInternals.h
@@ -15,7 +15,7 @@
#define LIB_ARCHIVE_ARCHIVEINTERNALS_H
#include "llvm/Bitcode/Archive.h"
-#include "llvm/System/TimeValue.h"
+#include "llvm/Support/TimeValue.h"
#include "llvm/ADT/StringExtras.h"
#include <cstring>
diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp
index 7eeeb59896d..de5887e5c79 100644
--- a/lib/Archive/ArchiveWriter.cpp
+++ b/lib/Archive/ArchiveWriter.cpp
@@ -16,8 +16,8 @@
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/Process.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/Process.h"
+#include "llvm/Support/Signals.h"
#include <fstream>
#include <ostream>
#include <iomanip>
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp
index 4e6e6d984f4..a1f5b38a513 100644
--- a/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -26,7 +26,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Program.h"
+#include "llvm/Support/Program.h"
using namespace llvm;
/// These are manifest constants used by the bitcode writer. They do not need to
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index d242326af14..f2c7238f5fa 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -39,7 +39,7 @@
#include "llvm/Support/ValueHandle.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Timer.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
using namespace llvm;
static cl::opt<bool> PrintDbgScope("print-dbgscope", cl::Hidden,
diff --git a/lib/CodeGen/ELF.h b/lib/CodeGen/ELF.h
index fb884c9e8b7..e08feeb2753 100644
--- a/lib/CodeGen/ELF.h
+++ b/lib/CodeGen/ELF.h
@@ -23,7 +23,7 @@
#include "llvm/CodeGen/BinaryObject.h"
#include "llvm/CodeGen/MachineRelocation.h"
#include "llvm/Support/ELF.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
namespace llvm {
class GlobalValue;
diff --git a/lib/CodeGen/PseudoSourceValue.cpp b/lib/CodeGen/PseudoSourceValue.cpp
index 5e86e5a9447..73b66d868f3 100644
--- a/lib/CodeGen/PseudoSourceValue.cpp
+++ b/lib/CodeGen/PseudoSourceValue.cpp
@@ -18,7 +18,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include <map>
using namespace llvm;
diff --git a/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h b/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
index ac2d33884b2..2dcb2295732 100644
--- a/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
+++ b/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
@@ -16,7 +16,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/DebugLoc.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
namespace llvm {
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 143f10d1ece..1ceb45f349e 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -44,7 +44,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallSet.h"
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp
index 1f5711c4e4e..7f21e650ef9 100644
--- a/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -26,8 +26,8 @@
#include "llvm/Support/MutexGuard.h"
#include "llvm/Support/ValueHandle.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/DynamicLibrary.h"
-#include "llvm/System/Host.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/Host.h"
#include "llvm/Target/TargetData.h"
#include <cmath>
#include <cstring>
diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 57d12606bc7..062256a2ac7 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -24,10 +24,10 @@
#include "llvm/Module.h"
#include "llvm/Config/config.h" // Detect libffi
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/System/DynamicLibrary.h"
+#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/ManagedStatic.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include <csignal>
#include <cstdio>
#include <map>
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h
index 564e9abad9e..bfebe3debfc 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -19,7 +19,7 @@
#include "llvm/ExecutionEngine/GenericValue.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/CallSite.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/InstVisitor.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp
index 274f816f39e..169e1bae547 100644
--- a/lib/ExecutionEngine/JIT/Intercept.cpp
+++ b/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -17,7 +17,7 @@
#include "JIT.h"
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/System/DynamicLibrary.h"
+#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Config/config.h"
using namespace llvm;
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp
index 2bf216a4a4a..cc76b138a8a 100644
--- a/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/lib/ExecutionEngine/JIT/JIT.cpp
@@ -30,7 +30,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MutexGuard.h"
-#include "llvm/System/DynamicLibrary.h"
+#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Config/config.h"
using namespace llvm;
diff --git a/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp b/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp
index d01d34b65c2..3b5acb7ecc4 100644
--- a/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp
+++ b/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp
@@ -25,7 +25,7 @@
#include "llvm/Support/Compiler.h"
#include "llvm/Support/MutexGuard.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include <string>
#include <vector>
diff --git a/lib/ExecutionEngine/JIT/JITDebugRegisterer.h b/lib/ExecutionEngine/JIT/JITDebugRegisterer.h
index 7e53d784713..dce506bbfef 100644
--- a/lib/ExecutionEngine/JIT/JITDebugRegisterer.h
+++ b/lib/ExecutionEngine/JIT/JITDebugRegisterer.h
@@ -16,7 +16,7 @@
#define LLVM_EXECUTION_ENGINE_JIT_DEBUGREGISTERER_H
#include "llvm/ADT/DenseMap.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include <string>
// This must be kept in sync with gdb/gdb/jit.h .
diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 4c0d0789cce..4cd8757ad0b 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -42,8 +42,8 @@
#include "llvm/Support/MutexGuard.h"
#include "llvm/Support/ValueHandle.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Disassembler.h"
-#include "llvm/System/Memory.h"
+#include "llvm/Support/Disassembler.h"
+#include "llvm/Support/Memory.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallVector.h"
diff --git a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp
index 653e6f1fc07..eec23cec0af 100644
--- a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp
+++ b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp
@@ -22,7 +22,7 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Memory.h"
+#include "llvm/Support/Memory.h"
#include <vector>
#include <cassert>
#include <climits>
diff --git a/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp b/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
index 1ca084b5808..670fa7da1fe 100644
--- a/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
+++ b/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
@@ -26,7 +26,7 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ValueHandle.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Errno.h"
+#include "llvm/Support/Errno.h"
#include "llvm/Config/config.h"
#include <stddef.h>
using namespace llvm;
diff --git a/lib/ExecutionEngine/JIT/TargetSelect.cpp b/lib/ExecutionEngine/JIT/TargetSelect.cpp
index 3349c338052..6b7173cece1 100644
--- a/lib/ExecutionEngine/JIT/TargetSelect.cpp
+++ b/lib/ExecutionEngine/JIT/TargetSelect.cpp
@@ -18,7 +18,7 @@
#include "llvm/ADT/Triple.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Host.h"
+#include "llvm/Support/Host.h"
#include "llvm/Target/SubtargetFeature.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetRegistry.h"
diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/lib/ExecutionEngine/MCJIT/MCJIT.cpp
index 532a438ae80..f1e9dab250b 100644
--- a/lib/ExecutionEngine/MCJIT/MCJIT.cpp
+++ b/lib/ExecutionEngine/MCJIT/MCJIT.cpp
@@ -11,7 +11,7 @@
#include "llvm/ExecutionEngine/GenericValue.h"
#include "llvm/ExecutionEngine/MCJIT.h"
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/System/DynamicLibrary.h"
+#include "llvm/Support/DynamicLibrary.h"
using namespace llvm;
diff --git a/lib/ExecutionEngine/MCJIT/TargetSelect.cpp b/lib/ExecutionEngine/MCJIT/TargetSelect.cpp
index 0ade39666bc..50f65938bb0 100644
--- a/lib/ExecutionEngine/MCJIT/TargetSelect.cpp
+++ b/lib/ExecutionEngine/MCJIT/TargetSelect.cpp
@@ -18,7 +18,7 @@
#include "llvm/ADT/Triple.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Host.h"
+#include "llvm/Support/Host.h"
#include "llvm/Target/SubtargetFeature.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetRegistry.h"
diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp
index 1be2becc86c..cbbdd4ba101 100644
--- a/lib/Linker/LinkItems.cpp
+++ b/lib/Linker/LinkItems.cpp
@@ -15,7 +15,7 @@
#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MemoryBuffer.h"
using namespace llvm;
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 2903a7e7154..dd0b07e09bd 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -28,7 +28,7 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
#include "llvm/Transforms/Utils/ValueMapper.h"
#include "llvm/ADT/DenseMap.h"
using namespace llvm;
diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp
index 19ecaa3965d..6e27fdad03a 100644
--- a/lib/Linker/Linker.cpp
+++ b/lib/Linker/Linker.cpp
@@ -14,7 +14,7 @@
#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Config/config.h"
diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp
index edde4b1fcb4..37444c9c256 100644
--- a/lib/MC/MCAsmInfo.cpp
+++ b/lib/MC/MCAsmInfo.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include <cctype>
#include <cstring>
using namespace llvm;
diff --git a/lib/MC/MCDisassembler/EDDisassembler.h b/lib/MC/MCDisassembler/EDDisassembler.h
index e2f850bcdba..fdbe7ad24c1 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.h
+++ b/lib/MC/MCDisassembler/EDDisassembler.h
@@ -21,7 +21,7 @@
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include <map>
#include <set>
diff --git a/lib/MC/MCDisassembler/EDInst.h b/lib/MC/MCDisassembler/EDInst.h
index 39d264fb7aa..ceb9505028d 100644
--- a/lib/MC/MCDisassembler/EDInst.h
+++ b/lib/MC/MCDisassembler/EDInst.h
@@ -16,7 +16,7 @@
#ifndef LLVM_EDINST_H
#define LLVM_EDINST_H
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include "llvm/ADT/SmallVector.h"
#include <string>
#include <vector>
diff --git a/lib/MC/MCDisassembler/EDOperand.h b/lib/MC/MCDisassembler/EDOperand.h
index 6e695224318..50260ec965a 100644
--- a/lib/MC/MCDisassembler/EDOperand.h
+++ b/lib/MC/MCDisassembler/EDOperand.h
@@ -16,7 +16,7 @@
#ifndef LLVM_EDOPERAND_H
#define LLVM_EDOPERAND_H
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
namespace llvm {
diff --git a/lib/MC/MCDisassembler/EDToken.h b/lib/MC/MCDisassembler/EDToken.h
index 6b2aeac60ba..ba467078686 100644
--- a/lib/MC/MCDisassembler/EDToken.h
+++ b/lib/MC/MCDisassembler/EDToken.h
@@ -17,7 +17,7 @@
#define LLVM_EDTOKEN_H
#include "llvm/ADT/StringRef.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include <string>
#include <vector>
diff --git a/lib/MC/WinCOFFObjectWriter.cpp b/lib/MC/WinCOFFObjectWriter.cpp
index b330bddce6f..4aabbc4862b 100644
--- a/lib/MC/WinCOFFObjectWriter.cpp
+++ b/lib/MC/WinCOFFObjectWriter.cpp
@@ -31,7 +31,7 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/System/TimeValue.h"
+#include "llvm/Support/TimeValue.h"
#include "../Target/X86/X86FixupKinds.h"
diff --git a/lib/Object/MachOObject.cpp b/lib/Object/MachOObject.cpp
index 1051ce27fa0..7592a994c65 100644
--- a/lib/Object/MachOObject.cpp
+++ b/lib/Object/MachOObject.cpp
@@ -10,8 +10,8 @@
#include "llvm/Object/MachOObject.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/Host.h"
-#include "llvm/System/SwapByteOrder.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/SwapByteOrder.h"
using namespace llvm;
using namespace llvm::object;
diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp
index 0ef730bd4eb..3ea39b37936 100644
--- a/lib/Object/ObjectFile.cpp
+++ b/lib/Object/ObjectFile.cpp
@@ -14,7 +14,7 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
using namespace llvm;
using namespace object;
diff --git a/lib/System/Alarm.cpp b/lib/Support/Alarm.cpp
index 0014ca716b3..58ad609cd2c 100644
--- a/lib/System/Alarm.cpp
+++ b/lib/Support/Alarm.cpp
@@ -7,11 +7,11 @@
//
//===----------------------------------------------------------------------===//
//
-// This file implements the Alarm functionality
+// This file implements the Alarm functionality
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Alarm.h"
+#include "llvm/Support/Alarm.h"
#include "llvm/Config/config.h"
namespace llvm {
@@ -29,5 +29,5 @@ using namespace sys;
#include "Unix/Alarm.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/Alarm.inc"
+#include "Windows/Alarm.inc"
#endif
diff --git a/lib/Support/Allocator.cpp b/lib/Support/Allocator.cpp
index 02b45d8af98..5e27df6628e 100644
--- a/lib/Support/Allocator.cpp
+++ b/lib/Support/Allocator.cpp
@@ -12,10 +12,10 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/Allocator.h"
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#include "llvm/Support/Recycler.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Memory.h"
+#include "llvm/Support/Memory.h"
#include <cstring>
namespace llvm {
diff --git a/lib/System/Atomic.cpp b/lib/Support/Atomic.cpp
index 7ba8b774d5e..c7b4bff2794 100644
--- a/lib/System/Atomic.cpp
+++ b/lib/Support/Atomic.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Atomic.h"
+#include "llvm/Support/Atomic.h"
#include "llvm/Config/config.h"
using namespace llvm;
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index 8a6ed6fa6d6..105a507abd6 100644
--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
@@ -1,5 +1,8 @@
## FIXME: This only requires RTTI because tblgen uses it. Fix that.
set(LLVM_REQUIRES_RTTI 1)
+if( MINGW )
+ set(LLVM_REQUIRES_EH 1)
+endif()
add_llvm_library(LLVMSupport
APFloat.cpp
@@ -49,4 +52,51 @@ add_llvm_library(LLVMSupport
regexec.c
regfree.c
regstrlcpy.c
+
+# System
+ Alarm.cpp
+ Atomic.cpp
+ Disassembler.cpp
+ DynamicLibrary.cpp
+ Errno.cpp
+ Host.cpp
+ IncludeFile.cpp
+ Memory.cpp
+ Mutex.cpp
+ Path.cpp
+ Process.cpp
+ Program.cpp
+ RWMutex.cpp
+ SearchForAddressOfSpecialSymbol.cpp
+ Signals.cpp
+ system_error.cpp
+ ThreadLocal.cpp
+ Threading.cpp
+ TimeValue.cpp
+ Valgrind.cpp
+ Unix/Alarm.inc
+ Unix/Host.inc
+ Unix/Memory.inc
+ Unix/Mutex.inc
+ Unix/Path.inc
+ Unix/Process.inc
+ Unix/Program.inc
+ Unix/RWMutex.inc
+ Unix/Signals.inc
+ Unix/system_error.inc
+ Unix/ThreadLocal.inc
+ Unix/TimeValue.inc
+ Windows/Alarm.inc
+ Windows/DynamicLibrary.inc
+ Windows/Host.inc
+ Windows/Memory.inc
+ Windows/Mutex.inc
+ Windows/Path.inc
+ Windows/Process.inc
+ Windows/Program.inc
+ Windows/RWMutex.inc
+ Windows/Signals.inc
+ Windows/system_error.inc
+ Windows/ThreadLocal.inc
+ Windows/TimeValue.inc
)
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 38ef0849616..a99e46dbd1c 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -23,8 +23,8 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
-#include "llvm/System/Host.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/Path.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallString.h"
diff --git a/lib/Support/CrashRecoveryContext.cpp b/lib/Support/CrashRecoveryContext.cpp
index f24d6bdad84..bf8ca3f844b 100644
--- a/lib/Support/CrashRecoveryContext.cpp
+++ b/lib/Support/CrashRecoveryContext.cpp
@@ -10,8 +10,8 @@
#include "llvm/Support/CrashRecoveryContext.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Config/config.h"
-#include "llvm/System/Mutex.h"
-#include "llvm/System/ThreadLocal.h"
+#include "llvm/Support/Mutex.h"
+#include "llvm/Support/ThreadLocal.h"
#include <setjmp.h>
#include <cstdio>
using namespace llvm;
diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp
index 7f48f8aae71..9fdb12ecfdc 100644
--- a/lib/Support/Debug.cpp
+++ b/lib/Support/Debug.cpp
@@ -26,7 +26,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/circular_raw_ostream.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/Signals.h"
using namespace llvm;
diff --git a/lib/System/Disassembler.cpp b/lib/Support/Disassembler.cpp
index 139e3be1aae..6362aff43a9 100644
--- a/lib/System/Disassembler.cpp
+++ b/lib/Support/Disassembler.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Config/config.h"
-#include "llvm/System/Disassembler.h"
+#include "llvm/Support/Disassembler.h"
#include <cassert>
#include <iomanip>
diff --git a/lib/System/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp
index 33f86334e38..cd9927a193a 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/Support/DynamicLibrary.cpp
@@ -14,8 +14,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/DynamicLibrary.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/Config/config.h"
#include <cstdio>
#include <cstring>
@@ -47,7 +47,7 @@ void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName,
#ifdef LLVM_ON_WIN32
-#include "Win32/DynamicLibrary.inc"
+#include "Windows/DynamicLibrary.inc"
#else
@@ -117,7 +117,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
std::map<std::string, void *>::iterator I =
ExplicitSymbols->find(symbolName);
std::map<std::string, void *>::iterator E = ExplicitSymbols->end();
-
+
if (I != E)
return I->second;
}
@@ -146,7 +146,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
if (!strcmp(symbolName, #SYM)) return &SYM
// On linux we have a weird situation. The stderr/out/in symbols are both
-// macros and global variables because of standards requirements. So, we
+// macros and global variables because of standards requirements. So, we
// boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
#if defined(__linux__)
{
diff --git a/lib/System/Errno.cpp b/lib/Support/Errno.cpp
index 68f66f6e439..312d91e0638 100644
--- a/lib/System/Errno.cpp
+++ b/lib/Support/Errno.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Errno.h"
+#include "llvm/Support/Errno.h"
#include "llvm/Config/config.h" // Get autoconf configuration settings
#if HAVE_STRING_H
diff --git a/lib/Support/ErrorHandling.cpp b/lib/Support/ErrorHandling.cpp
index 66b2c83fe73..3579546d757 100644
--- a/lib/Support/ErrorHandling.cpp
+++ b/lib/Support/ErrorHandling.cpp
@@ -16,8 +16,8 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Signals.h"
-#include "llvm/System/Threading.h"
+#include "llvm/Support/Signals.h"
+#include "llvm/Support/Threading.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Config/config.h"
#include <cassert>
diff --git a/lib/Support/FileUtilities.cpp b/lib/Support/FileUtilities.cpp
index 1bde2fe8a87..72200850c57 100644
--- a/lib/Support/FileUtilities.cpp
+++ b/lib/Support/FileUtilities.cpp
@@ -15,7 +15,7 @@
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallString.h"
#include <cstdlib>
diff --git a/lib/Support/FoldingSet.cpp b/lib/Support/FoldingSet.cpp
index 11a1de4a953..a4f80a90d6d 100644
--- a/lib/Support/FoldingSet.cpp
+++ b/lib/Support/FoldingSet.cpp
@@ -18,7 +18,7 @@
#include "llvm/Support/Allocator.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MathExtras.h"
-#include "llvm/System/Host.h"
+#include "llvm/Support/Host.h"
#include <cassert>
#include <cstring>
using namespace llvm;
diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp
index 79e978afa09..0dba28a2530 100644
--- a/lib/Support/GraphWriter.cpp
+++ b/lib/Support/GraphWriter.cpp
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/GraphWriter.h"
-#include "llvm/System/Path.h"
-#include "llvm/System/Program.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/Program.h"
#include "llvm/Config/config.h"
using namespace llvm;
diff --git a/lib/System/Host.cpp b/lib/Support/Host.cpp
index 17384a18f94..4dacf9691d6 100644
--- a/lib/System/Host.cpp
+++ b/lib/Support/Host.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Host.h"
+#include "llvm/Support/Host.h"
#include "llvm/Config/config.h"
#include <string.h>
@@ -20,7 +20,7 @@
#include "Unix/Host.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/Host.inc"
+#include "Windows/Host.inc"
#endif
#ifdef _MSC_VER
#include <intrin.h>
diff --git a/lib/System/IncludeFile.cpp b/lib/Support/IncludeFile.cpp
index 8258d40326f..e41d1f0a811 100644
--- a/lib/System/IncludeFile.cpp
+++ b/lib/Support/IncludeFile.cpp
@@ -11,10 +11,10 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/IncludeFile.h"
+#include "llvm/Support/IncludeFile.h"
using namespace llvm;
// This constructor is used to ensure linking of other modules. See the
-// llvm/System/IncludeFile.h header for details.
+// llvm/System/IncludeFile.h header for details.
IncludeFile::IncludeFile(const void*) {}
diff --git a/lib/Support/Makefile b/lib/Support/Makefile
index 48c21f4fd9e..d68e500ca5f 100644
--- a/lib/Support/Makefile
+++ b/lib/Support/Makefile
@@ -14,4 +14,9 @@ BUILD_ARCHIVE = 1
## FIXME: This only requires RTTI because tblgen uses it. Fix that.
REQUIRES_RTTI = 1
+EXTRA_DIST = Unix Win32 README.txt
+
include $(LEVEL)/Makefile.common
+
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp
index 4e655a0f9ee..c767c15e71c 100644
--- a/lib/Support/ManagedStatic.cpp
+++ b/lib/Support/ManagedStatic.cpp
@@ -13,7 +13,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Config/config.h"
-#include "llvm/System/Atomic.h"
+#include "llvm/Support/Atomic.h"
#include <cassert>
using namespace llvm;
diff --git a/lib/System/Memory.cpp b/lib/Support/Memory.cpp
index ef23b8d12aa..a9689b2c39f 100644
--- a/lib/System/Memory.cpp
+++ b/lib/Support/Memory.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Memory.h"
-#include "llvm/System/Valgrind.h"
+#include "llvm/Support/Memory.h"
+#include "llvm/Support/Valgrind.h"
#include "llvm/Config/config.h"
namespace llvm {
@@ -25,7 +25,7 @@ using namespace sys;
#include "Unix/Memory.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/Memory.inc"
+#include "Windows/Memory.inc"
#endif
extern "C" void sys_icache_invalidate(const void *Addr, size_t len);
@@ -35,7 +35,7 @@ extern "C" void sys_icache_invalidate(const void *Addr, size_t len);
/// platforms.
void llvm::sys::Memory::InvalidateInstructionCache(const void *Addr,
size_t Len) {
-
+
// icache invalidation for PPC and ARM.
#if defined(__APPLE__)
diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp
index 5b701a5c607..07a5ed478c4 100644
--- a/lib/Support/MemoryBuffer.cpp
+++ b/lib/Support/MemoryBuffer.cpp
@@ -15,10 +15,10 @@
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/MathExtras.h"
-#include "llvm/System/Errno.h"
-#include "llvm/System/Path.h"
-#include "llvm/System/Process.h"
-#include "llvm/System/Program.h"
+#include "llvm/Support/Errno.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/Process.h"
+#include "llvm/Support/Program.h"
#include <cassert>
#include <cstdio>
#include <cstring>
@@ -203,14 +203,14 @@ MemoryBuffer *MemoryBuffer::getFile(const char *Filename, std::string *ErrStr,
if (ErrStr) *ErrStr = sys::StrError();
return 0;
}
-
+
return getOpenFile(FD, Filename, ErrStr, FileSize);
}
-
+
MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename,
std::string *ErrStr, int64_t FileSize) {
FileCloser FC(FD); // Close FD on return.
-
+
// If we don't know the file size, use fstat to find out. fstat on an open
// file descriptor is cheaper than stat on a random path.
if (FileSize == -1) {
@@ -222,8 +222,8 @@ MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename,
}
FileSize = FileInfo.st_size;
}
-
-
+
+
// If the file is large, try to use mmap to read it in. We don't use mmap
// for small files, because this can severely fragment our address space. Also
// don't try to map files that are exactly a multiple of the system page size,
diff --git a/lib/System/Mutex.cpp b/lib/Support/Mutex.cpp
index 8ccd6e52c4d..488868febe4 100644
--- a/lib/System/Mutex.cpp
+++ b/lib/Support/Mutex.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Config/config.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only TRULY operating system
@@ -149,9 +149,8 @@ MutexImpl::tryacquire()
#elif defined(LLVM_ON_UNIX)
#include "Unix/Mutex.inc"
#elif defined( LLVM_ON_WIN32)
-#include "Win32/Mutex.inc"
+#include "Windows/Mutex.inc"
#else
#warning Neither LLVM_ON_UNIX nor LLVM_ON_WIN32 was set in System/Mutex.cpp
#endif
#endif
-
diff --git a/lib/System/Path.cpp b/lib/Support/Path.cpp
index ba47b51ff09..394e013b8b2 100644
--- a/lib/System/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Path.h"
+#include "llvm/Support/Path.h"
#include "llvm/Config/config.h"
#include <cassert>
#include <cstring>
@@ -292,6 +292,5 @@ static StringRef getDirnameCharSep(StringRef path, const char *Sep) {
#include "Unix/Path.inc"
#endif
#if defined(LLVM_ON_WIN32)
-#include "Win32/Path.inc"
+#include "Windows/Path.inc"
#endif
-
diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
index 36caecffeed..2924cfa3889 100644
--- a/lib/Support/PluginLoader.cpp
+++ b/lib/Support/PluginLoader.cpp
@@ -15,8 +15,8 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/DynamicLibrary.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/Mutex.h"
#include <vector>
using namespace llvm;
diff --git a/lib/Support/PrettyStackTrace.cpp b/lib/Support/PrettyStackTrace.cpp
index 3c8a10849d1..2f46b9e2b98 100644
--- a/lib/Support/PrettyStackTrace.cpp
+++ b/lib/Support/PrettyStackTrace.cpp
@@ -15,8 +15,8 @@
#include "llvm/Config/config.h" // Get autoconf configuration settings
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Signals.h"
-#include "llvm/System/ThreadLocal.h"
+#include "llvm/Support/Signals.h"
+#include "llvm/Support/ThreadLocal.h"
#include "llvm/ADT/SmallString.h"
#ifdef HAVE_CRASHREPORTERCLIENT_H
diff --git a/lib/System/Process.cpp b/lib/Support/Process.cpp
index e93b2af4c12..88ca7c3f220 100644
--- a/lib/System/Process.cpp
+++ b/lib/Support/Process.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Process.h"
+#include "llvm/Support/Process.h"
#include "llvm/Config/config.h"
namespace llvm {
@@ -29,5 +29,5 @@ using namespace sys;
#include "Unix/Process.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/Process.inc"
+#include "Windows/Process.inc"
#endif
diff --git a/lib/System/Program.cpp b/lib/Support/Program.cpp
index 90aba763fa9..01860b082d6 100644
--- a/lib/System/Program.cpp
+++ b/lib/Support/Program.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Program.h"
+#include "llvm/Support/Program.h"
#include "llvm/Config/config.h"
using namespace llvm;
using namespace sys;
@@ -52,5 +52,5 @@ Program::ExecuteNoWait(const Path& path,
#include "Unix/Program.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/Program.inc"
+#include "Windows/Program.inc"
#endif
diff --git a/lib/System/README.txt b/lib/Support/README.txt.system
index eacb20094a6..7a906b8dba4 100644
--- a/lib/System/README.txt
+++ b/lib/Support/README.txt.system
@@ -9,15 +9,15 @@ functionality necessary to support LLVM.
The software located here, of necessity, has very specific and stringent design
rules. Violation of these rules means that cracks in the shield could form and
the primary goal of the library is defeated. By consistently using this library,
-LLVM becomes more easily ported to new platforms since the only thing requiring
+LLVM becomes more easily ported to new platforms since the only thing requiring
porting is this library.
Complete documentation for the library can be found in the file:
- llvm/docs/SystemLibrary.html
+ llvm/docs/SystemLibrary.html
or at this URL:
http://llvm.org/docs/SystemLibrary.html
-While we recommend that you read the more detailed documentation, for the
+While we recommend that you read the more detailed documentation, for the
impatient, here's a high level summary of the library's requirements.
1. No system header files are to be exposed through the interface.
@@ -31,13 +31,13 @@ impatient, here's a high level summary of the library's requirements.
9. No duplicate function impementations are permitted within an operating
system class.
-To accomplish these requirements, the library has numerous design criteria that
+To accomplish these requirements, the library has numerous design criteria that
must be satisfied. Here's a high level summary of the library's design criteria:
1. No unused functionality (only what LLVM needs)
2. High-Level Interfaces
3. Use Opaque Classes
- 4. Common Implementations</a></li>
- 5. Multiple Implementations</a></li>
- 6. Minimize Memory Allocation</a></li>
+ 4. Common Implementations
+ 5. Multiple Implementations
+ 6. Minimize Memory Allocation
7. No Virtual Methods
diff --git a/lib/System/RWMutex.cpp b/lib/Support/RWMutex.cpp
index deb04709d82..fc02f9cf7c1 100644
--- a/lib/System/RWMutex.cpp
+++ b/lib/Support/RWMutex.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Config/config.h"
-#include "llvm/System/RWMutex.h"
+#include "llvm/Support/RWMutex.h"
#include <cstring>
//===----------------------------------------------------------------------===//
@@ -150,7 +150,7 @@ RWMutexImpl::writer_release()
#elif defined(LLVM_ON_UNIX)
#include "Unix/RWMutex.inc"
#elif defined( LLVM_ON_WIN32)
-#include "Win32/RWMutex.inc"
+#include "Windows/RWMutex.inc"
#else
#warning Neither LLVM_ON_UNIX nor LLVM_ON_WIN32 was set in System/Mutex.cpp
#endif
diff --git a/lib/System/SearchForAddressOfSpecialSymbol.cpp b/lib/Support/SearchForAddressOfSpecialSymbol.cpp
index 51ba417c214..51ba417c214 100644
--- a/lib/System/SearchForAddressOfSpecialSymbol.cpp
+++ b/lib/Support/SearchForAddressOfSpecialSymbol.cpp
diff --git a/lib/System/Signals.cpp b/lib/Support/Signals.cpp
index d345b0a9aed..a3af37d5fe6 100644
--- a/lib/System/Signals.cpp
+++ b/lib/Support/Signals.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Signals.h"
+#include "llvm/Support/Signals.h"
#include "llvm/Config/config.h"
namespace llvm {
@@ -30,5 +30,5 @@ using namespace sys;
#include "Unix/Signals.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/Signals.inc"
+#include "Windows/Signals.inc"
#endif
diff --git a/lib/Support/Statistic.cpp b/lib/Support/Statistic.cpp
index e32ab74a2d4..f0ed62690fd 100644
--- a/lib/Support/Statistic.cpp
+++ b/lib/Support/Statistic.cpp
@@ -26,7 +26,7 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/ADT/StringExtras.h"
#include <algorithm>
#include <cstring>
diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp
index 9646d75bd2e..54b5e97bfe1 100644
--- a/lib/Support/SystemUtils.cpp
+++ b/lib/Support/SystemUtils.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/SystemUtils.h"
-#include "llvm/System/Process.h"
-#include "llvm/System/Program.h"
+#include "llvm/Support/Process.h"
+#include "llvm/Support/Program.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
diff --git a/lib/Support/TargetRegistry.cpp b/lib/Support/TargetRegistry.cpp
index 5896447f5ea..293a5d7a016 100644
--- a/lib/Support/TargetRegistry.cpp
+++ b/lib/Support/TargetRegistry.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Target/TargetRegistry.h"
-#include "llvm/System/Host.h"
+#include "llvm/Support/Host.h"
#include <cassert>
using namespace llvm;
diff --git a/lib/System/ThreadLocal.cpp b/lib/Support/ThreadLocal.cpp
index f6a55a1c0b9..6b43048da15 100644
--- a/lib/System/ThreadLocal.cpp
+++ b/lib/Support/ThreadLocal.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Config/config.h"
-#include "llvm/System/ThreadLocal.h"
+#include "llvm/Support/ThreadLocal.h"
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only TRULY operating system
@@ -77,9 +77,8 @@ void ThreadLocalImpl::removeInstance() {
#elif defined(LLVM_ON_UNIX)
#include "Unix/ThreadLocal.inc"
#elif defined( LLVM_ON_WIN32)
-#include "Win32/ThreadLocal.inc"
+#include "Windows/ThreadLocal.inc"
#else
#warning Neither LLVM_ON_UNIX nor LLVM_ON_WIN32 was set in System/ThreadLocal.cpp
#endif
#endif
-
diff --git a/lib/System/Threading.cpp b/lib/Support/Threading.cpp
index 3b0bc72eca9..c2f85549f4d 100644
--- a/lib/System/Threading.cpp
+++ b/lib/Support/Threading.cpp
@@ -11,9 +11,9 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Threading.h"
-#include "llvm/System/Atomic.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Threading.h"
+#include "llvm/Support/Atomic.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/Config/config.h"
#include <cassert>
@@ -28,7 +28,7 @@ bool llvm::llvm_start_multithreaded() {
assert(!multithreaded_mode && "Already multithreaded!");
multithreaded_mode = true;
global_lock = new sys::Mutex(true);
-
+
// We fence here to ensure that all initialization is complete BEFORE we
// return from llvm_start_multithreaded().
sys::MemoryFence();
@@ -41,11 +41,11 @@ bool llvm::llvm_start_multithreaded() {
void llvm::llvm_stop_multithreaded() {
#ifdef LLVM_MULTITHREADED
assert(multithreaded_mode && "Not currently multithreaded!");
-
+
// We fence here to insure that all threaded operations are complete BEFORE we
// return from llvm_stop_multithreaded().
sys::MemoryFence();
-
+
multithreaded_mode = false;
delete global_lock;
#endif
@@ -98,7 +98,7 @@ void llvm::llvm_execute_on_thread(void (*Fn)(void*), void *UserData,
// Wait for the thread and clean up.
::pthread_join(Thread, 0);
-
+
error:
::pthread_attr_destroy(&Attr);
}
diff --git a/lib/System/TimeValue.cpp b/lib/Support/TimeValue.cpp
index cf4984cc4d1..1a0f7bc3639 100644
--- a/lib/System/TimeValue.cpp
+++ b/lib/Support/TimeValue.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/TimeValue.h"
+#include "llvm/Support/TimeValue.h"
#include "llvm/Config/config.h"
namespace llvm {
@@ -53,6 +53,5 @@ TimeValue::normalize( void ) {
#include "Unix/TimeValue.inc"
#endif
#ifdef LLVM_ON_WIN32
-#include "Win32/TimeValue.inc"
+#include "Windows/TimeValue.inc"
#endif
-
diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp
index 44ee1777cb5..a9ed5eecfa7 100644
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -17,8 +17,8 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Format.h"
-#include "llvm/System/Mutex.h"
-#include "llvm/System/Process.h"
+#include "llvm/Support/Mutex.h"
+#include "llvm/Support/Process.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/StringMap.h"
using namespace llvm;
diff --git a/lib/Support/ToolOutputFile.cpp b/lib/Support/ToolOutputFile.cpp
index 5b5ee6610a0..e7ca927ea53 100644
--- a/lib/Support/ToolOutputFile.cpp
+++ b/lib/Support/ToolOutputFile.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/Signals.h"
using namespace llvm;
tool_output_file::CleanupInstaller::CleanupInstaller(const char *filename)
diff --git a/lib/System/Unix/Alarm.inc b/lib/Support/Unix/Alarm.inc
index fb42b6c65da..fb42b6c65da 100644
--- a/lib/System/Unix/Alarm.inc
+++ b/lib/Support/Unix/Alarm.inc
diff --git a/lib/System/Unix/Host.inc b/lib/Support/Unix/Host.inc
index c76d6a4e18f..ca0de9ca9a8 100644
--- a/lib/System/Unix/Host.inc
+++ b/lib/Support/Unix/Host.inc
@@ -39,7 +39,7 @@ std::string sys::getHostTriple() {
StringRef HostTripleString(LLVM_HOSTTRIPLE);
std::pair<StringRef, StringRef> ArchSplit = HostTripleString.split('-');
-
+
// Normalize the arch, since the host triple may not actually match the host.
std::string Arch = ArchSplit.first;
@@ -77,16 +77,16 @@ std::string sys::getHostTriple() {
Triple += ArchSplit.second;
// Force i<N>86 to i386.
- if (Triple[0] == 'i' && isdigit(Triple[1]) &&
+ if (Triple[0] == 'i' && isdigit(Triple[1]) &&
Triple[2] == '8' && Triple[3] == '6')
Triple[1] = '3';
// On darwin, we want to update the version to match that of the
- // host.
+ // host.
std::string::size_type DarwinDashIdx = Triple.find("-darwin");
if (DarwinDashIdx != std::string::npos) {
Triple.resize(DarwinDashIdx + strlen("-darwin"));
-
+
// Only add the major part of the os version.
std::string Version = getOSVersion();
Triple += Version.substr(0, Version.find('.'));
diff --git a/lib/System/Unix/Memory.inc b/lib/Support/Unix/Memory.inc
index 1b038f9c6e0..4312d67183c 100644
--- a/lib/System/Unix/Memory.inc
+++ b/lib/Support/Unix/Memory.inc
@@ -1,10 +1,10 @@
//===- Unix/Memory.cpp - Generic UNIX System Configuration ------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file defines some functions for various memory management utilities.
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
#include "Unix.h"
-#include "llvm/System/DataTypes.h"
-#include "llvm/System/Process.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/Process.h"
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
@@ -28,7 +28,7 @@
/// to emit code to the memory then jump to it. Getting this type of memory
/// is very OS specific.
///
-llvm::sys::MemoryBlock
+llvm::sys::MemoryBlock
llvm::sys::Memory::AllocateRWX(size_t NumBytes, const MemoryBlock* NearBlock,
std::string *ErrMsg) {
if (NumBytes == 0) return MemoryBlock();
@@ -54,7 +54,7 @@ llvm::sys::Memory::AllocateRWX(size_t NumBytes, const MemoryBlock* NearBlock,
#endif
;
- void* start = NearBlock ? (unsigned char*)NearBlock->base() +
+ void* start = NearBlock ? (unsigned char*)NearBlock->base() +
NearBlock->size() : 0;
#if defined(__APPLE__) && defined(__arm__)
diff --git a/lib/System/Unix/Mutex.inc b/lib/Support/Unix/Mutex.inc
index 4a5e28de27b..5c50697fd0c 100644
--- a/lib/System/Unix/Mutex.inc
+++ b/lib/Support/Unix/Mutex.inc
@@ -1,10 +1,10 @@
//===- llvm/System/Unix/Mutex.inc - Unix Mutex Implementation ---*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Unix specific (non-pthread) Mutex class.
@@ -28,13 +28,13 @@ MutexImpl::~MutexImpl()
{
}
-bool
+bool
MutexImpl::release()
{
return true;
}
-bool
+bool
MutexImpl::tryacquire( void )
{
return true;
diff --git a/lib/System/Unix/Path.inc b/lib/Support/Unix/Path.inc
index 5ee3adc4d2d..5ee3adc4d2d 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/Support/Unix/Path.inc
diff --git a/lib/System/Unix/Process.inc b/lib/Support/Unix/Process.inc
index cf6a47a31c8..5cdb11ccebc 100644
--- a/lib/System/Unix/Process.inc
+++ b/lib/Support/Unix/Process.inc
@@ -1,10 +1,10 @@
//===- Unix/Process.cpp - Unix Process Implementation --------- -*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file provides the generic Unix implementation of the Process class.
@@ -41,8 +41,8 @@
using namespace llvm;
using namespace sys;
-unsigned
-Process::GetPageSize()
+unsigned
+Process::GetPageSize()
{
#if defined(__CYGWIN__)
// On Cygwin, getpagesize() returns 64k but the page size for the purposes of
@@ -104,20 +104,20 @@ Process::GetTotalMemoryUsage()
}
void
-Process::GetTimeUsage(TimeValue& elapsed, TimeValue& user_time,
+Process::GetTimeUsage(TimeValue& elapsed, TimeValue& user_time,
TimeValue& sys_time)
{
elapsed = TimeValue::now();
#if defined(HAVE_GETRUSAGE)
struct rusage usage;
::getrusage(RUSAGE_SELF, &usage);
- user_time = TimeValue(
- static_cast<TimeValue::SecondsType>( usage.ru_utime.tv_sec ),
- static_cast<TimeValue::NanoSecondsType>( usage.ru_utime.tv_usec *
+ user_time = TimeValue(
+ static_cast<TimeValue::SecondsType>( usage.ru_utime.tv_sec ),
+ static_cast<TimeValue::NanoSecondsType>( usage.ru_utime.tv_usec *
TimeValue::NANOSECONDS_PER_MICROSECOND ) );
- sys_time = TimeValue(
- static_cast<TimeValue::SecondsType>( usage.ru_stime.tv_sec ),
- static_cast<TimeValue::NanoSecondsType>( usage.ru_stime.tv_usec *
+ sys_time = TimeValue(
+ static_cast<TimeValue::SecondsType>( usage.ru_stime.tv_sec ),
+ static_cast<TimeValue::NanoSecondsType>( usage.ru_stime.tv_usec *
TimeValue::NANOSECONDS_PER_MICROSECOND ) );
#else
#warning Cannot get usage times on this platform
@@ -159,14 +159,14 @@ void Process::PreventCoreFiles() {
exception_port_t OriginalPorts[EXC_TYPES_COUNT];
exception_behavior_t OriginalBehaviors[EXC_TYPES_COUNT];
thread_state_flavor_t OriginalFlavors[EXC_TYPES_COUNT];
- kern_return_t err =
+ kern_return_t err =
task_get_exception_ports(mach_task_self(), EXC_MASK_ALL, OriginalMasks,
&Count, OriginalPorts, OriginalBehaviors,
OriginalFlavors);
if (err == KERN_SUCCESS) {
// replace each with MACH_PORT_NULL.
for (unsigned i = 0; i != Count; ++i)
- task_set_exception_ports(mach_task_self(), OriginalMasks[i],
+ task_set_exception_ports(mach_task_self(), OriginalMasks[i],
MACH_PORT_NULL, OriginalBehaviors[i],
OriginalFlavors[i]);
}
diff --git a/lib/System/Unix/Program.inc b/lib/Support/Unix/Program.inc
index e06f80ba833..e06f80ba833 100644
--- a/lib/System/Unix/Program.inc
+++ b/lib/Support/Unix/Program.inc
diff --git a/lib/System/Unix/README.txt b/lib/Support/Unix/README.txt
index b3bace483e5..3d547c2990d 100644
--- a/lib/System/Unix/README.txt
+++ b/lib/Support/Unix/README.txt
@@ -1,13 +1,13 @@
-llvm/lib/System/Unix README
+llvm/lib/Support/Unix README
===========================
This directory provides implementations of the lib/System classes that
-are common to two or more variants of UNIX. For example, the directory
+are common to two or more variants of UNIX. For example, the directory
structure underneath this directory could look like this:
Unix - only code that is truly generic to all UNIX platforms
Posix - code that is specific to Posix variants of UNIX
- SUS - code that is specific to the Single Unix Specification
+ SUS - code that is specific to the Single Unix Specification
SysV - code that is specific to System V variants of UNIX
As a rule, only those directories actually needing to be created should be
diff --git a/lib/System/Unix/RWMutex.inc b/lib/Support/Unix/RWMutex.inc
index e83d41ef4cf..ee9853e5af7 100644
--- a/lib/System/Unix/RWMutex.inc
+++ b/lib/Support/Unix/RWMutex.inc
@@ -1,10 +1,10 @@
//= llvm/System/Unix/RWMutex.inc - Unix Reader/Writer Mutual Exclusion Lock =//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Unix specific (non-pthread) RWMutex class.
diff --git a/lib/System/Unix/Signals.inc b/lib/Support/Unix/Signals.inc
index 997d4781d86..0a617591551 100644
--- a/lib/System/Unix/Signals.inc
+++ b/lib/Support/Unix/Signals.inc
@@ -1,10 +1,10 @@
//===- Signals.cpp - Generic Unix Signals Implementation -----*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file defines some helpful functions for dealing with the possibility of
@@ -14,7 +14,7 @@
#include "Unix.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include <vector>
#include <algorithm>
#if HAVE_EXECINFO_H
@@ -28,7 +28,7 @@
#endif
#if HAVE_DLFCN_H && __GNUG__
#include <dlfcn.h>
-#include <cxxabi.h>
+#include <cxxabi.h>
#endif
using namespace llvm;
@@ -82,11 +82,11 @@ static void RegisterHandler(int Signal) {
"Out of space for signal handlers!");
struct sigaction NewHandler;
-
+
NewHandler.sa_handler = SignalHandler;
NewHandler.sa_flags = SA_NODEFER|SA_RESETHAND;
- sigemptyset(&NewHandler.sa_mask);
-
+ sigemptyset(&NewHandler.sa_mask);
+
// Install the new handler, save the old one in RegisteredSignalInfo.
sigaction(Signal, &NewHandler,
&RegisteredSignalInfo[NumRegisteredSignals].SA);
@@ -144,7 +144,7 @@ static RETSIGTYPE SignalHandler(int Sig) {
IF(); // run the interrupt function.
return;
}
-
+
SignalsMutex.release();
raise(Sig); // Execute the default handler.
return;
@@ -205,7 +205,7 @@ void llvm::sys::AddSignalHandler(void (*FnPtr)(void *), void *Cookie) {
// trace so that the user has an indication of why and where we died.
//
// On glibc systems we have the 'backtrace' function, which works nicely, but
-// doesn't demangle symbols.
+// doesn't demangle symbols.
static void PrintStackTrace(void *) {
#ifdef HAVE_BACKTRACE
static void* StackTrace[256];
diff --git a/lib/System/Unix/ThreadLocal.inc b/lib/Support/Unix/ThreadLocal.inc
index 6769520a6fb..f009b72f105 100644
--- a/lib/System/Unix/ThreadLocal.inc
+++ b/lib/Support/Unix/ThreadLocal.inc
@@ -1,10 +1,10 @@
//=== llvm/System/Unix/ThreadLocal.inc - Unix Thread Local Data -*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Unix specific (non-pthread) ThreadLocal class.
diff --git a/lib/System/Unix/TimeValue.inc b/lib/Support/Unix/TimeValue.inc
index d8cc8f55eec..5cf5a9d44ed 100644
--- a/lib/System/Unix/TimeValue.inc
+++ b/lib/Support/Unix/TimeValue.inc
@@ -1,10 +1,10 @@
//===- Unix/TimeValue.cpp - Unix TimeValue Implementation -------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Unix specific portion of the TimeValue class.
@@ -26,7 +26,7 @@ std::string TimeValue::str() const {
time_t ourTime = time_t(this->toEpochTime());
#ifdef __hpux
-// note that the following line needs -D_REENTRANT on HP-UX to be picked up
+// note that the following line needs -D_REENTRANT on HP-UX to be picked up
asctime_r(localtime(&ourTime), buffer);
#else
::asctime_r(::localtime(&ourTime), buffer);
@@ -43,13 +43,13 @@ TimeValue TimeValue::now() {
// This is *really* unlikely to occur because the only gettimeofday
// errors concern the timezone parameter which we're passing in as 0.
// In the unlikely case it does happen, just return MinTime, no error
- // message needed.
+ // message needed.
return MinTime;
}
return TimeValue(
- static_cast<TimeValue::SecondsType>( the_time.tv_sec + PosixZeroTime.seconds_ ),
- static_cast<TimeValue::NanoSecondsType>( the_time.tv_usec *
+ static_cast<TimeValue::SecondsType>( the_time.tv_sec + PosixZeroTime.seconds_ ),
+ static_cast<TimeValue::NanoSecondsType>( the_time.tv_usec *
NANOSECONDS_PER_MICROSECOND ) );
}
diff --git a/lib/System/Unix/Unix.h b/lib/Support/Unix/Unix.h
index c15866f3d90..c15866f3d90 100644
--- a/lib/System/Unix/Unix.h
+++ b/lib/Support/Unix/Unix.h
diff --git a/lib/System/Unix/system_error.inc b/lib/Support/Unix/system_error.inc
index a382214877f..a382214877f 100644
--- a/lib/System/Unix/system_error.inc
+++ b/lib/Support/Unix/system_error.inc
diff --git a/lib/System/Valgrind.cpp b/lib/Support/Valgrind.cpp
index c76cfe40d3e..703448524ed 100644
--- a/lib/System/Valgrind.cpp
+++ b/lib/Support/Valgrind.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/Valgrind.h"
+#include "llvm/Support/Valgrind.h"
#include "llvm/Config/config.h"
#if HAVE_VALGRIND_VALGRIND_H
diff --git a/lib/System/Win32/Alarm.inc b/lib/Support/Windows/Alarm.inc
index e0d00a0142b..e0d00a0142b 100644
--- a/lib/System/Win32/Alarm.inc
+++ b/lib/Support/Windows/Alarm.inc
diff --git a/lib/System/Win32/DynamicLibrary.inc b/lib/Support/Windows/DynamicLibrary.inc
index c9a89e5b8c4..5fad37a1fea 100644
--- a/lib/System/Win32/DynamicLibrary.inc
+++ b/lib/Support/Windows/DynamicLibrary.inc
@@ -1,17 +1,17 @@
//===- Win32/DynamicLibrary.cpp - Win32 DL Implementation -------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file provides the Win32 specific implementation of DynamicLibrary.
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#ifdef __MINGW32__
#include <imagehlp.h>
@@ -35,7 +35,7 @@ namespace llvm {
using namespace sys;
//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Win32 specific code
+//=== WARNING: Implementation here must contain only Win32 specific code
//=== and must not be UNIX code.
//===----------------------------------------------------------------------===//
@@ -50,7 +50,7 @@ static std::vector<HMODULE> OpenedHandles;
extern "C" {
// Use old callback if:
// - Not using Visual Studio
-// - Visual Studio 2005 or earlier but only if we are not using the Windows SDK
+// - Visual Studio 2005 or earlier but only if we are not using the Windows SDK
// or Windows SDK version is older than 6.0
// Use new callback if:
// - Newer Visual Studio (comes with newer SDK).
@@ -89,7 +89,7 @@ extern "C" {
}
bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
- std::string *ErrMsg) {
+ std::string *ErrMsg) {
if (filename) {
HMODULE a_handle = LoadLibrary(filename);
@@ -143,7 +143,7 @@ bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
// First check symbols added via AddSymbol().
if (ExplicitSymbols) {
- std::map<std::string, void *>::iterator I =
+ std::map<std::string, void *>::iterator I =
ExplicitSymbols->find(symbolName);
std::map<std::string, void *>::iterator E = ExplicitSymbols->end();
if (I != E)
@@ -197,4 +197,3 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
}
}
-
diff --git a/lib/System/Win32/Host.inc b/lib/Support/Windows/Host.inc
index 18f00f8bc07..5377c77f037 100644
--- a/lib/System/Win32/Host.inc
+++ b/lib/Support/Windows/Host.inc
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#include <cstdio>
#include <string>
diff --git a/lib/System/Win32/Memory.inc b/lib/Support/Windows/Memory.inc
index 19fccbddc26..9f69e7367e6 100644
--- a/lib/System/Win32/Memory.inc
+++ b/lib/Support/Windows/Memory.inc
@@ -1,10 +1,10 @@
//===- Win32/Memory.cpp - Win32 Memory Implementation -----------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file provides the Win32 specific implementation of various Memory
@@ -12,15 +12,15 @@
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
-#include "llvm/System/DataTypes.h"
-#include "llvm/System/Process.h"
+#include "Windows.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/Process.h"
namespace llvm {
using namespace sys;
//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Win32 specific code
+//=== WARNING: Implementation here must contain only Win32 specific code
//=== and must not be UNIX code
//===----------------------------------------------------------------------===//
diff --git a/lib/System/Win32/Mutex.inc b/lib/Support/Windows/Mutex.inc
index 75f01fefacb..ff7d6429988 100644
--- a/lib/System/Win32/Mutex.inc
+++ b/lib/Support/Windows/Mutex.inc
@@ -1,10 +1,10 @@
//===- llvm/System/Win32/Mutex.inc - Win32 Mutex Implementation -*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Win32 specific (non-pthread) Mutex class.
@@ -16,8 +16,8 @@
//=== is guaranteed to work on *all* Win32 variants.
//===----------------------------------------------------------------------===//
-#include "Win32.h"
-#include "llvm/System/Mutex.h"
+#include "Windows.h"
+#include "llvm/Support/Mutex.h"
namespace llvm {
using namespace sys;
@@ -35,21 +35,21 @@ MutexImpl::~MutexImpl()
data_ = 0;
}
-bool
+bool
MutexImpl::acquire()
{
EnterCriticalSection((LPCRITICAL_SECTION)data_);
return true;
}
-bool
+bool
MutexImpl::release()
{
LeaveCriticalSection((LPCRITICAL_SECTION)data_);
return true;
}
-bool
+bool
MutexImpl::tryacquire()
{
return TryEnterCriticalSection((LPCRITICAL_SECTION)data_);
diff --git a/lib/System/Win32/Path.inc b/lib/Support/Windows/Path.inc
index 8990a420a02..e517eece737 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/Support/Windows/Path.inc
@@ -16,7 +16,7 @@
//=== is guaranteed to work on *all* Win32 variants.
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#include <malloc.h>
#include <cstdio>
diff --git a/lib/System/Win32/Process.inc b/lib/Support/Windows/Process.inc
index 15b41f00eaf..06a7f0054d5 100644
--- a/lib/System/Win32/Process.inc
+++ b/lib/Support/Windows/Process.inc
@@ -1,17 +1,17 @@
//===- Win32/Process.cpp - Win32 Process Implementation ------- -*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file provides the Win32 specific implementation of the Process class.
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#include <psapi.h>
#include <malloc.h>
#include <io.h>
@@ -25,7 +25,7 @@
#endif
//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Win32 specific code
+//=== WARNING: Implementation here must contain only Win32 specific code
//=== and must not be UNIX code
//===----------------------------------------------------------------------===//
@@ -51,13 +51,13 @@ inline unsigned GetPageSizeOnce() {
return static_cast<unsigned>(info.dwPageSize);
}
-unsigned
+unsigned
Process::GetPageSize() {
static const unsigned PageSize = GetPageSizeOnce();
return PageSize;
}
-size_t
+size_t
Process::GetMallocUsage()
{
_HEAPINFO hinfo;
@@ -86,7 +86,7 @@ Process::GetTimeUsage(
elapsed = TimeValue::now();
uint64_t ProcCreate, ProcExit, KernelTime, UserTime;
- GetProcessTimes(GetCurrentProcess(), (FILETIME*)&ProcCreate,
+ GetProcessTimes(GetCurrentProcess(), (FILETIME*)&ProcCreate,
(FILETIME*)&ProcExit, (FILETIME*)&KernelTime,
(FILETIME*)&UserTime);
diff --git a/lib/System/Win32/Program.inc b/lib/Support/Windows/Program.inc
index 2d6e665377e..0b92c78dc89 100644
--- a/lib/System/Win32/Program.inc
+++ b/lib/Support/Windows/Program.inc
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#include <cstdio>
#include <malloc.h>
#include <io.h>
diff --git a/lib/System/Win32/RWMutex.inc b/lib/Support/Windows/RWMutex.inc
index e2692269e3a..82ae8af1e52 100644
--- a/lib/System/Win32/RWMutex.inc
+++ b/lib/Support/Windows/RWMutex.inc
@@ -1,10 +1,10 @@
//= llvm/System/Win32/Mutex.inc - Win32 Reader/Writer Mutual Exclusion Lock =//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Win32 specific (non-pthread) RWMutex class.
@@ -16,10 +16,10 @@
//=== is guaranteed to work on *all* Win32 variants.
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
// FIXME: Windows does not have reader-writer locks pre-Vista. If you want
-// real reader-writer locks, you a pthreads implementation for Windows.
+// real reader-writer locks, you a threads implementation for Windows.
namespace llvm {
using namespace sys;
diff --git a/lib/System/Win32/Signals.inc b/lib/Support/Windows/Signals.inc
index 1ad17692671..c0e3eca3d32 100644
--- a/lib/System/Win32/Signals.inc
+++ b/lib/Support/Windows/Signals.inc
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#include <stdio.h>
#include <vector>
#include <algorithm>
@@ -323,4 +323,3 @@ static BOOL WINAPI LLVMConsoleCtrlHandler(DWORD dwCtrlType) {
LeaveCriticalSection(&CriticalSection);
return FALSE;
}
-
diff --git a/lib/System/Win32/ThreadLocal.inc b/lib/Support/Windows/ThreadLocal.inc
index e7e3cb7ce11..53070ead547 100644
--- a/lib/System/Win32/ThreadLocal.inc
+++ b/lib/Support/Windows/ThreadLocal.inc
@@ -1,10 +1,10 @@
//= llvm/System/Win32/ThreadLocal.inc - Win32 Thread Local Data -*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Win32 specific (non-pthread) ThreadLocal class.
@@ -16,8 +16,8 @@
//=== is guaranteed to work on *all* Win32 variants.
//===----------------------------------------------------------------------===//
-#include "Win32.h"
-#include "llvm/System/ThreadLocal.h"
+#include "Windows.h"
+#include "llvm/Support/ThreadLocal.h"
namespace llvm {
using namespace sys;
diff --git a/lib/System/Win32/TimeValue.inc b/lib/Support/Windows/TimeValue.inc
index e37f111fc77..12275526f1c 100644
--- a/lib/System/Win32/TimeValue.inc
+++ b/lib/Support/Windows/TimeValue.inc
@@ -1,17 +1,17 @@
//===- Win32/TimeValue.cpp - Win32 TimeValue Implementation -----*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file provides the Win32 implementation of the TimeValue class.
//
//===----------------------------------------------------------------------===//
-#include "Win32.h"
+#include "Windows.h"
#include <time.h>
namespace llvm {
diff --git a/lib/System/Win32/Win32.h b/lib/Support/Windows/Windows.h
index 00a7e75fc2a..00a7e75fc2a 100644
--- a/lib/System/Win32/Win32.h
+++ b/lib/Support/Windows/Windows.h
diff --git a/lib/System/Win32/system_error.inc b/lib/Support/Windows/system_error.inc
index db025828996..db025828996 100644
--- a/lib/System/Win32/system_error.inc
+++ b/lib/Support/Windows/system_error.inc
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index d3d653983b0..0279f40caba 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -13,8 +13,8 @@
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Format.h"
-#include "llvm/System/Program.h"
-#include "llvm/System/Process.h"
+#include "llvm/Support/Program.h"
+#include "llvm/Support/Process.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Config/config.h"
diff --git a/lib/System/system_error.cpp b/lib/Support/system_error.cpp
index e7de85255e1..cd18906f067 100644
--- a/lib/System/system_error.cpp
+++ b/lib/Support/system_error.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/System/system_error.h"
-#include "llvm/System/Errno.h"
+#include "llvm/Support/system_error.h"
+#include "llvm/Support/Errno.h"
#include <string>
#include <cstring>
@@ -117,5 +117,5 @@ error_code::message() const {
#include "Unix/system_error.inc"
#endif
#if defined(LLVM_ON_WIN32)
-#include "Win32/system_error.inc"
+#include "Windows/system_error.inc"
#endif
diff --git a/lib/System/CMakeLists.txt b/lib/System/CMakeLists.txt
deleted file mode 100644
index 16612ad88f6..00000000000
--- a/lib/System/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-set(LLVM_REQUIRES_RTTI 1)
-if( MINGW )
- set(LLVM_REQUIRES_EH 1)
-endif()
-
-add_llvm_library(LLVMSystem
- Alarm.cpp
- Atomic.cpp
- Disassembler.cpp
- DynamicLibrary.cpp
- Errno.cpp
- Host.cpp
- IncludeFile.cpp
- Memory.cpp
- Mutex.cpp
- Path.cpp
- Process.cpp
- Program.cpp
- RWMutex.cpp
- SearchForAddressOfSpecialSymbol.cpp
- Signals.cpp
- system_error.cpp
- ThreadLocal.cpp
- Threading.cpp
- TimeValue.cpp
- Valgrind.cpp
- Unix/Alarm.inc
- Unix/Host.inc
- Unix/Memory.inc
- Unix/Mutex.inc
- Unix/Path.inc
- Unix/Process.inc
- Unix/Program.inc
- Unix/RWMutex.inc
- Unix/Signals.inc
- Unix/system_error.inc
- Unix/ThreadLocal.inc
- Unix/TimeValue.inc
- Win32/Alarm.inc
- Win32/DynamicLibrary.inc
- Win32/Host.inc
- Win32/Memory.inc
- Win32/Mutex.inc
- Win32/Path.inc
- Win32/Process.inc
- Win32/Program.inc
- Win32/RWMutex.inc
- Win32/Signals.inc
- Win32/system_error.inc
- Win32/ThreadLocal.inc
- Win32/TimeValue.inc
- )
diff --git a/lib/System/Makefile b/lib/System/Makefile
deleted file mode 100644
index 5d4fda923f7..00000000000
--- a/lib/System/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-##===- lib/System/Makefile ---------------------------------*- Makefile -*-===##
-#
-# The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-LIBRARYNAME = LLVMSystem
-BUILD_ARCHIVE = 1
-REQUIRES_RTTI = 1
-
-EXTRA_DIST = Unix Win32 README.txt
-
-include $(LEVEL)/Makefile.common
-
-CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
-CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index 6289f4293bf..c628df04e71 100644
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -25,7 +25,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/ADT/DenseMap.h"
#include <algorithm>
#include <cstdlib>
diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h b/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h
index abcb7167b7b..1425b86ba53 100644
--- a/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h
+++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h
@@ -22,7 +22,7 @@
#ifndef X86DISASSEMBLERDECODERCOMMON_H
#define X86DISASSEMBLERDECODERCOMMON_H
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
#define INSTRUCTIONS_SYM x86DisassemblerInstrSpecifiers
#define CONTEXTS_SYM x86DisassemblerContexts
diff --git a/lib/Target/X86/X86JITInfo.cpp b/lib/Target/X86/X86JITInfo.cpp
index e83f3595852..759de771714 100644
--- a/lib/Target/X86/X86JITInfo.cpp
+++ b/lib/Target/X86/X86JITInfo.cpp
@@ -19,7 +19,7 @@
#include "llvm/Function.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/System/Valgrind.h"
+#include "llvm/Support/Valgrind.h"
#include <cstdlib>
#include <cstring>
using namespace llvm;
diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index 0d02e5ee472..3ad84b98c83 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -18,7 +18,7 @@
#include "llvm/GlobalValue.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Host.h"
+#include "llvm/Support/Host.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/ADT/SmallVector.h"
diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp
index e4a228b8c62..92152a3b90a 100644
--- a/lib/VMCore/Attributes.cpp
+++ b/lib/VMCore/Attributes.cpp
@@ -15,8 +15,8 @@
#include "llvm/Type.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/FoldingSet.h"
-#include "llvm/System/Atomic.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Atomic.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 8f94efc6673..22f0096e538 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -20,8 +20,8 @@
#include "llvm/Support/LeakDetector.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/StringPool.h"
-#include "llvm/System/RWMutex.h"
-#include "llvm/System/Threading.h"
+#include "llvm/Support/RWMutex.h"
+#include "llvm/Support/Threading.h"
#include "SymbolTableListTraitsImpl.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringExtras.h"
diff --git a/lib/VMCore/LeakDetector.cpp b/lib/VMCore/LeakDetector.cpp
index a44f61d822e..f6651e93e27 100644
--- a/lib/VMCore/LeakDetector.cpp
+++ b/lib/VMCore/LeakDetector.cpp
@@ -16,8 +16,8 @@
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ManagedStatic.h"
-#include "llvm/System/Mutex.h"
-#include "llvm/System/Threading.h"
+#include "llvm/Support/Mutex.h"
+#include "llvm/Support/Threading.h"
#include "llvm/Value.h"
using namespace llvm;
diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index 88aaa5e3fa1..d798d6bded9 100644
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -24,7 +24,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PassNameParser.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include <algorithm>
#include <cstdio>
#include <map>
diff --git a/lib/VMCore/PassRegistry.cpp b/lib/VMCore/PassRegistry.cpp
index 1fc26b0648d..af118988b6b 100644
--- a/lib/VMCore/PassRegistry.cpp
+++ b/lib/VMCore/PassRegistry.cpp
@@ -16,7 +16,7 @@
#include "llvm/PassSupport.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ManagedStatic.h"
-#include "llvm/System/Mutex.h"
+#include "llvm/Support/Mutex.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/StringMap.h"
diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index ba50e0757e8..395ca566498 100644
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -27,7 +27,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Threading.h"
+#include "llvm/Support/Threading.h"
#include <algorithm>
#include <cstdarg>
using namespace llvm;