diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras
index 6add686c89..9611aed33f 100644
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -1059,6 +1059,7 @@ __SDCC_VERSION_MAJOR
 __SDCC_VERSION_MINOR
 __SDCC_VERSION_PATCH
 __SIZEOF_INT128__
+__SIZEOF_LONG__
 __SIZEOF_LONG_LONG__
 __STDC_NO_ATOMICS__
 __STDC_VERSION__
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 49301a4d3a..052b0085f1 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -3775,10 +3775,18 @@ extern void uITRON4_free(void *p) ;
         #define WOLFSSL_NO_GETPID
     #endif /* WOLFSSL_NO_GETPID */
     #ifndef SIZEOF_LONG
-        #define SIZEOF_LONG         8
+        #ifdef __SIZEOF_LONG__
+            #define SIZEOF_LONG __SIZEOF_LONG__
+        #else
+            #define SIZEOF_LONG         8
+        #endif
     #endif
     #ifndef SIZEOF_LONG_LONG
-        #define SIZEOF_LONG_LONG    8
+        #ifdef __SIZEOF_LONG_LONG__
+            #define SIZEOF_LONG_LONG __SIZEOF_LONG_LONG__
+        #else
+            #define SIZEOF_LONG_LONG    8
+        #endif
     #endif
     #define CHAR_BIT            8
     #ifndef WOLFSSL_SP_DIV_64