diff options
| author | imp <imp@FreeBSD.org> | 2016-05-18 06:01:18 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2016-05-18 06:01:18 +0000 |
| commit | 3b518c4dc10bf43b7ae4c1d618b3853c07293818 (patch) | |
| tree | 6b3be8c1f55460e86fa3d3968f0fd655e0ebd2ba /lib/libcompiler_rt | |
| parent | 28fe011e628781e5ebbde5d9dd55d81c88382819 (diff) | |
| download | FreeBSD-src-3b518c4dc10bf43b7ae4c1d618b3853c07293818.zip FreeBSD-src-3b518c4dc10bf43b7ae4c1d618b3853c07293818.tar.gz | |
Make armv6 hard float abi by default. Kill armv6hf.
Allow CPUTYPE=soft to build the current soft-float abi libraries.
Add UPDATING entry to announce this.
Approved by: re@ (gjb)
Diffstat (limited to 'lib/libcompiler_rt')
| -rw-r--r-- | lib/libcompiler_rt/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 8959225..011bead 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -199,9 +199,10 @@ SRCF+= stdatomic .endif .for file in ${SRCF} -. if ${MACHINE_ARCH:Marm*hf*} != "" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S) +.if ${MACHINE_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") && \ + exists(${CRTSRC}/${CRTARCH}/${file}vfp.S) SRCS+= ${file}vfp.S -. elif !(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH:Marm*hf*} == "") && exists(${CRTSRC}/${CRTARCH}/${file}.S) +. elif exists(${CRTSRC}/${CRTARCH}/${file}.S) SRCS+= ${file}.S . else SRCS+= ${file}.c |
