Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABITypeChecker.h

Index: include/llvm/Analysis/NaCl/PNaClABITypeChecker.h
diff --git a/include/llvm/Analysis/NaCl/PNaClABITypeChecker.h b/include/llvm/Analysis/NaCl/PNaClABITypeChecker.h
index 257f512ef125e8afdc6bffa9d7a9413c8e71be58..7d0a4643127d87f50b1b7e5a0669f110e92ecba8 100644
--- a/include/llvm/Analysis/NaCl/PNaClABITypeChecker.h
+++ b/include/llvm/Analysis/NaCl/PNaClABITypeChecker.h
@@ -23,8 +23,8 @@ 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);