[Midnightbsd-cvs] src [10210] trunk/sys/boot/efi: fix up makefile

[laffer1 at midnightbsd.org]

Revision: 10210
          http://svnweb.midnightbsd.org/src/?rev=10210
Author:   laffer1
Date:     2018-06-02 08:44:07 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
fix up makefile

Modified Paths:
--------------
    trunk/sys/boot/efi/Makefile
    trunk/sys/boot/efi/Makefile.inc

Modified: trunk/sys/boot/efi/Makefile
===================================================================
--- trunk/sys/boot/efi/Makefile	2018-06-02 12:43:59 UTC (rev 10209)
+++ trunk/sys/boot/efi/Makefile	2018-06-02 12:44:07 UTC (rev 10210)
@@ -1,5 +1,20 @@
-# $MidnightBSD: src/sys/boot/efi/Makefile,v 1.2 2008/10/01 16:41:13 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/boot/efi/Makefile 295538 2016-02-11 17:56:09Z smh $
 
-SUBDIR=		libefi
+.include <bsd.own.mk>
 
+# In-tree GCC does not support __attribute__((ms_abi)).
+.if ${COMPILER_TYPE} != "gcc"
+
+.if ${MACHINE_CPUARCH} == "amd64"
+SUBDIR+=	libefi loader boot1
+.endif
+
+.endif # ${COMPILER_TYPE} != "gcc"
+
+.if ${MACHINE_CPUARCH} == "ia64"
+SUBDIR+=	libefi
+.endif
+
 .include <bsd.subdir.mk>
+

Modified: trunk/sys/boot/efi/Makefile.inc
===================================================================
--- trunk/sys/boot/efi/Makefile.inc	2018-06-02 12:43:59 UTC (rev 10209)
+++ trunk/sys/boot/efi/Makefile.inc	2018-06-02 12:44:07 UTC (rev 10210)
@@ -1,9 +1,25 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/boot/efi/Makefile.inc 293660 2016-01-11 15:30:19Z emaste $
 
 BINDIR?=	/boot
 
+.if ${MACHINE_CPUARCH} == "i386"
+CFLAGS+=        -march=i386
+CFLAGS+=	-msoft-float
+.endif
+
 # Options used when building app-specific efi components
-CFLAGS+=	-ffreestanding -fshort-wchar -Wformat
+# See conf/kern.mk for the correct set of these
+CFLAGS+=	-ffreestanding -Wformat
 LDFLAGS+=	-nostdlib
 
+.if ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=	-fshort-wchar
+CFLAGS+=	-mno-red-zone
+CFLAGS+=	-mno-mmx -mno-sse
+CFLAGS.clang+=	-mno-aes -mno-avx
+CFLAGS+=	-msoft-float
+.endif
+
+
 .include "../Makefile.inc"