Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABIProps.h

 //===- PNaClABIProps.h - Verify PNaCl ABI Properties ----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Verify PNaCl ABI properties.
@@ skipping 11 matching lines @@
 
 namespace llvm {
 
 class NamedMDNode;
 class DataLayout;
 
 // Checks properties needed to verify IR constructs. Unlike
 // PNaClABIVerifyFunctions and PNaClABIVerifyModule, this class is
 // pass-free, and checks individual elements within IR.
 class PNaClABIProps {
-  PNaClABIProps(const PNaClABIProps&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClABIProps&) LLVM_DELETED_FUNCTION;
+  PNaClABIProps(const PNaClABIProps&) = delete;
+  void operator=(const PNaClABIProps&) = delete;
 public:
   // Returns true if metadata kind MDKind is allowed.
   static bool isWhitelistedMetadata(unsigned MDKind);
   // Returns true if metadata is allowed.
   static bool isWhitelistedMetadata(const NamedMDNode *MD);
   // Returns true if integer constant Idx is in [0..NumElements).
   static bool isVectorIndexSafe(const APInt &Idx,
                                 unsigned NumElements) {
     return Idx.ult(NumElements);
   }
@@ skipping 27 matching lines @@
   static bool isValidGlobalLinkage(GlobalValue::LinkageTypes Linkage);
   // Returns kind of global value name, based on IsFunction.
   static const char *GVTypeName(bool IsFunction) {
     return IsFunction ? "Function" : "Variable";
   }
 };
 
 }
 
 #endif  // LLVM_ANALYSIS_NACL_PNACLABIPROPS_H