Merge commit '27770a7de1e2' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 13fac9a47f71 · 2023-09-29T15:21:32.000-05:00
diff --git a/clang/test/OpenMP/ompx_bare_messages.c b/clang/test/OpenMP/ompx_bare_messages.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -verify -fopenmp -triple x86_64-unknown-unknown %s
-// RUN: %clang_cc1 -verify -fopenmp-simd -triple x86_64-unknown-unknown %s
-// RUN: %clang_cc1 -verify -fopenmp -triple x86_64-unknown-unknown -fopenmp-targets=nvptx64 %s
+// RUN: %clang_cc1 -verify -fopenmp %s
+// RUN: %clang_cc1 -verify -fopenmp-simd %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=nvptx64 %s
 
 void foo() {
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-// RUN: %clang_cc1 -verify -fopenmp -triple x86_64-unknown-unknown %s`
`2`		`-// RUN: %clang_cc1 -verify -fopenmp-simd -triple x86_64-unknown-unknown %s`
`3`		`-// RUN: %clang_cc1 -verify -fopenmp -triple x86_64-unknown-unknown -fopenmp-targets=nvptx64 %s`
	`1`	`+// RUN: %clang_cc1 -verify -fopenmp %s`
	`2`	`+// RUN: %clang_cc1 -verify -fopenmp-simd %s`
	`3`	`+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=nvptx64 %s`
`4`	`4`
`5`	`5`	`void foo() {`
`6`	`6`	`}`