Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/ExpandCtors.cpp

 //===- ExpandCtors.cpp - Convert ctors/dtors to concrete arrays -----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass converts LLVM's special symbols llvm.global_ctors and
@@ skipping 117 matching lines @@
   NewArray->setName(StartSymbol);
 
   // We replace "__{init,fini}_array_end" with the address of the end
   // of NewArray.  This removes the name "__{init,fini}_array_end"
   // from the output, which is not ideal for debugging.  Ideally we
   // would convert "__{init,fini}_array_end" to being a GlobalAlias
   // that points to the end of the array.  However, unfortunately LLVM
   // does not generate correct code when a GlobalAlias contains a
   // GetElementPtr ConstantExpr.
   Constant *NewArrayEnd =
-      ConstantExpr::getGetElementPtr(NewArray,
+      ConstantExpr::getGetElementPtr(ArrayTy, NewArray,
                                      ConstantInt::get(M.getContext(),
                                                       APInt(32, 1)));
   setGlobalVariableValue(M, EndSymbol, NewArrayEnd);
 }
 
 bool ExpandCtors::runOnModule(Module &M) {
   defineFuncArray(M, "llvm.global_ctors",
                   "__init_array_start", "__init_array_end");
   defineFuncArray(M, "llvm.global_dtors",
                   "__fini_array_start", "__fini_array_end");
   return true;
 }
 
 ModulePass *llvm::createExpandCtorsPass() {
   return new ExpandCtors();
 }