Changes from 3.7 merge to files not in upstream

lib/MC/MCNaCl.cpp

Index: lib/MC/MCNaCl.cpp
diff --git a/lib/MC/MCNaCl.cpp b/lib/MC/MCNaCl.cpp
index d2a404721d37052ca68c4d8c650fb7486c1de3ed..47979a407ea685228d57ed357fceb78f4c8937ce 100644
--- a/lib/MC/MCNaCl.cpp
+++ b/lib/MC/MCNaCl.cpp
@@ -62,8 +62,7 @@ void initializeNaClMCStreamer(MCStreamer &Streamer, MCContext &Ctx,
   // 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);