Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABIProps.h

Index: include/llvm/Analysis/NaCl/PNaClABIProps.h
diff --git a/include/llvm/Analysis/NaCl/PNaClABIProps.h b/include/llvm/Analysis/NaCl/PNaClABIProps.h
index 7f53445c0cf59d5febe4c54a51819a254886b462..dfb3d0d512b03dadcfa1414d169a8b9fd38ab950 100644
--- a/include/llvm/Analysis/NaCl/PNaClABIProps.h
+++ b/include/llvm/Analysis/NaCl/PNaClABIProps.h
@@ -29,8 +29,8 @@ class DataLayout;
 // 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);