diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 4e660ecee2..0690678c04 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -191,7 +191,7 @@ endif
 
 PYTHON3_CFLAGS = $(TARGET_CFLAGS)
 
-ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_121567),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_81426),y)
 PYTHON3_CFLAGS += -O0
 endif
 
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 8330e652c2..99337a1873 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -141,6 +141,9 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485
 	default y if BR2_microblaze
 
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426
+# error: unable to find a register to spill in class ‘R0_REGS’
+# The bug exists at least since gcc 6.x, so we are assuming it affects
+# all GCC versions.
 config BR2_TOOLCHAIN_HAS_GCC_BUG_81426
 	bool
 	default y if BR2_sh
@@ -243,16 +246,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_111001
 		   BR2_OPTIMIZE_2 || \
 		   BR2_OPTIMIZE_3
 
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121567
-# error: unable to find a register to spill in class ‘R0_REGS’
-# The bug exists at least since gcc 6.x, so we are assuming it affects
-# all GCC versions.
-config BR2_TOOLCHAIN_HAS_GCC_BUG_121567
-	bool
-	default y if BR2_sh
-	depends on BR2_OPTIMIZE_2 || \
-		   BR2_OPTIMIZE_3
-
 config BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	bool