2 files changed, 15 insertions, 42 deletions
diff --git a/lld/lib/ReaderWriter/Native/ReaderNative.cpp b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
index 36389d0cb51..0a69ae4171d 100644
--- a/lld/lib/ReaderWriter/Native/ReaderNative.cpp
+++ b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lld/ReaderWriter/ReaderNative.h"
+#include "lld/ReaderWriter/Reader.h"
 
 #include "lld/Core/Atom.h"
 #include "lld/Core/Error.h"
@@ -914,39 +914,24 @@ inline void NativeReferenceV1::setTarget(const Atom* newAtom) {
 
 inline void NativeReferenceV1::setAddend(Addend a) {
   // Do nothing if addend value is not being changed.
-  if ( this->addend() == a )
+  if (addend() == a)
     return;
-  assert(0 && "setAddend() not supported");
+  llvm_unreachable("setAddend() not supported");
 }
 
-
 class Reader : public lld::Reader {
 public:
-  Reader(const ReaderOptionsNative &options) {}
+  Reader(const TargetInfo &ti)
+   : lld::Reader(ti) {}
   
   virtual error_code parseFile(std::unique_ptr<MemoryBuffer> mb, 
                                std::vector<std::unique_ptr<lld::File>> &result) {
     return File::make(mb, mb->getBufferIdentifier(), result);
   }
 };
+} // end namespace native
 
-
-
-} // namespace native
-
-Reader* createReaderNative(const ReaderOptionsNative &options) {
-  return new lld::native::Reader(options);
-}
-
-ReaderOptionsNative::ReaderOptionsNative() {
-}
-
-ReaderOptionsNative::~ReaderOptionsNative() {
+std::unique_ptr<Reader> createReaderNative(const TargetInfo &ti) {
+  return std::unique_ptr<Reader>(new lld::native::Reader(ti));
 }
-
-
-} // namespace lld
-
-
-
-
+} // end namespace lld
diff --git a/lld/lib/ReaderWriter/Native/WriterNative.cpp b/lld/lib/ReaderWriter/Native/WriterNative.cpp
index 615dfac3dfc..8b7026d50da 100644
--- a/lld/lib/ReaderWriter/Native/WriterNative.cpp
+++ b/lld/lib/ReaderWriter/Native/WriterNative.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lld/ReaderWriter/WriterNative.h"
+#include "lld/ReaderWriter/Writer.h"
 #include "lld/Core/File.h"
 
 #include "llvm/ADT/ArrayRef.h"
@@ -28,7 +28,7 @@ namespace native {
 ///
 class Writer : public lld::Writer {
 public:
-  Writer(const WriterOptionsNative &options) {}
+  Writer(const TargetInfo &ti) {}
   
   virtual error_code writeFile(const lld::File &file, StringRef outPath) {
     // reserve first byte for unnamed atoms
@@ -576,21 +576,9 @@ private:
   NameToOffsetVector                      _sectionNames;
   NameToOffsetVector                      _sharedLibraryNames;
 };
+} // end namespace native
 
-
-} // namespace native
-
-Writer* createWriterNative(const WriterOptionsNative &options) {
-  return new lld::native::Writer(options);
-}
-
-WriterOptionsNative::WriterOptionsNative() {
-}
-
-WriterOptionsNative::~WriterOptionsNative() {
+std::unique_ptr<Writer> createWriterNative(const TargetInfo &ti) {
+  return std::unique_ptr<Writer>(new native::Writer(ti));
 }
-
-
-} // namespace lld
-
-
+} // end namespace lld