5 files changed, 230 insertions, 0 deletions
diff --git a/lld/tools/CMakeLists.txt b/lld/tools/CMakeLists.txt
new file mode 100644
index 00000000000..4880ad1021f
--- /dev/null
+++ b/lld/tools/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(lld)
+add_subdirectory(lld-core)
diff --git a/lld/tools/lld-core/CMakeLists.txt b/lld/tools/lld-core/CMakeLists.txt
new file mode 100644
index 00000000000..0f326dc9e5a
--- /dev/null
+++ b/lld/tools/lld-core/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(LLVM_USED_LIBS
+  lldCore
+  )
+
+set(LLVM_LINK_COMPONENTS
+  support
+  )
+
+add_lld_executable(lld-core
+  lld-core.cpp
+  )
+
+install(TARGETS lld-core
+  RUNTIME DESTINATION bin)
diff --git a/lld/tools/lld-core/lld-core.cpp b/lld/tools/lld-core/lld-core.cpp
new file mode 100644
index 00000000000..f7425e31b40
--- /dev/null
+++ b/lld/tools/lld-core/lld-core.cpp
@@ -0,0 +1,191 @@
+//===- tools/lld/lld-core.cpp - Linker Core Test Driver -----------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lld/Core/InputFiles.h"
+#include "lld/Core/Resolver.h"
+#include "lld/Core/YamlReader.h"
+#include "lld/Core/YamlWriter.h"
+#include "lld/Platform/Platform.h"
+
+#include "llvm/ADT/OwningPtr.h"
+#include "llvm/ADT/Twine.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/system_error.h"
+
+#include <vector>
+
+using namespace lld;
+
+static void error(llvm::Twine message) {
+  llvm::errs() << "lld-core: " << message << ".\n";
+}
+
+static bool error(llvm::error_code ec) {
+  if (ec) {
+    error(ec.message());
+    return true;
+  }
+  return false;
+}
+
+namespace {
+class LdCore : public InputFiles, public Platform {
+public:
+  LdCore(std::vector<File *> &f) : _files(f) { }
+
+  // InputFiles interface
+  virtual void forEachInitialAtom(File::AtomHandler &) const;
+  virtual bool searchLibraries(llvm::StringRef name, bool searchDylibs,
+                               bool searchArchives, bool dataSymbolOnly,
+                               File::AtomHandler &) const;
+
+  virtual void initialize() { }
+
+  // tell platform object another file has been added
+  virtual void fileAdded(const File &file) { }
+
+  // tell platform object another atom has been added
+  virtual void atomAdded(const Atom &file) { }
+
+  // give platform a chance to change each atom's scope
+  virtual void adjustScope(const Atom &atom) { }
+
+  // if specified atom needs alternate names, return AliasAtom(s)
+  virtual bool getAliasAtoms(const Atom &atom,
+                             std::vector<const Atom *>&) {
+    return false;
+  }
+
+  // give platform a chance to resolve platform-specific undefs
+  virtual bool getPlatformAtoms(llvm::StringRef undefined,
+                                std::vector<const Atom *>&) {
+    return false;
+  }
+
+  // resolver should remove unreferenced atoms
+  virtual bool deadCodeStripping() {
+    return false;
+  }
+
+  // atom must be kept so should be root of dead-strip graph
+  virtual bool isDeadStripRoot(const Atom &atom) {
+    return false;
+  }
+
+  // if target must have some atoms, denote here
+  virtual bool getImplicitDeadStripRoots(std::vector<const Atom *>&) {
+    return false;
+  }
+
+  // return entry point for output file (e.g. "main") or NULL
+  virtual llvm::StringRef entryPointName() {
+    return NULL;
+  }
+
+  // for iterating must-be-defined symbols ("main" or -u command line option)
+  typedef llvm::StringRef const *UndefinesIterator;
+  virtual UndefinesIterator initialUndefinesBegin() const {
+    return NULL;
+  }
+  virtual UndefinesIterator initialUndefinesEnd() const {
+    return NULL;
+  }
+
+  // if platform wants resolvers to search libraries for overrides
+  virtual bool searchArchivesToOverrideTentativeDefinitions() {
+    return false;
+  }
+
+  virtual bool searchSharedLibrariesToOverrideTentativeDefinitions() {
+    return false;
+  }
+
+  // if platform allows symbol to remain undefined (e.g. -r)
+  virtual bool allowUndefinedSymbol(llvm::StringRef name) {
+    return true;
+  }
+
+  // for debugging dead code stripping, -why_live
+  virtual bool printWhyLive(llvm::StringRef name) {
+    return false;
+  }
+
+  // print out undefined symbol error messages in platform specific way
+  virtual void errorWithUndefines(const std::vector<const Atom *> &undefs,
+                                  const std::vector<const Atom *> &all) {}
+
+  // last chance for platform to tweak atoms
+  virtual void postResolveTweaks(std::vector<const Atom *> &all) {}
+
+private:
+  std::vector<File *> &_files;
+};
+}
+
+void LdCore::forEachInitialAtom(File::AtomHandler &handler) const {
+  for (std::vector<File *>::iterator it = _files.begin();
+       it != _files.end(); ++it) {
+    const File *file = *it;
+    handler.doFile(*file);
+    file->forEachAtom(handler);
+  }
+}
+
+bool LdCore::searchLibraries(llvm::StringRef name, bool searchDylibs,
+                             bool searchArchives, bool dataSymbolOnly,
+                             File::AtomHandler &) const {
+  return false;
+}
+
+namespace {
+class MergedFile : public File {
+public:
+  MergedFile(std::vector<const Atom *> &a)
+    : File("path"), _atoms(a) { }
+
+  virtual bool forEachAtom(File::AtomHandler &handler) const {
+    handler.doFile(*this);
+    for (std::vector<const Atom *>::iterator it = _atoms.begin();
+         it != _atoms.end(); ++it) {
+      handler.doAtom(**it);
+    }
+    return true;
+  }
+
+  virtual bool justInTimeforEachAtom(llvm::StringRef name,
+                                     File::AtomHandler &) const {
+    return false;
+  }
+
+private:
+  std::vector<const Atom *> &_atoms;
+};
+}
+
+int main(int argc, const char *argv[]) {
+  llvm::OwningPtr<llvm::MemoryBuffer> mb;
+  if (error(llvm::MemoryBuffer::getFileOrSTDIN(llvm::StringRef(argv[1]), mb)))
+    return 1;
+
+  std::vector<File *> files;
+  if (error(yaml::parseObjectText(mb.get(), files)))
+    return 1;
+
+  LdCore core(files);
+  Resolver resolver(core, core);
+  std::vector<const Atom *> &mergedAtoms = resolver.resolve();
+  MergedFile outFile(mergedAtoms);
+
+  std::string errorInfo;
+  llvm::raw_fd_ostream out("-", errorInfo);
+  yaml::writeObjectText(&outFile, out);
+  return 0;
+}
diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
new file mode 100644
index 00000000000..ee0b47e4b1a
--- /dev/null
+++ b/lld/tools/lld/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_lld_executable(lld
+  lld.cpp
+  )
+
+install(TARGETS lld
+  RUNTIME DESTINATION bin)
diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp
new file mode 100644
index 00000000000..74329b60a85
--- /dev/null
+++ b/lld/tools/lld/lld.cpp
@@ -0,0 +1,17 @@
+//===- tools/lld/lld.cpp - Linker Driver Dispatcher ---------------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This is the entry point to the lld driver. This is a thin wrapper which
+// dispatches to the given platform specific driver.
+//
+//===----------------------------------------------------------------------===//
+
+int main(int argc, char **argv) {
+  return 0;
+}