Merge commit '8d20b5f9ff609e70fae5c865931ab0f29e639d9c'

Conflicts:
	lib/CodeGen/AsmPrinter/DwarfDebug.cpp
	lib/CodeGen/AsmPrinter/DwarfDebug.h
	lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
	lib/Target/Mips/MipsISelDAGToDAG.cpp
	lib/Target/Mips/MipsInstrFPU.td
	lib/Target/Mips/MipsSubtarget.cpp
	lib/Target/Mips/MipsSubtarget.h
	lib/Target/X86/X86MCInstLower.cpp
	tools/Makefile
	tools/llc/llc.cpp

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/ExecutionEngine/JIT/NaClJITMemoryManager.cpp b/lib/ExecutionEngine/JIT/NaClJITMemoryManager.cpp
index d44fee2292..d1b5ee704a 100644
--- a/lib/ExecutionEngine/JIT/NaClJITMemoryManager.cpp
+++ b/lib/ExecutionEngine/JIT/NaClJITMemoryManager.cpp
@@ -227,7 +227,8 @@ uint8_t *NaClJITMemoryManager::allocateCodeSection(uintptr_t Size,
 
 uint8_t *NaClJITMemoryManager::allocateDataSection(uintptr_t Size,
                                                    unsigned Alignment,
-                                                   unsigned SectionID) {
+                                                   unsigned SectionID,
+                                                   bool IsReadOnly) {
   return (uint8_t *)DataAllocator.Allocate(Size, Alignment);
 }