Author: emaste
Date: Mon Jan 11 00:43:50 2016
New Revision: 293649
URL: https://svnweb.freebsd.org/changeset/base/293649
Log:
MFC r281027: Clean up more x86 only options in the efi code.
Modified:
stable/10/sys/boot/efi/Makefile.inc
stable/10/sys/boot/efi/boot1/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/boot/efi/Makefile.inc
==============================================================================
--- stable/10/sys/boot/efi/Makefile.inc Sun Jan 10 23:41:31 2016
(r293648)
+++ stable/10/sys/boot/efi/Makefile.inc Mon Jan 11 00:43:50 2016
(r293649)
@@ -8,9 +8,14 @@ CFLAGS+= -march=i386
# Options used when building app-specific efi components
# See conf/kern.mk for the correct set of these
-CFLAGS+= -ffreestanding -fshort-wchar -Wformat
-CFLAGS+= -mno-red-zone
-CFLAGS+= -mno-mmx -mno-sse -mno-aes -mno-avx -msoft-float
+CFLAGS+= -ffreestanding -Wformat -msoft-float
LDFLAGS+= -nostdlib
+.if ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+= -fshort-wchar
+CFLAGS+= -mno-red-zone
+CFLAGS+= -mno-mmx -mno-sse -mno-aes -mno-avx
+.endif
+
+
.include "../Makefile.inc"
Modified: stable/10/sys/boot/efi/boot1/Makefile
==============================================================================
--- stable/10/sys/boot/efi/boot1/Makefile Sun Jan 10 23:41:31 2016
(r293648)
+++ stable/10/sys/boot/efi/boot1/Makefile Mon Jan 11 00:43:50 2016
(r293649)
@@ -32,7 +32,11 @@ FILES= boot1.efi boot1.efifat
FILESMODE_boot1.efi= ${BINMODE}
LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE}
-LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared -Wl,-znocombreloc
+LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
+
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+LDFLAGS+= -Wl,-znocombreloc
+.endif
${PROG}: ${LDSCRIPT}
@@ -75,6 +79,7 @@ CLEANFILES= boot1.efifat
.include <bsd.prog.mk>
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: machine x86
CLEANFILES+= machine x86 boot1.efi
@@ -84,3 +89,4 @@ machine:
x86:
ln -sf ${.CURDIR}/../../../x86/include x86
+.endif
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
