#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAPI'm terribly sorry, I appear to have broken bisectability here.
-#if __GNUC_MINOR__>= 4
+#if GCC_VERSION>= 40400
#define __HAVE_BUILTIN_BSWAP32__
#define __HAVE_BUILTIN_BSWAP64__
#endif
-#if __GNUC_MINOR__>= 8 || (defined(__powerpc__)&& __GNUC_MINOR__>= 6)
+#if GCC_VERSION>= 40800 || (defined(__powerpc__)&& GCC_VERSION>= 40600)
#define __HAVE_BUILTIN_BSWAP16__
#endif
-#endif
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */