diff --git a/common/iovector.h b/common/iovector.h
index 72800027..cdab146f 100644
--- a/common/iovector.h
+++ b/common/iovector.h
@@ -40,8 +40,10 @@ limitations under the License.
 #include <photon/common/io-alloc.h>
 
 #pragma GCC diagnostic push
-#if __GNUC__ >= 13
+#if defined(__clang__)
 #pragma GCC diagnostic ignored "-Wunknown-warning-option"
+#endif
+#if __GNUC__ >= 12
 #pragma GCC diagnostic ignored "-Wzero-length-bounds"
 #endif
 
diff --git a/common/test/test.cpp b/common/test/test.cpp
index 7cd02c39..8e11c380 100644
--- a/common/test/test.cpp
+++ b/common/test/test.cpp
@@ -247,7 +247,7 @@ TEST(Callback, virtual_function)
 //    Callback<int> ee([&](int x){ return RET + x/2; });
 
 #pragma GCC diagnostic push
-#if __GNUC__ >= 13
+#if __GNUC__ >= 12
 #pragma GCC diagnostic ignored "-Wdangling-pointer"
 #endif
     THIS = (BB*)&c;
diff --git a/rpc/rpc.cpp b/rpc/rpc.cpp
index 7fcf96db..01c6b88d 100644
--- a/rpc/rpc.cpp
+++ b/rpc/rpc.cpp
@@ -325,8 +325,10 @@ namespace rpc {
                 return -1;
 
 #pragma GCC diagnostic push
-#if __GNUC__ >= 13
+#if defined(__clang__)
 #pragma GCC diagnostic ignored "-Wunknown-warning-option"
+#endif
+#if __GNUC__ >= 12
 #pragma GCC diagnostic ignored "-Wdangling-pointer"
 #endif
             ThreadLink node;