diff --git a/library/platform_util.c b/library/platform_util.c
index cfd982e4d..09216edfb 100644
--- a/library/platform_util.c
+++ b/library/platform_util.c
@@ -128,8 +128,9 @@ void mbedtls_platform_zeroize(void *buf, size_t len)
 #endif
 
 #if defined(__GNUC__)
-        /* For clang and gcc, pretend that we have some assembly that reads the
+        /* For clang and recent gcc, pretend that we have some assembly that reads the
          * zero'd memory as an additional protection against being optimised away. */
+#if defined(__clang__) || (__GNUC__ >= 10)
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wvla"
@@ -143,6 +144,7 @@ void mbedtls_platform_zeroize(void *buf, size_t len)
 #elif defined(MBEDTLS_COMPILER_IS_GCC)
 #pragma GCC diagnostic pop
 #endif
+#endif
 #endif
     }
 }