Remove llvm bitcode reader localmod that dropped datalayout.

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

 //===- BitcodeReader.cpp - Internal BitcodeReader implementation ----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This header defines the BitcodeReader class.
@@ skipping 1461 matching lines @@
       if (S == "le32-unknown-nacl")
         S = "armv7-none-linux-gnueabi";
       // @LOCALMOD-END
       TheModule->setTargetTriple(S);
       break;
     }
     case bitc::MODULE_CODE_DATALAYOUT: {  // DATALAYOUT: [strchr x N]
       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]
       std::string S;
       if (ConvertToString(Record, 0, S))
         return Error("Invalid MODULE_CODE_ASM record");
       TheModule->setModuleInlineAsm(S);
       break;
     }
     case bitc::MODULE_CODE_DEPLIB: {  // DEPLIB: [strchr x N]
@@ skipping 1323 matching lines @@
   R->setBufferOwned(false);
 
   std::string Triple("");
   if (R->ParseTriple(Triple))
     if (ErrMsg)
       *ErrMsg = R->getErrorString();
 
   delete R;
   return Triple;
 }