Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp |
=================================================================== |
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp |
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp |
@@ -1479,12 +1479,7 @@ |
std::string S; |
if (ConvertToString(Record, 0, S)) |
return Error("Invalid MODULE_CODE_DATALAYOUT record"); |
- |
- // @LOCALMOD-BEGIN |
- // Figure out how to properly prevent |
- // NaCl data layout from being overriden |
- //TheModule->setDataLayout(S); |
- // @LOCALMOD-END |
+ TheModule->setDataLayout(S); |
break; |
} |
case bitc::MODULE_CODE_ASM: { // ASM: [strchr x N] |