Module Name: src
Committed By: matt
Date: Wed May 1 04:04:31 UTC 2013
Modified Files:
src/lib/libm: Makefile
Log Message:
Use MKSOFTFLOAT = no for including arm hardfloat files.
When arm and MKSOFTFLOAT = yes, make explicit dependency to .c files
so .S won't be used.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.136 src/lib/libm/Makefile:1.137
--- src/lib/libm/Makefile:1.136 Sun Apr 28 14:46:14 2013
+++ src/lib/libm/Makefile Wed May 1 04:04:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2013/04/28 14:46:14 joerg Exp $
+# $NetBSD: Makefile,v 1.137 2013/05/01 04:04:31 matt Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -50,9 +50,16 @@ USE_SHLIBDIR= yes
.if (${MACHINE_ARCH} == "alpha")
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
-.elif (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
+.elif (${MACHINE_CPU} == "arm")
.PATH: ${.CURDIR}/arch/arm
+COMMON_SRCS+= fenv.c
+.if (${MKSOFTFLOAT} == "no")
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
+.else
+.for i in e_sqrt.o e_sqrtf.o lrint.o lrintf.o s_fabsf.o s_fma.o s_fmaf.o
+${i} ${i:.o=.po} ${i:.o=.pico} ${i.o=.ln}: ${i:.o=.c}
+.endfor
+.endif
.elif (${MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
