diff --git a/core/embed/trezorhal/compiler_traits.h b/core/embed/trezorhal/compiler_traits.h
index c5b46345d..931a875ac 100644
--- a/core/embed/trezorhal/compiler_traits.h
+++ b/core/embed/trezorhal/compiler_traits.h
@@ -21,17 +21,19 @@
 #define __COMPILER_TRAITS_H__
 
 /*
- * Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
+ * Avoid accidental build with gcc versions having broken stack protector.
+ * Affected versions range 9.2.1 - 10.2
  */
 #if defined(__GNUC__) && !defined(__llvm__)
 
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
+#define GCC_VERSION \
+  (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 
 #if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
-#pragma message "Only remove this GCC check if you are sure your compiler is patched or not used for production."
-#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, aborting build."
+#pragma message \
+    "Only remove this GCC check if you are sure your compiler is patched or not used for production."
+#error \
+    "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, aborting build."
 #endif
 #endif
 
diff --git a/legacy/bootloader/bootloader.c b/legacy/bootloader/bootloader.c
index c6eaaa91d..f9b6c4939 100644
--- a/legacy/bootloader/bootloader.c
+++ b/legacy/bootloader/bootloader.c
@@ -36,20 +36,6 @@
 #include "usb.h"
 #include "util.h"
 
-/*
- * Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
- */
-#if defined(__GNUC__) && !defined(__llvm__)
-
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
-
-#if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
-#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, preventing build"
-#endif
-#endif
-
 void layoutFirmwareFingerprint(const uint8_t *hash) {
   char str[4][17] = {0};
   for (int i = 0; i < 4; i++) {
diff --git a/legacy/compiler_traits.h b/legacy/compiler_traits.h
index 8fb6908df..931a875ac 100644
--- a/legacy/compiler_traits.h
+++ b/legacy/compiler_traits.h
@@ -21,19 +21,20 @@
 #define __COMPILER_TRAITS_H__
 
 /*
- * Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
+ * Avoid accidental build with gcc versions having broken stack protector.
+ * Affected versions range 9.2.1 - 10.2
  */
 #if defined(__GNUC__) && !defined(__llvm__)
 
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
+#define GCC_VERSION \
+  (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 
 #if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
-#pragma message "Only remove this GCC check if you are sure your compiler is patched or not used for production."
-#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, aborting build."
+#pragma message \
+    "Only remove this GCC check if you are sure your compiler is patched or not used for production."
+#error \
+    "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, aborting build."
 #endif
 #endif
 
 #endif
-