Now to chant the magical incantation that will exorcise the System library

from LLVM forever:

grep -lR "llvm/System" * | grep -v .svn | xargs sed -ie 's#llvm/System#llvm/Support#g'

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120314 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index b7b6a859d72de877d474b9c584df761402d4a60f..86730e713992049b1e16cdb4c35ef03770028778 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -205,7 +205,7 @@ ifdef LLVMC_BASED_DRIVER
 TOOLNAME = $(LLVMC_BASED_DRIVER)
 
 LLVMLIBS = CompilerDriver.a
-LINK_COMPONENTS = support system
+LINK_COMPONENTS = support
 
 endif # LLVMC_BASED_DRIVER
 

diff --git a/include/llvm/Support/AIXDataTypesFix.h b/include/llvm/Support/AIXDataTypesFix.h
index 8dbf02f28269e045a3a5c3a48bdde8ed24cfebd8..a9a9147de294c59cb6a1502b34ef4070354af4c6 100644 (file)
--- a/include/llvm/Support/AIXDataTypesFix.h
+++ b/include/llvm/Support/AIXDataTypesFix.h
@@ -1,4 +1,4 @@
-//===-- llvm/System/AIXDataTypesFix.h - Fix datatype defs ------*- C++ -*-===//
+//===-- llvm/Support/AIXDataTypesFix.h - Fix datatype defs ------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Alarm.h b/include/llvm/Support/Alarm.h
index 7c284167c2ce28318c5429d08c072a454e748dcd..51eaf2c845550e207c9e4cd2d4a57693b112774e 100644 (file)
--- a/include/llvm/Support/Alarm.h
+++ b/include/llvm/Support/Alarm.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Alarm.h - Alarm Generation support  ----------*- C++ -*-===//
+//===- llvm/Support/Alarm.h - Alarm Generation support  ----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Atomic.h b/include/llvm/Support/Atomic.h
index 914bda9db34a3a49dff921e5334d0f3cd6a4c654..1a6c606aa5f636af969ab6cd633e59d5362452eb 100644 (file)
--- a/include/llvm/Support/Atomic.h
+++ b/include/llvm/Support/Atomic.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Atomic.h - Atomic Operations -----------------*- C++ -*-===//
+//===- llvm/Support/Atomic.h - Atomic Operations -----------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/DynamicLibrary.h b/include/llvm/Support/DynamicLibrary.h
index 745b8f8b5b4b11c29d138a9a6cc6675e069392f9..e6d9ff57ae83f26e21357f522fd8bd749bc20fe7 100644 (file)
--- a/include/llvm/Support/DynamicLibrary.h
+++ b/include/llvm/Support/DynamicLibrary.h
@@ -1,4 +1,4 @@
-//===-- llvm/System/DynamicLibrary.h - Portable Dynamic Library -*- C++ -*-===//
+//===-- llvm/Support/DynamicLibrary.h - Portable Dynamic Library -*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Errno.h b/include/llvm/Support/Errno.h
index 6e292ba626519c01ce569e38bf9ccb2fc4afadeb..150bdb70162695bc58611e83cc8a7a4d2b324376 100644 (file)
--- a/include/llvm/Support/Errno.h
+++ b/include/llvm/Support/Errno.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Errno.h - Portable+convenient errno handling -*- C++ -*-===//
+//===- llvm/Support/Errno.h - Portable+convenient errno handling -*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/FEnv.h b/include/llvm/Support/FEnv.h
index 042e43928bcf727db300478ab1d7cedbc7d61170..f6f43337bd29e7ddb7e0c28a8a83197eef8fd36a 100644 (file)
--- a/include/llvm/Support/FEnv.h
+++ b/include/llvm/Support/FEnv.h
@@ -1,4 +1,4 @@
-//===- llvm/System/FEnv.h - Host floating-point exceptions ------*- C++ -*-===//
+//===- llvm/Support/FEnv.h - Host floating-point exceptions ------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
index 4fbf5c177c6e1ee2edb579a8a8bc068b7fbc70b8..f77d4c1182bb478365558e3c5b1e622651ef9f83 100644 (file)
--- a/include/llvm/Support/Host.h
+++ b/include/llvm/Support/Host.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Host.h - Host machine characteristics --------*- C++ -*-===//
+//===- llvm/Support/Host.h - Host machine characteristics --------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/IncludeFile.h b/include/llvm/Support/IncludeFile.h
index 42abb2d7a1403c657809e53ba7d74ec080d8e9e6..a9319725d4775502d3d4c1ade7be85767a7cf267 100644 (file)
--- a/include/llvm/Support/IncludeFile.h
+++ b/include/llvm/Support/IncludeFile.h
@@ -1,4 +1,4 @@
-//===- llvm/System/IncludeFile.h - Ensure Linking Of Library ---*- C++ -*-===//
+//===- llvm/Support/IncludeFile.h - Ensure Linking Of Library ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Memory.h b/include/llvm/Support/Memory.h
index 9b0df31ab010b5d80ce37f58bc5875b08f73b6cc..9c3f85b958bcf3bc7617b9806fd6b61047bb961e 100644 (file)
--- a/include/llvm/Support/Memory.h
+++ b/include/llvm/Support/Memory.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Memory.h - Memory Support --------------------*- C++ -*-===//
+//===- llvm/Support/Memory.h - Memory Support --------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Mutex.h b/include/llvm/Support/Mutex.h
index edd258d2fcb5d648418f03e655c76fe54b8f57a0..42ea63060f66c540744a5eb7a805161c1e0e40b2 100644 (file)
--- a/include/llvm/Support/Mutex.h
+++ b/include/llvm/Support/Mutex.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Mutex.h - Mutex Operating System Concept -----*- C++ -*-===//
+//===- llvm/Support/Mutex.h - Mutex Operating System Concept -----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Path.h b/include/llvm/Support/Path.h
index 7d5c297c95c21d6d2f442d92cff6af8adb7d0168..93a116f45c9b9d398adb768296f0278e3a70d63c 100644 (file)
--- a/include/llvm/Support/Path.h
+++ b/include/llvm/Support/Path.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Path.h - Path Operating System Concept -------*- C++ -*-===//
+//===- llvm/Support/Path.h - Path Operating System Concept -------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/PathV2.h b/include/llvm/Support/PathV2.h
index b85da0a40a668e925302b4a8b24b93e796f869aa..e8c93a34b2b8d29327715e164715e92c0096dbad 100644 (file)
--- a/include/llvm/Support/PathV2.h
+++ b/include/llvm/Support/PathV2.h
@@ -1,4 +1,4 @@
-//===- llvm/System/PathV2.h - Path Operating System Concept -----*- C++ -*-===//
+//===- llvm/Support/PathV2.h - Path Operating System Concept -----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Process.h b/include/llvm/Support/Process.h
index cb861d75c008745ec9532520c174dd4206928ea6..33799229ff3576156ddf4978f9576a0b5102e09b 100644 (file)
--- a/include/llvm/Support/Process.h
+++ b/include/llvm/Support/Process.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Process.h ------------------------------------*- C++ -*-===//
+//===- llvm/Support/Process.h ------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Program.h b/include/llvm/Support/Program.h
index 872f7e5f06ffcad845d249a09d12ae6ed7207539..78a495ef21059de4e0dbc730b6bc7454e572cfdc 100644 (file)
--- a/include/llvm/Support/Program.h
+++ b/include/llvm/Support/Program.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Program.h ------------------------------------*- C++ -*-===//
+//===- llvm/Support/Program.h ------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h
index da98d0ca8f76322e1285f8f27af9f765b9b53cd6..9a84df68ddba09f90a82a825d40b3fa0cc275cba 100644 (file)
--- a/include/llvm/Support/Signals.h
+++ b/include/llvm/Support/Signals.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Signals.h - Signal Handling support ----------*- C++ -*-===//
+//===- llvm/Support/Signals.h - Signal Handling support ----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Solaris.h b/include/llvm/Support/Solaris.h
index 15adb7472c107a034ed1115dd686010a32f803fc..57eee2cb49735d66279bbb1633116330fded582c 100644 (file)
--- a/include/llvm/Support/Solaris.h
+++ b/include/llvm/Support/Solaris.h
@@ -1,4 +1,4 @@
-/*===- llvm/System/Solaris.h ------------------------------------*- C++ -*-===*
+/*===- llvm/Support/Solaris.h ------------------------------------*- C++ -*-===*
  *
  *                     The LLVM Compiler Infrastructure
  *

diff --git a/include/llvm/Support/ThreadLocal.h b/include/llvm/Support/ThreadLocal.h
index 155a4db818b94b90fb09fcfb36252b6bf7c346ca..15350a7afff7e6544b526b5217c4edb53a779876 100644 (file)
--- a/include/llvm/Support/ThreadLocal.h
+++ b/include/llvm/Support/ThreadLocal.h
@@ -1,4 +1,4 @@
-//===- llvm/System/ThreadLocal.h - Thread Local Data ------------*- C++ -*-===//
+//===- llvm/Support/ThreadLocal.h - Thread Local Data ------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Threading.h b/include/llvm/Support/Threading.h
index 371a8625aebe5f5494701c3fa19da41af77eaa89..c0e842c2fe733e65c72495a1f002e6de938ddd40 100644 (file)
--- a/include/llvm/Support/Threading.h
+++ b/include/llvm/Support/Threading.h
@@ -1,4 +1,4 @@
-//===-- llvm/System/Threading.h - Control multithreading mode --*- C++ -*-===//
+//===-- llvm/Support/Threading.h - Control multithreading mode --*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/include/llvm/Support/Valgrind.h b/include/llvm/Support/Valgrind.h
index 5ec79c3c5573c52bc1351833fe03d99fac434a3a..7662eaaff5a9023185dd9438e3cf3f719115602a 100644 (file)
--- a/include/llvm/Support/Valgrind.h
+++ b/include/llvm/Support/Valgrind.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Valgrind.h - Communication with Valgrind -----*- C++ -*-===//
+//===- llvm/Support/Valgrind.h - Communication with Valgrind -----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

diff --git a/lib/CompilerDriver/CMakeLists.txt b/lib/CompilerDriver/CMakeLists.txt
index 153dd443cbf2207b56d3b5e12585c7f6835eb04e..2248de01b954ec88d40a0db390640889a9940b4f 100644 (file)
--- a/lib/CompilerDriver/CMakeLists.txt
+++ b/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/lib/CompilerDriver/Makefile b/lib/CompilerDriver/Makefile
index 8e8b73ca8f83f628476d628de80593171bd37ac1..10cfa4f02923c5f91e30b37be8fd616a68b9bd9f 100644 (file)
--- a/lib/CompilerDriver/Makefile
+++ b/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/lib/Support/IncludeFile.cpp b/lib/Support/IncludeFile.cpp
index e41d1f0a811120308d1d30636c1066c077aa4d3b..5da88261ce53618c9af267f0ab7b57b6529a3643 100644 (file)
--- a/lib/Support/IncludeFile.cpp
+++ b/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/lib/Support/Threading.cpp b/lib/Support/Threading.cpp
index c2f85549f4daa03936f0de3cf3a4cd9dc00400ed..29579567ac6c19f7f919a5f8039f9efc23bddfe6 100644 (file)
--- a/lib/Support/Threading.cpp
+++ b/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/lib/Support/Unix/Host.inc b/lib/Support/Unix/Host.inc
index ca0de9ca9a8b20fece2eb4ab17e7a75d15179401..5561906bd17715d2ca8ac7e8ce824493d0353b45 100644 (file)
--- a/lib/Support/Unix/Host.inc
+++ b/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/lib/Support/Unix/Mutex.inc b/lib/Support/Unix/Mutex.inc
index 5c50697fd0ccaa7519bbdbbbf0d9b2b485608d0a..fe6b1704145745ac3b49e7118f3c9b664fea401e 100644 (file)
--- a/lib/Support/Unix/Mutex.inc
+++ b/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/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc
index 5ee3adc4d2d4441ff58a26396cb847a520dc286d..dccf9010ab5059455f16b1f5f7933d4307279ccb 100644 (file)
--- a/lib/Support/Unix/Path.inc
+++ b/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/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc
index e06f80ba83306e6f9f2b5bd60f7f3cef74cac9ff..17c3ba14bc2215eb3ec3060b6f6cac243dc1ea96 100644 (file)
--- a/lib/Support/Unix/Program.inc
+++ b/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/lib/Support/Unix/RWMutex.inc b/lib/Support/Unix/RWMutex.inc
index ee9853e5af7b6e9aa593792f1990f5d6d490840c..40e87ff13111c7df8e4183a5d8c153285f147fdf 100644 (file)
--- a/lib/Support/Unix/RWMutex.inc
+++ b/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/lib/Support/Unix/ThreadLocal.inc b/lib/Support/Unix/ThreadLocal.inc
index f009b72f1059b55addbbde561e2d4b5dd1764742..2b4c9017cd915befbe1b6d4d672dd01628cf4ad3 100644 (file)
--- a/lib/Support/Unix/ThreadLocal.inc
+++ b/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/lib/Support/Unix/Unix.h b/lib/Support/Unix/Unix.h
index 9b758116f3ae8feff94bf51e7c85bce5bee91e28..b7be3111d43177ada1c4ed3df08b3c624b226b48 100644 (file)
--- a/lib/Support/Unix/Unix.h
+++ b/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/lib/Support/Unix/system_error.inc b/lib/Support/Unix/system_error.inc
index a382214877f493daffbb6ccb975c614b8d2fb075..681e919edb4ef141a653a6dc101bbc6f4dd5a5bc 100644 (file)
--- a/lib/Support/Unix/system_error.inc
+++ b/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/lib/Support/Windows/Host.inc b/lib/Support/Windows/Host.inc
index 5377c77f03780e7639435ff0b9a02e4cb0112e05..733830e82f08e69e80722a4ed39c1e849b0c4996 100644 (file)
--- a/lib/Support/Windows/Host.inc
+++ b/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/lib/Support/Windows/Mutex.inc b/lib/Support/Windows/Mutex.inc
index ff7d64299886c96846b57a14fe250f6602d84121..583dc6359a161350b41b272ec80f812bb87f0b45 100644 (file)
--- a/lib/Support/Windows/Mutex.inc
+++ b/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/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc
index e517eece7379a9561d90a4047281b4c7b5b4e9c7..cc68b9f3abcb2a63e6ac5501f55e47690df6cea0 100644 (file)
--- a/lib/Support/Windows/Path.inc
+++ b/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/lib/Support/Windows/RWMutex.inc b/lib/Support/Windows/RWMutex.inc
index 82ae8af1e52676b4cc86bb0d7a7341c749adf8dc..471f8fa294bef52f5093ca861a2736f055482694 100644 (file)
--- a/lib/Support/Windows/RWMutex.inc
+++ b/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/lib/Support/Windows/ThreadLocal.inc b/lib/Support/Windows/ThreadLocal.inc
index 53070ead5471709a01ac5f75a192bc5c6c9b8b28..512462d89005cc4f62b6024970e20b4dfc7a264f 100644 (file)
--- a/lib/Support/Windows/ThreadLocal.inc
+++ b/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/lib/Support/Windows/system_error.inc b/lib/Support/Windows/system_error.inc
index db025828996920392580d4b878bf23e97a7c56eb..8dc4799e7cf05c52685dd9b7538463d7b7e7f684 100644 (file)
--- a/lib/Support/Windows/system_error.inc
+++ b/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
 //

diff --git a/tools/gold/Makefile b/tools/gold/Makefile
index 82a4e39cdae7fc195a60467f2efd9d9634a9aa26..66a0271fa25769b519758a830c9b8b8b32bd6754 100644 (file)
--- a/tools/gold/Makefile
+++ b/tools/gold/Makefile
@@ -21,7 +21,7 @@ LINK_LIBS_IN_SHARED=1
 SHARED_LIBRARY = 1
 LOADABLE_MODULE = 1
 
-LINK_COMPONENTS := support system
+LINK_COMPONENTS := support
 LIBS += -llto
 
 # Because off_t is used in the public API, the largefile parts are required for