18 files changed, 18 insertions, 18 deletions
diff --git a/llvm/lib/CompilerDriver/CMakeLists.txt b/llvm/lib/CompilerDriver/CMakeLists.txt
index 153dd443cbf..2248de01b95 100644
--- a/llvm/lib/CompilerDriver/CMakeLists.txt
+++ b/llvm/lib/CompilerDriver/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS support system)
+set(LLVM_LINK_COMPONENTS support)
 set(LLVM_REQUIRES_EH 1)
 
 add_llvm_tool(llvmc
diff --git a/llvm/lib/CompilerDriver/Makefile b/llvm/lib/CompilerDriver/Makefile
index 8e8b73ca8f8..10cfa4f0292 100644
--- a/llvm/lib/CompilerDriver/Makefile
+++ b/llvm/lib/CompilerDriver/Makefile
@@ -13,7 +13,7 @@ LEVEL = ../..
 # name doesn't start with "LLVM" and NO_LLVM_CONFIG is set.
 
 LIBRARYNAME = CompilerDriver
-LINK_COMPONENTS = support system
+LINK_COMPONENTS = support
 NO_LLVM_CONFIG = 1
 
 
diff --git a/llvm/lib/Support/IncludeFile.cpp b/llvm/lib/Support/IncludeFile.cpp
index e41d1f0a811..5da88261ce5 100644
--- a/llvm/lib/Support/IncludeFile.cpp
+++ b/llvm/lib/Support/IncludeFile.cpp
@@ -16,5 +16,5 @@
 using namespace llvm;
 
 // This constructor is used to ensure linking of other modules. See the
-// llvm/System/IncludeFile.h header for details.
+// llvm/Support/IncludeFile.h header for details.
 IncludeFile::IncludeFile(const void*) {}
diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp
index c2f85549f4d..29579567ac6 100644
--- a/llvm/lib/Support/Threading.cpp
+++ b/llvm/lib/Support/Threading.cpp
@@ -1,4 +1,4 @@
-//===-- llvm/System/Threading.cpp- Control multithreading mode --*- C++ -*-==//
+//===-- llvm/Support/Threading.cpp- Control multithreading mode --*- C++ -*-==//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/Host.inc b/llvm/lib/Support/Unix/Host.inc
index ca0de9ca9a8..5561906bd17 100644
--- a/llvm/lib/Support/Unix/Host.inc
+++ b/llvm/lib/Support/Unix/Host.inc
@@ -1,4 +1,4 @@
- //===- llvm/System/Unix/Host.inc -------------------------------*- C++ -*-===//
+ //===- llvm/Support/Unix/Host.inc -------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/Mutex.inc b/llvm/lib/Support/Unix/Mutex.inc
index 5c50697fd0c..fe6b1704145 100644
--- a/llvm/lib/Support/Unix/Mutex.inc
+++ b/llvm/lib/Support/Unix/Mutex.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Unix/Mutex.inc - Unix Mutex Implementation ---*- C++ -*-===//
+//===- llvm/Support/Unix/Mutex.inc - Unix Mutex Implementation ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
index 5ee3adc4d2d..dccf9010ab5 100644
--- a/llvm/lib/Support/Unix/Path.inc
+++ b/llvm/lib/Support/Unix/Path.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Unix/Path.cpp - Unix Path Implementation -----*- C++ -*-===//
+//===- llvm/Support/Unix/Path.cpp - Unix Path Implementation -----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/Program.inc b/llvm/lib/Support/Unix/Program.inc
index e06f80ba833..17c3ba14bc2 100644
--- a/llvm/lib/Support/Unix/Program.inc
+++ b/llvm/lib/Support/Unix/Program.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Unix/Program.cpp -----------------------------*- C++ -*-===//
+//===- llvm/Support/Unix/Program.cpp -----------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/RWMutex.inc b/llvm/lib/Support/Unix/RWMutex.inc
index ee9853e5af7..40e87ff1311 100644
--- a/llvm/lib/Support/Unix/RWMutex.inc
+++ b/llvm/lib/Support/Unix/RWMutex.inc
@@ -1,4 +1,4 @@
-//= llvm/System/Unix/RWMutex.inc - Unix Reader/Writer Mutual Exclusion Lock  =//
+//= llvm/Support/Unix/RWMutex.inc - Unix Reader/Writer Mutual Exclusion Lock  =//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/ThreadLocal.inc b/llvm/lib/Support/Unix/ThreadLocal.inc
index f009b72f105..2b4c9017cd9 100644
--- a/llvm/lib/Support/Unix/ThreadLocal.inc
+++ b/llvm/lib/Support/Unix/ThreadLocal.inc
@@ -1,4 +1,4 @@
-//=== llvm/System/Unix/ThreadLocal.inc - Unix Thread Local Data -*- C++ -*-===//
+//=== llvm/Support/Unix/ThreadLocal.inc - Unix Thread Local Data -*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/Unix.h b/llvm/lib/Support/Unix/Unix.h
index 9b758116f3a..b7be3111d43 100644
--- a/llvm/lib/Support/Unix/Unix.h
+++ b/llvm/lib/Support/Unix/Unix.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Unix/Unix.h - Common Unix Include File -------*- C++ -*-===//
+//===- llvm/Support/Unix/Unix.h - Common Unix Include File -------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Unix/system_error.inc b/llvm/lib/Support/Unix/system_error.inc
index a382214877f..681e919edb4 100644
--- a/llvm/lib/Support/Unix/system_error.inc
+++ b/llvm/lib/Support/Unix/system_error.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Unix/system_error.inc - Unix error_code ------*- C++ -*-===//
+//===- llvm/Support/Unix/system_error.inc - Unix error_code ------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Windows/Host.inc b/llvm/lib/Support/Windows/Host.inc
index 5377c77f037..733830e82f0 100644
--- a/llvm/lib/Support/Windows/Host.inc
+++ b/llvm/lib/Support/Windows/Host.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Win32/Host.inc -------------------------------*- C++ -*-===//
+//===- llvm/Support/Win32/Host.inc -------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Windows/Mutex.inc b/llvm/lib/Support/Windows/Mutex.inc
index ff7d6429988..583dc6359a1 100644
--- a/llvm/lib/Support/Windows/Mutex.inc
+++ b/llvm/lib/Support/Windows/Mutex.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Win32/Mutex.inc - Win32 Mutex Implementation -*- C++ -*-===//
+//===- llvm/Support/Win32/Mutex.inc - Win32 Mutex Implementation -*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc
index e517eece737..cc68b9f3abc 100644
--- a/llvm/lib/Support/Windows/Path.inc
+++ b/llvm/lib/Support/Windows/Path.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Win32/Path.cpp - Win32 Path Implementation ---*- C++ -*-===//
+//===- llvm/Support/Win32/Path.cpp - Win32 Path Implementation ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Windows/RWMutex.inc b/llvm/lib/Support/Windows/RWMutex.inc
index 82ae8af1e52..471f8fa294b 100644
--- a/llvm/lib/Support/Windows/RWMutex.inc
+++ b/llvm/lib/Support/Windows/RWMutex.inc
@@ -1,4 +1,4 @@
-//= llvm/System/Win32/Mutex.inc - Win32 Reader/Writer Mutual Exclusion Lock  =//
+//= llvm/Support/Win32/Mutex.inc - Win32 Reader/Writer Mutual Exclusion Lock  =//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Windows/ThreadLocal.inc b/llvm/lib/Support/Windows/ThreadLocal.inc
index 53070ead547..512462d8900 100644
--- a/llvm/lib/Support/Windows/ThreadLocal.inc
+++ b/llvm/lib/Support/Windows/ThreadLocal.inc
@@ -1,4 +1,4 @@
-//= llvm/System/Win32/ThreadLocal.inc - Win32 Thread Local Data -*- C++ -*-===//
+//= llvm/Support/Win32/ThreadLocal.inc - Win32 Thread Local Data -*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/lib/Support/Windows/system_error.inc b/llvm/lib/Support/Windows/system_error.inc
index db025828996..8dc4799e7cf 100644
--- a/llvm/lib/Support/Windows/system_error.inc
+++ b/llvm/lib/Support/Windows/system_error.inc
@@ -1,4 +1,4 @@
-//===- llvm/System/Win32/system_error.inc - Windows error_code --*- C++ -*-===//
+//===- llvm/Support/Win32/system_error.inc - Windows error_code --*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //