Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABITypeChecker.h

 //===- PNaClABITypeChecker.h - Verify PNaCl ABI rules -----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Common type-checking code for module and function-level passes
 //
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_ANALYSIS_NACL_PNACLABITYPECHECKER_H
 #define LLVM_ANALYSIS_NACL_PNACLABITYPECHECKER_H
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/IR/Type.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
 class FunctionType;
 
 class PNaClABITypeChecker {
-  PNaClABITypeChecker(const PNaClABITypeChecker&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClABITypeChecker&) LLVM_DELETED_FUNCTION;
+  PNaClABITypeChecker(const PNaClABITypeChecker&) = delete;
+  void operator=(const PNaClABITypeChecker&) = delete;
 public:
   // Returns true if Ty is a valid argument or return value type for PNaCl.
   static bool isValidParamType(const Type *Ty);
 
   // Returns true if Ty is a valid function type for PNaCl.
   static bool isValidFunctionType(const FunctionType *FTy);
 
   // Returns true if Ty is a valid non-derived type for PNaCl.
   static bool isValidScalarType(const Type *Ty);
 
@@ skipping 33 matching lines @@
   static bool IsPointerEquivType(Type *T1, Type *T2) {
     if (T1->isPointerTy()) return T2->isIntegerTy(32);
     if (T2->isPointerTy()) return T1->isIntegerTy(32);
     return T1 == T2;
   }
 
 };
 } // namespace llvm
 
 #endif // LLVM_ANALYSIS_NACL_PNACLABITYPECHECKER_H