From 9d46b1ed31d2acbb772f9bb4b139fa1ec36a65ab Mon Sep 17 00:00:00 2001 From: Vlad Serebrennikov Date: Sun, 14 Apr 2024 08:46:27 +0300 Subject: [PATCH 1/2] [clang] Fix name conflict with `sys/mac.h` on AIX Fixes clang-ppc64-aix bot failure after #88559 (0a6f6df5b0c3d0f2a42f013bf5cafb9b5020dcac) https://lab.llvm.org/buildbot/#/builders/214/builds/11887 --- clang/include/clang/Basic/Cuda.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clang/include/clang/Basic/Cuda.h b/clang/include/clang/Basic/Cuda.h index acc6bb6581d85..3908e10bc6106 100644 --- a/clang/include/clang/Basic/Cuda.h +++ b/clang/include/clang/Basic/Cuda.h @@ -50,6 +50,11 @@ const char *CudaVersionToString(CudaVersion V); // Input is "Major.Minor" CudaVersion CudaStringToVersion(const llvm::Twine &S); +// We have a name conflict with sys/mac.h on AIX +#ifdef _AIX +#undef SM_32 +#endif + enum class CudaArch { UNUSED, UNKNOWN, From 52e1d6e82e5971d131d1321f013c70cd39083fc4 Mon Sep 17 00:00:00 2001 From: Vlad Serebrennikov Date: Sun, 14 Apr 2024 16:52:11 +0400 Subject: [PATCH 2/2] Update clang/include/clang/Basic/Cuda.h Co-authored-by: Joseph Huber --- clang/include/clang/Basic/Cuda.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clang/include/clang/Basic/Cuda.h b/clang/include/clang/Basic/Cuda.h index 3908e10bc6106..38f30543a0f66 100644 --- a/clang/include/clang/Basic/Cuda.h +++ b/clang/include/clang/Basic/Cuda.h @@ -51,10 +51,9 @@ const char *CudaVersionToString(CudaVersion V); CudaVersion CudaStringToVersion(const llvm::Twine &S); // We have a name conflict with sys/mac.h on AIX -#ifdef _AIX +#ifdef SM_32 #undef SM_32 #endif - enum class CudaArch { UNUSED, UNKNOWN,