diff --git a/libcudacxx/include/cuda/std/__cccl/diagnostic.h b/libcudacxx/include/cuda/std/__cccl/diagnostic.h
index f53925cbd64..a49b0dbb913 100644
--- a/libcudacxx/include/cuda/std/__cccl/diagnostic.h
+++ b/libcudacxx/include/cuda/std/__cccl/diagnostic.h
@@ -80,21 +80,33 @@
     _CCCL_DIAG_SUPPRESS_CLANG("-Wdeprecated") \
     _CCCL_DIAG_SUPPRESS_CLANG("-Wdeprecated-declarations")
 #  define _CCCL_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
-#elif defined(_CCCL_COMPILER_GCC) || defined(_CCCL_COMPILER_ICC)
+#elif defined(_CCCL_COMPILER_ICC)
+#  define _CCCL_SUPPRESS_DEPRECATED_PUSH \
+    _CCCL_DIAG_PUSH                      \
+    _CCCL_DIAG_SUPPRESS_ICC(1478)
+#  define _CCCL_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
+#elif defined(_CCCL_COMPILER_GCC)
 #  define _CCCL_SUPPRESS_DEPRECATED_PUSH    \
     _CCCL_DIAG_PUSH                         \
     _CCCL_DIAG_SUPPRESS_GCC("-Wdeprecated") \
     _CCCL_DIAG_SUPPRESS_GCC("-Wdeprecated-declarations")
 #  define _CCCL_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
+#elif defined(_CCCL_COMPILER_NVHPC)
+#  define _CCCL_SUPPRESS_DEPRECATED_PUSH \
+    _CCCL_DIAG_PUSH                      \
+    _CCCL_DIAG_SUPPRESS_NVHPC(deprecated_entity)
+#  define _CCCL_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
 #elif defined(_CCCL_COMPILER_MSVC)
 #  define _CCCL_SUPPRESS_DEPRECATED_PUSH \
     _CCCL_DIAG_PUSH                      \
     _CCCL_DIAG_SUPPRESS_MSVC(4996)
 #  define _CCCL_SUPPRESS_DEPRECATED_POP _CCCL_DIAG_POP
-#else // !_CCCL_COMPILER_CLANG && !_CCCL_COMPILER_GCC
+#else // !_CCCL_COMPILER_CLANG && !_CCCL_COMPILER_ICC && && !_CCCL_COMPILER_GCC && !_CCCL_COMPILER_NVHPC &&
+      // !_CCCL_COMPILER_MSVC
 #  define _CCCL_SUPPRESS_DEPRECATED_PUSH
 #  define _CCCL_SUPPRESS_DEPRECATED_POP
-#endif // !_CCCL_COMPILER_CLANG && !_CCCL_COMPILER_GCC
+#endif // !_CCCL_COMPILER_CLANG && !_CCCL_COMPILER_ICC && && !_CCCL_COMPILER_GCC && !_CCCL_COMPILER_NVHPC &&
+       // !_CCCL_COMPILER_MSVC
 
 // Enable us to selectively silence cuda compiler warnings
 #if defined(_CCCL_CUDA_COMPILER)