Sat Mar 26 07:31:11 2016 UTC ()
Make sure to define __SOFT_FP__ when building a SOFTFLOAT userland


(martin)
diff -r1.29 -r1.30 src/lib/libc/compiler_rt/Makefile.inc
cvs diff -r1.29 -r1.30 src/lib/libc/compiler_rt/Makefile.inc (expand / switch to unified diff)

--- src/lib/libc/compiler_rt/Makefile.inc 2016/02/29 14:57:07 1.29
+++ src/lib/libc/compiler_rt/Makefile.inc 2016/03/26 07:31:11 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.29 2016/02/29 14:57:07 adam Exp $ 1# $NetBSD: Makefile.inc,v 1.30 2016/03/26 07:31:11 martin Exp $
2 2
3COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 3COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
4 4
5.if ${LIBC_MACHINE_ARCH} == "powerpc" || ${LIBC_MACHINE_ARCH} == "powerpc64" 5.if ${LIBC_MACHINE_ARCH} == "powerpc" || ${LIBC_MACHINE_ARCH} == "powerpc64"
6COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc 6COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
7COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc 7COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
8.else 8.else
9COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_CPU} 9COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_CPU}
10COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_ARCH} 10COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_ARCH}
11.endif 11.endif
12 12
13.PATH: ${COMPILER_RT_CPU_DIR} 13.PATH: ${COMPILER_RT_CPU_DIR}
14.PATH: ${COMPILER_RT_ARCH_DIR} 14.PATH: ${COMPILER_RT_ARCH_DIR}
@@ -260,14 +260,17 @@ GENERIC_SRCS+= \ @@ -260,14 +260,17 @@ GENERIC_SRCS+= \
260. if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \ 260. if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \
261 exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S) 261 exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S)
262SRCS+= ${src:R}.S 262SRCS+= ${src:R}.S
263. else 263. else
264SRCS+= ${src} 264SRCS+= ${src}
265. if ${src:E} != "cc" 265. if ${src:E} != "cc"
266COPTS.${src}+= -Wno-missing-prototypes \ 266COPTS.${src}+= -Wno-missing-prototypes \
267 -Wno-old-style-definition \ 267 -Wno-old-style-definition \
268 -Wno-strict-prototypes \ 268 -Wno-strict-prototypes \
269 -Wno-uninitialized \ 269 -Wno-uninitialized \
270 -Wno-cast-qual 270 -Wno-cast-qual
271. endif 271. endif
272. endif 272. endif
 273.if ${MKSOFTFLOAT:Uno} != "no"
 274COPTS.${src}+= -D__SOFT_FP__
 275.endif
273.endfor 276.endfor