d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up more x86 only options in the efi code.

Browse Source
This commit is contained in:
Andrew Turner 2015-04-03 15:25:59 +00:00
parent 2e9ccb32a1
commit 94d3e34255
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281027
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/boot/efi/Makefile.inc
View File

@ -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"

10
sys/boot/efi/boot1/Makefile
View File

@ -23,14 +23,18 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include
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