From b0dc756f7deacae5b339bc873bfbf906931735ee Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Mon, 8 Dec 2025 19:20:25 +0100 Subject: [PATCH 1/4] clang: Remove unnecessary host-supports-cuda from test --- clang/test/Headers/cuda_with_openmp.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/Headers/cuda_with_openmp.cu b/clang/test/Headers/cuda_with_openmp.cu index 8ea0de5972ff2..efde4ecdc6626 100644 --- a/clang/test/Headers/cuda_with_openmp.cu +++ b/clang/test/Headers/cuda_with_openmp.cu @@ -2,7 +2,7 @@ // Reported in https://bugs.llvm.org/show_bug.cgi?id=48014 ///==========================================================================/// -// REQUIRES: nvptx-registered-target, host-supports-cuda +// REQUIRES: nvptx-registered-target // RUN: %clang -x cuda -fopenmp -c %s -o - --cuda-path=%S/../Driver/Inputs/CUDA/usr/local/cuda -nocudalib -isystem %S/Inputs/include -isystem %S/../../lib/Headers -fsyntax-only From 25825a26b152b201e26daf25279227440765ce22 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Mon, 8 Dec 2025 20:37:53 +0100 Subject: [PATCH 2/4] Add missing climits include --- clang/lib/Headers/__clang_cuda_runtime_wrapper.h | 1 + 1 file changed, 1 insertion(+) diff --git a/clang/lib/Headers/__clang_cuda_runtime_wrapper.h b/clang/lib/Headers/__clang_cuda_runtime_wrapper.h index b1e59248a58de..54488f87b990e 100644 --- a/clang/lib/Headers/__clang_cuda_runtime_wrapper.h +++ b/clang/lib/Headers/__clang_cuda_runtime_wrapper.h @@ -40,6 +40,7 @@ // while some required macros (like __THROW) are in a weird state. #include #include +#include #include #include #undef __CUDACC__ From b9662097756a1be155e00afdd38b648e89cb174e Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Mon, 8 Dec 2025 20:39:15 +0100 Subject: [PATCH 3/4] Test x86 and systemz hosts --- clang/test/Headers/cuda_with_openmp.cu | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/test/Headers/cuda_with_openmp.cu b/clang/test/Headers/cuda_with_openmp.cu index efde4ecdc6626..49850cd1c1781 100644 --- a/clang/test/Headers/cuda_with_openmp.cu +++ b/clang/test/Headers/cuda_with_openmp.cu @@ -4,5 +4,6 @@ // REQUIRES: nvptx-registered-target -// RUN: %clang -x cuda -fopenmp -c %s -o - --cuda-path=%S/../Driver/Inputs/CUDA/usr/local/cuda -nocudalib -isystem %S/Inputs/include -isystem %S/../../lib/Headers -fsyntax-only +// RUN: %if x86-registered-target %{ %clang -target x86_64-unknown-linux -x cuda -fopenmp -c %s -o - --cuda-path=%S/../Driver/Inputs/CUDA/usr/local/cuda -nocudalib -isystem %S/Inputs/include -isystem %S/../../lib/Headers -fsyntax-only %} +// RUN: %if systemz-registered-target %{ %clang -target s390x-ibm-zos -x cuda -fopenmp -c %s -o - --cuda-path=%S/../Driver/Inputs/CUDA/usr/local/cuda -nocudalib -isystem %S/Inputs/include -isystem %S/../../lib/Headers -fsyntax-only %} From 9d8fda3dd223df754095259fd71c57b3cb6f14e3 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Mon, 8 Dec 2025 20:43:58 +0100 Subject: [PATCH 4/4] clang-format --- clang/lib/Headers/__clang_cuda_runtime_wrapper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Headers/__clang_cuda_runtime_wrapper.h b/clang/lib/Headers/__clang_cuda_runtime_wrapper.h index 54488f87b990e..fcf1ea89ad6a3 100644 --- a/clang/lib/Headers/__clang_cuda_runtime_wrapper.h +++ b/clang/lib/Headers/__clang_cuda_runtime_wrapper.h @@ -38,9 +38,9 @@ // Include some standard headers to avoid CUDA headers including them // while some required macros (like __THROW) are in a weird state. +#include #include #include -#include #include #include #undef __CUDACC__