diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7b0c24a65..c8bb9ffa16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,9 +122,6 @@ message(STATUS "hipcc version:    ${hipcc_version_string}")
 ### Check for hipEventDisableSystemFence support
 check_symbol_exists("hipEventDisableSystemFence" "hip/hip_runtime_api.h" HIP_EVENT_DISABLE_FENCE)
 
-### Check for hipDeviceMallocUncached support
-check_symbol_exists("hipDeviceMallocUncached" "hip/hip_runtime_api.h" HIP_UNCACHED_MEMORY)
-
 ### Check for indirect function call support
 if(ENABLE_IFC)
   if(${hipcc_version_string} VERSION_GREATER_EQUAL "5.5.30201")
@@ -541,10 +538,13 @@ endif()
 if(${HIP_EVENT_DISABLE_FENCE})
   target_compile_definitions(rccl PRIVATE HIP_EVENT_DISABLE_FENCE)
 endif()
-if(${HIP_UNCACHED_MEMORY})
-  if(${hipcc_version_string} VERSION_GREATER_EQUAL "5.7.31920")
-    target_compile_definitions(rccl PRIVATE HIP_UNCACHED_MEMORY)
-    message(STATUS "HIP_UNCACHED_MEMORY enabled")
+if(${hipcc_version_string} VERSION_GREATER_EQUAL "5.7.31920")
+  target_compile_definitions(rccl PRIVATE HIP_UNCACHED_MEMORY)
+  message(STATUS "HIP_UNCACHED_MEMORY enabled")
+else()
+  # keep --hipcc-func-supp on older HIP and compiler
+  if(NOT IFC_ENABLED)
+    target_compile_options(rccl PRIVATE --hipcc-func-supp)
   endif()
 endif()
 if (BUILD_BFD)
@@ -586,9 +586,6 @@ endif()
 if(TIMETRACE)
   target_compile_options(rccl PRIVATE -ftime-trace)
 endif()
-if(NOT IFC_ENABLED)
-  target_compile_options(rccl PRIVATE --hipcc-func-supp)
-endif()
 
 ## Set RCCL linked library directories
 target_link_directories(rccl PRIVATE ${ROCM_SMI_LIB_DIR})