Move InputGraph from Driver to Core. LinkingContext depends on it.

llvm-svn: 194641

10 files changed, 13 insertions, 11 deletions

diff --git a/lld/include/lld/Driver/InputGraph.h b/lld/include/lld/Core/InputGraph.h
index db6109669d1..ad934dc3d5c 100644
--- a/lld/include/lld/Driver/InputGraph.h
+++ b/lld/include/lld/Core/InputGraph.h
@@ -13,8 +13,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_DRIVER_INPUT_GRAPH_H
-#define LLD_DRIVER_INPUT_GRAPH_H
+#ifndef LLD_CORE_INPUT_GRAPH_H
+#define LLD_CORE_INPUT_GRAPH_H
 
 #include "lld/Core/File.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/lld/include/lld/Core/LinkingContext.h b/lld/include/lld/Core/LinkingContext.h
index c617a22d6b2..35920efdc69 100644
--- a/lld/include/lld/Core/LinkingContext.h
+++ b/lld/include/lld/Core/LinkingContext.h
@@ -11,11 +11,11 @@
 #define LLD_CORE_TARGET_INFO_H
 
 #include "lld/Core/Error.h"
+#include "lld/Core/InputGraph.h"
 #include "lld/Core/LLVM.h"
 #include "lld/Core/range.h"
 #include "lld/Core/Reference.h"
 
-#include "lld/Driver/InputGraph.h"
 #include "lld/ReaderWriter/Reader.h"
 
 #include "llvm/Support/ErrorOr.h"
diff --git a/lld/include/lld/Driver/CoreInputGraph.h b/lld/include/lld/Driver/CoreInputGraph.h
index f24f5633f00..4a340a0f34d 100644
--- a/lld/include/lld/Driver/CoreInputGraph.h
+++ b/lld/include/lld/Driver/CoreInputGraph.h
@@ -17,7 +17,7 @@
 #ifndef LLD_DRIVER_CORE_INPUT_GRAPH_H
 #define LLD_DRIVER_CORE_INPUT_GRAPH_H
 
-#include "lld/Driver/InputGraph.h"
+#include "lld/Core/InputGraph.h"
 #include "lld/ReaderWriter/CoreLinkingContext.h"
 
 #include <map>
diff --git a/lld/include/lld/Driver/DarwinInputGraph.h b/lld/include/lld/Driver/DarwinInputGraph.h
index bcbdc6d7688..14741aa508e 100644
--- a/lld/include/lld/Driver/DarwinInputGraph.h
+++ b/lld/include/lld/Driver/DarwinInputGraph.h
@@ -17,7 +17,7 @@
 #ifndef LLD_DRIVER_DARWIN_INPUT_GRAPH_H
 #define LLD_DRIVER_DARWIN_INPUT_GRAPH_H
 
-#include "lld/Driver/InputGraph.h"
+#include "lld/Core/InputGraph.h"
 #include "lld/ReaderWriter/MachOLinkingContext.h"
 
 #include <map>
diff --git a/lld/include/lld/Driver/Driver.h b/lld/include/lld/Driver/Driver.h
index a2773d68d94..d8f0c55b570 100644
--- a/lld/include/lld/Driver/Driver.h
+++ b/lld/include/lld/Driver/Driver.h
@@ -17,8 +17,8 @@
 #ifndef LLD_DRIVER_DRIVER_H
 #define LLD_DRIVER_DRIVER_H
 
+#include "lld/Core/InputGraph.h"
 #include "lld/Core/LLVM.h"
-#include "lld/Driver/InputGraph.h"
 
 #include "llvm/ADT/Triple.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/lld/include/lld/Driver/GnuLdInputGraph.h b/lld/include/lld/Driver/GnuLdInputGraph.h
index e4e6f9e9b73..c7352b0d726 100644
--- a/lld/include/lld/Driver/GnuLdInputGraph.h
+++ b/lld/include/lld/Driver/GnuLdInputGraph.h
@@ -17,8 +17,8 @@
 #ifndef LLD_DRIVER_GNU_LD_INPUT_GRAPH_H
 #define LLD_DRIVER_GNU_LD_INPUT_GRAPH_H
 
+#include "lld/Core/InputGraph.h"
 #include "lld/Core/Resolver.h"
-#include "lld/Driver/InputGraph.h"
 #include "lld/ReaderWriter/ELFLinkingContext.h"
 #include "lld/ReaderWriter/FileArchive.h"
 
diff --git a/lld/include/lld/Driver/WinLinkInputGraph.h b/lld/include/lld/Driver/WinLinkInputGraph.h
index b6b86d46c9c..471bde7c25e 100644
--- a/lld/include/lld/Driver/WinLinkInputGraph.h
+++ b/lld/include/lld/Driver/WinLinkInputGraph.h
@@ -17,7 +17,7 @@
 #ifndef LLD_DRIVER_WIN_LINK_INPUT_GRAPH_H
 #define LLD_DRIVER_WIN_LINK_INPUT_GRAPH_H
 
-#include "lld/Driver/InputGraph.h"
+#include "lld/Core/InputGraph.h"
 #include "lld/ReaderWriter/PECOFFLinkingContext.h"
 #include "lld/ReaderWriter/FileArchive.h"
 
diff --git a/lld/lib/Core/CMakeLists.txt b/lld/lib/Core/CMakeLists.txt
index f51363d35fe..1df4f016770 100644
--- a/lld/lib/Core/CMakeLists.txt
+++ b/lld/lib/Core/CMakeLists.txt
@@ -4,6 +4,7 @@ add_lld_library(lldCore
   DefinedAtom.cpp
   Error.cpp
   File.cpp
+  InputGraph.cpp
   LinkingContext.cpp
   PassManager.cpp
   Resolver.cpp
diff --git a/lld/lib/Driver/InputGraph.cpp b/lld/lib/Core/InputGraph.cpp
index 3f464618c9b..920c7bddc44 100644
--- a/lld/lib/Driver/InputGraph.cpp
+++ b/lld/lib/Core/InputGraph.cpp
@@ -1,4 +1,4 @@
-//===- lib/Driver/InputGraph.cpp ------------------------------------------===//
+//===- lib/Core/InputGraph.cpp --------------------------------------------===//
 //
 //                             The LLVM Linker
 //
@@ -6,8 +6,10 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
+#include "lld/Core/InputGraph.h"
+
 #include "lld/Core/Resolver.h"
-#include "lld/Driver/InputGraph.h"
 
 using namespace lld;
 
diff --git a/lld/lib/Driver/CMakeLists.txt b/lld/lib/Driver/CMakeLists.txt
index fb16a657c28..2006b2a92df 100644
--- a/lld/lib/Driver/CMakeLists.txt
+++ b/lld/lib/Driver/CMakeLists.txt
@@ -11,7 +11,6 @@ tablegen(LLVM WinLinkOptions.inc -gen-opt-parser-defs)
 add_public_tablegen_target(DriverOptionsTableGen)
 
 add_lld_library(lldDriver
-  InputGraph.cpp
   CoreDriver.cpp
   DarwinLdDriver.cpp
   Driver.cpp