diff --git a/lld/include/lld/Core/Atom.h b/lld/include/lld/Core/Atom.h
index f4b8904ec84e..e3de6364a952 100644
--- a/lld/include/lld/Core/Atom.h
+++ b/lld/include/lld/Core/Atom.h
@@ -54,19 +54,19 @@ public:
   
   /// definedAtom - like dynamic_cast, if atom is definitionRegular
   /// returns atom cast to DefinedAtom*, else returns nullptr;
-  virtual const DefinedAtom* definedAtom() const { return NULL; }
+  virtual const DefinedAtom* definedAtom() const { return nullptr; }
 
   /// undefinedAtom - like dynamic_cast, if atom is definitionUndefined
-  /// returns atom cast to UndefinedAtom*, else returns NULL;
-  virtual const UndefinedAtom* undefinedAtom() const { return NULL; }
+  /// returns atom cast to UndefinedAtom*, else returns nullptr;
+  virtual const UndefinedAtom* undefinedAtom() const { return nullptr; }
   
   /// sharedLibraryAtom - like dynamic_cast, if atom is definitionSharedLibrary
   /// returns atom cast to SharedLibraryAtom*, else returns nullptr;
-  virtual const SharedLibraryAtom* sharedLibraryAtom() const { return NULL; }
+  virtual const SharedLibraryAtom* sharedLibraryAtom() const { return nullptr; }
   
   /// absoluteAtom - like dynamic_cast, if atom is definitionAbsolute
   /// returns atom cast to AbsoluteAtom*, else returns nullptr;
-  virtual const AbsoluteAtom* absoluteAtom() const { return NULL; }
+  virtual const AbsoluteAtom* absoluteAtom() const { return nullptr; }
   
 protected:
   /// Atom is an abstract base class.  Only subclasses can access constructor.
diff --git a/lld/lib/Core/NativeWriter.cpp b/lld/lib/Core/NativeWriter.cpp
index 5feb314639c9..4415ed886993 100644
--- a/lld/lib/Core/NativeWriter.cpp
+++ b/lld/lib/Core/NativeWriter.cpp
@@ -446,7 +446,8 @@ private:
   void writeTargetTable(llvm::raw_ostream& out) {
     // Build table of target indexes  
     uint32_t maxTargetIndex = _targetsTableIndex.size();
-    uint32_t targetIndexes[maxTargetIndex];
+    assert(maxTargetIndex > 0);
+    std::vector<uint32_t> targetIndexes(maxTargetIndex);
     for (TargetToIndex::iterator it = _targetsTableIndex.begin(); 
                                  it != _targetsTableIndex.end(); ++it) {
       const Atom* atom = it->first;
@@ -501,7 +502,7 @@ private:
   void writeAddendTable(llvm::raw_ostream& out) {
     // Build table of addends  
     uint32_t maxAddendIndex = _addendsTableIndex.size();
-    Reference::Addend addends[maxAddendIndex];
+    std::vector<Reference::Addend> addends(maxAddendIndex);
     for (AddendToIndex::iterator it = _addendsTableIndex.begin(); 
                                  it != _addendsTableIndex.end(); ++it) {
       Reference::Addend addend = it->first;