Changes from 3.7 merge to files not in upstream

lib/MC/MCNaCl.cpp

 //===- lib/MC/MCNaCl.cpp - NaCl-specific MC implementation ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCNaCl.h"
@@ skipping 44 matching lines @@
 
   // For gas, override the size of DWARF address values generated by .loc
   // directives.
   if (TheTriple.getArch() == Triple::x86_64 &&
       Streamer.hasRawTextSupport()) {
     Streamer.EmitRawText("\t.dwarf_addr_size 4\n");
   }
   // Emit an ELF Note section in its own COMDAT group which identifies NaCl
   // object files to the gold linker, so it can use the NaCl layout.
   const MCSection *Note = Ctx.getELFSection(
-      NoteName, ELF::SHT_NOTE, ELF::SHF_ALLOC | ELF::SHF_GROUP,
-      SectionKind::getReadOnly(), 0, NoteName);
+      NoteName, ELF::SHT_NOTE, ELF::SHF_ALLOC | ELF::SHF_GROUP, 0, NoteName);
 
   Streamer.PushSection();
   Streamer.SwitchSection(Note);
   Streamer.EmitIntValue(strlen(NoteNamespace) + 1, 4);
   Streamer.EmitIntValue(strlen(NoteArch) + 1, 4);
   Streamer.EmitIntValue(ELF::NT_VERSION, 4);
   Streamer.EmitBytes(NoteNamespace);
   Streamer.EmitIntValue(0, 1); // NUL terminator
   Streamer.EmitValueToAlignment(4);
   Streamer.EmitBytes(NoteArch);
   Streamer.EmitIntValue(0, 1); // NUL terminator
   Streamer.EmitValueToAlignment(4);
   Streamer.PopSection();
 }
 
 } // namespace llvm