Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libm Use MKSOFTFLOAT = no for including arm hardfloat fi...



details:   https://anonhg.NetBSD.org/src/rev/3940222da022
branches:  trunk
changeset: 786537:3940222da022
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 01 04:04:31 2013 +0000

description:
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.

diffstat:

 lib/libm/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r f52eea8d6fcf -r 3940222da022 lib/libm/Makefile
--- a/lib/libm/Makefile Wed May 01 04:02:54 2013 +0000
+++ b/lib/libm/Makefile Wed May 01 04:04:31 2013 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index