Author: andrew
Date: Fri Apr 3 15:25:59 2015
New Revision: 281027
URL: https://svnweb.freebsd.org/changeset/base/281027
Log:
Clean up more x86 only options in the efi code.
Modified:
head/sys/boot/efi/Makefile.inc
head/sys/boot/efi/boot1/Makefile
Modified: head/sys/boot/efi/Makefile.inc
==============================================================================
--- head/sys/boot/efi/Makefile.inc Fri Apr 3 14:45:48 2015
(r281026)
+++ head/sys/boot/efi/Makefile.inc Fri Apr 3 15:25:59 2015
(r281027)
@@ -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: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile Fri Apr 3 14:45:48 2015
(r281026)
+++ head/sys/boot/efi/boot1/Makefile Fri Apr 3 15:25:59 2015
(r281027)
@@ -23,14 +23,18 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/d
CFLAGS+= -I${.CURDIR}/../../..
# Always add MI sources and REGULAR efi loader bits
-.PATH: ${.CURDIR}/../loader/arch/amd64 ${.CURDIR}/../../common
+.PATH: ${.CURDIR}/../loader/arch/${MACHINE_CPUARCH}
${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../common
FILES= boot1.efi boot1.efifat
FILESMODE_boot1.efi= ${BINMODE}
LDSCRIPT=
${.CURDIR}/../loader/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH}
-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}
@@ -73,6 +77,7 @@ CLEANFILES= boot1.efifat
.include <bsd.prog.mk>
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: machine x86
CLEANFILES+= machine x86 boot1.efi
@@ -82,3 +87,4 @@ machine:
x86:
ln -sf ${.CURDIR}/../../../x86/include x86
+.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
