svn commit: r316625 - in head: share/mk sys/boot/efi sys/boot/efi/boot1 sys/boot/efi/fdt sys/boot/efi/libefi sys/boot/efi/loader/arch/arm64

[Alexander Kabaev]

Author: kan
Date: Fri Apr  7 22:58:25 2017
New Revision: 316625
URL: https://svnweb.freebsd.org/changeset/base/316625

Log:
  Do not use -msoft-float with intention of disabling FP on aarch64
  
  GNU GCC does does recognise it as a valid option and we already
  use -mgeneral-regs-only that has the desired effect.
  
  Reviewed by: emaste
  Differential Revision:	https://reviews.freebsd.org/D10306

Modified:
  head/share/mk/bsd.stand.mk
  head/sys/boot/efi/Makefile.inc
  head/sys/boot/efi/boot1/Makefile
  head/sys/boot/efi/fdt/Makefile
  head/sys/boot/efi/libefi/Makefile
  head/sys/boot/efi/loader/arch/arm64/Makefile.inc

Modified: head/share/mk/bsd.stand.mk
==============================================================================
--- head/share/mk/bsd.stand.mk	Fri Apr  7 22:58:20 2017	(r316624)
+++ head/share/mk/bsd.stand.mk	Fri Apr  7 22:58:25 2017	(r316625)
@@ -8,7 +8,7 @@ CFLAGS+= -ffreestanding -Wformat
 CFLAGS+= ${CFLAGS_NO_SIMD} -D_STANDALONE
 .if ${MACHINE_CPUARCH} == "riscv"
 CFLAGS+=	-mno-float
-.else
+.elif ${MACHINE_CPUARCH} != "aarch64"
 CFLAGS+=	-msoft-float
 .endif
 

Modified: head/sys/boot/efi/Makefile.inc
==============================================================================
--- head/sys/boot/efi/Makefile.inc	Fri Apr  7 22:58:20 2017	(r316624)
+++ head/sys/boot/efi/Makefile.inc	Fri Apr  7 22:58:25 2017	(r316625)
@@ -9,9 +9,13 @@ CFLAGS+=	-mno-aes
 
 # Options used when building app-specific efi components
 # See conf/kern.mk for the correct set of these
-CFLAGS+=	-ffreestanding -Wformat -msoft-float ${CFLAGS_NO_SIMD}
+CFLAGS+=	-ffreestanding -Wformat ${CFLAGS_NO_SIMD}
 LDFLAGS+=	-nostdlib
 
+.if ${MACHINE_CPUARCH} != "aarch64"
+CFLAGS+=	-msoft-float
+.endif
+
 .if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-fshort-wchar
 CFLAGS+=	-mno-red-zone

Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile	Fri Apr  7 22:58:20 2017	(r316624)
+++ head/sys/boot/efi/boot1/Makefile	Fri Apr  7 22:58:25 2017	(r316625)
@@ -71,7 +71,7 @@ LDSCRIPT=	${.CURDIR}/../loader/arch/${MA
 LDFLAGS+=	-Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
 
 .if ${MACHINE_CPUARCH} == "aarch64"
-CFLAGS+=	-msoft-float -mgeneral-regs-only
+CFLAGS+=	-mgeneral-regs-only
 .endif
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=	-fPIC

Modified: head/sys/boot/efi/fdt/Makefile
==============================================================================
--- head/sys/boot/efi/fdt/Makefile	Fri Apr  7 22:58:20 2017	(r316624)
+++ head/sys/boot/efi/fdt/Makefile	Fri Apr  7 22:58:25 2017	(r316625)
@@ -10,9 +10,11 @@ WARNS?=		6
 
 SRCS=		efi_fdt.c
 
-CFLAGS+=	-ffreestanding -msoft-float
+CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only
+.else
+CFLAGS+=	-msoft-float
 .endif
 
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/

Modified: head/sys/boot/efi/libefi/Makefile
==============================================================================
--- head/sys/boot/efi/libefi/Makefile	Fri Apr  7 22:58:20 2017	(r316624)
+++ head/sys/boot/efi/libefi/Makefile	Fri Apr  7 22:58:25 2017	(r316625)
@@ -30,7 +30,7 @@ CWARNFLAGS.efipart.c+=	-Wno-format
 CWARNFLAGS.env.c+=	-Wno-format
 
 .if ${MACHINE_CPUARCH} == "aarch64"
-CFLAGS+=	-msoft-float -mgeneral-regs-only
+CFLAGS+=	-mgeneral-regs-only
 .endif
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -fPIC -mno-red-zone

Modified: head/sys/boot/efi/loader/arch/arm64/Makefile.inc
==============================================================================
--- head/sys/boot/efi/loader/arch/arm64/Makefile.inc	Fri Apr  7 22:58:20 2017	(r316624)
+++ head/sys/boot/efi/loader/arch/arm64/Makefile.inc	Fri Apr  7 22:58:25 2017	(r316625)
@@ -8,7 +8,7 @@ SRCS+=	exec.c \
 CFLAGS+=-I${.CURDIR}/../../arm64/libarm64
 SRCS+=	cache.c
 
-CFLAGS+=	-msoft-float -mgeneral-regs-only
+CFLAGS+=	-mgeneral-regs-only
 
 CLEANFILES+=	loader.help