Index: head/sys/boot/efi/Makefile
===================================================================
--- head/sys/boot/efi/Makefile	(revision 296891)
+++ head/sys/boot/efi/Makefile	(revision 296892)
@@ -1,23 +1,23 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
-# In-tree GCC does not support __attribute__((ms_abi)).
-.if ${COMPILER_TYPE} != "gcc"
+# In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
+# than 4.5 supports it.
+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
 .if ${MK_FDT} != "no"
 SUBDIR+=	fdt
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || \
     ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "arm"
 SUBDIR+=	libefi loader boot1
 .endif
 
-.endif # ${COMPILER_TYPE} != "gcc"
+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
 
 .include <bsd.subdir.mk>
-