Revert " Fix the ELF shared library build targets"

This reverts commit 6a3f545b44cea46321e025d9ab773786af86cb51.

llvm-svn: 226928

4 files changed, 14 insertions, 7 deletions

diff --git a/lld/lib/ReaderWriter/ELF/X86/CMakeLists.txt b/lld/lib/ReaderWriter/ELF/X86/CMakeLists.txt
index dab4251d9a5..fb1c25357e9 100644
--- a/lld/lib/ReaderWriter/ELF/X86/CMakeLists.txt
+++ b/lld/lib/ReaderWriter/ELF/X86/CMakeLists.txt
@@ -4,7 +4,5 @@ add_llvm_library(lldX86ELFTarget
   X86RelocationHandler.cpp
   LINK_LIBS
     lldCore
-    lldELF
-    LLVMObject
     LLVMSupport
   )
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp
index eee7bf67afd..6158780a1cb 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp
+++ b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp
@@ -8,13 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86LinkingContext.h"
-#include "X86TargetHandler.h"
 #include "lld/Core/LLVM.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/ErrorOr.h"
 
 using namespace lld;
 
-elf::X86LinkingContext::X86LinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(triple, std::unique_ptr<TargetHandlerBase>(
-                        new X86TargetHandler(*this))) {}
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h
index a1af12f6595..8792566b0a0 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h
@@ -10,6 +10,7 @@
 #ifndef LLD_READER_WRITER_ELF_X86_TARGETINFO_H
 #define LLD_READER_WRITER_ELF_X86_TARGETINFO_H
 
+#include "X86TargetHandler.h"
 #include "lld/ReaderWriter/ELFLinkingContext.h"
 #include "llvm/Object/ELF.h"
 #include "llvm/Support/ELF.h"
@@ -18,7 +19,9 @@ namespace lld {
 namespace elf {
 class X86LinkingContext final : public ELFLinkingContext {
 public:
-  X86LinkingContext(llvm::Triple);
+  X86LinkingContext(llvm::Triple triple)
+      : ELFLinkingContext(triple, std::unique_ptr<TargetHandlerBase>(
+                                      new X86TargetHandler(*this))) {}
 
   /// \brief X86 has only two relative relocation
   /// a) for supporting IFUNC relocs - R_386_IRELATIVE
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86Target.h b/lld/lib/ReaderWriter/ELF/X86/X86Target.h
new file mode 100644
index 00000000000..c738395be85
--- /dev/null
+++ b/lld/lib/ReaderWriter/ELF/X86/X86Target.h
@@ -0,0 +1,10 @@
+//===- lib/ReaderWriter/ELF/X86/X86Target.h -------------------------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "X86LinkingContext.h"