svn commit: r296892 - head/sys/boot/efi

[Warner Losh]

Author: imp
Date: Tue Mar 15 05:17:31 2016
New Revision: 296892
URL: https://svnweb.freebsd.org/changeset/base/296892

Log:
  ms_abi is supported with gcc 4.5 or newer, so build it with gcc if it
  is 4.5 or newer.

Modified:
  head/sys/boot/efi/Makefile

Modified: head/sys/boot/efi/Makefile
==============================================================================
--- head/sys/boot/efi/Makefile	Tue Mar 15 05:17:29 2016	(r296891)
+++ head/sys/boot/efi/Makefile	Tue Mar 15 05:17:31 2016	(r296892)
@@ -2,8 +2,9 @@
 
 .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"
@@ -17,7 +18,6 @@ SUBDIR+=	fdt
 SUBDIR+=	libefi loader boot1
 .endif
 
-.endif # ${COMPILER_TYPE} != "gcc"
+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
 
 .include <bsd.subdir.mk>
-