diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c
index 1a0630005..55618c267 100644
--- a/wolfcrypt/src/sp_int.c
+++ b/wolfcrypt/src/sp_int.c
@@ -2902,26 +2902,18 @@ int sp_set(sp_int* a, sp_int_digit d)
         err = MP_VAL;
     }
     if (err == MP_OKAY) {
-#if defined(__GNUC__)
-#if __GNUC__ == 11
-        /* gcc-11 falsely reports out-of-bounds array access if the byte array
-         * backing the sp_int* is smaller than sizeof(sp_int), as occurs when
+        /* gcc-11 reports out-of-bounds array access if the byte array backing
+         * the sp_int* is smaller than sizeof(sp_int), as occurs when
          * WOLFSSL_SP_SMALL.
          */
-        _Pragma("GCC diagnostic push");
-        _Pragma("GCC diagnostic ignored \"-Warray-bounds\"");
-#endif
-#endif
+        PRAGMA_GCC_DIAG_PUSH;
+        PRAGMA_GCC("GCC diagnostic ignored \"-Warray-bounds\"");
         a->dp[0] = d;
         a->used = d > 0;
     #ifdef WOLFSSL_SP_INT_NEGATIVE
         a->sign = MP_ZPOS;
     #endif
-#if defined(__GNUC__)
-#if __GNUC__ >= 11
-        _Pragma("GCC diagnostic pop");
-#endif
-#endif
+        PRAGMA_GCC_DIAG_POP;
     }
 
     return err;