Merge commit 'b642e0348512' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit afd6d3b574b2 · 2020-02-04T20:25:12.000-05:00
diff --git a/clang/test/Driver/cuda-simple.cu b/clang/test/Driver/cuda-simple.cu
@@ -1,6 +1,7 @@
 // Verify that we can parse a simple CUDA file with or without -save-temps
 // http://llvm.org/PR22936
 // RUN: %clang -nocudainc -nocudalib -Werror -fsyntax-only -c %s
+// XFAIL: arm
 //
 // Verify that we pass -x cuda-cpp-output to compiler after
 // preprocessing a CUDA file
