diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc
index d06db2847..efd2de1b3 100644
--- a/db/fault_injection_test.cc
+++ b/db/fault_injection_test.cc
@@ -228,7 +228,7 @@ class FaultInjectionTest : public testing::Test,
     return Status::OK();
   }
 
-#if defined(__clang__)
+#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 9)
 __attribute__((__no_sanitize__("undefined")))
 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
 __attribute__((__no_sanitize_undefined__))
diff --git a/util/hash.cc b/util/hash.cc
index ce0790a8f..5e3344437 100644
--- a/util/hash.cc
+++ b/util/hash.cc
@@ -14,7 +14,7 @@
 namespace rocksdb {
 
 // This function may intentionally do a left shift on a -ve number
-#if defined(__clang__)
+#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 9)
 __attribute__((__no_sanitize__("undefined")))
 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
 __attribute__((__no_sanitize_undefined__))
diff --git a/utilities/col_buf_encoder.cc b/utilities/col_buf_encoder.cc
index f9098d403..5335498c6 100644
--- a/utilities/col_buf_encoder.cc
+++ b/utilities/col_buf_encoder.cc
@@ -46,7 +46,7 @@ ColBufEncoder *ColBufEncoder::NewColBufEncoder(
   return nullptr;
 }
 
-#if defined(__clang__)
+#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 9)
 __attribute__((__no_sanitize__("undefined")))
 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
 __attribute__((__no_sanitize_undefined__))