Tue Apr 16 12:26:29 2013 UTC ()
Use MACHINE_ARCH, not MACHINE


(matt)
diff -r1.13 -r1.14 src/lib/libc/softfloat/Makefile.inc
cvs diff -r1.13 -r1.14 src/lib/libc/softfloat/Makefile.inc (expand / switch to unified diff)

--- src/lib/libc/softfloat/Makefile.inc 2013/04/16 10:54:53 1.13
+++ src/lib/libc/softfloat/Makefile.inc 2013/04/16 12:26:28 1.14
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile.inc,v 1.13 2013/04/16 10:54:53 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.14 2013/04/16 12:26:28 matt Exp $
2 2
3SOFTFLOAT_BITS?=64 3SOFTFLOAT_BITS?=64
4.PATH: ${ARCHDIR}/softfloat \ 4.PATH: ${ARCHDIR}/softfloat \
5 ${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat 5 ${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
6 6
7CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat 7CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat
8CPPFLAGS+= -DSOFTFLOAT_FOR_GCC 8CPPFLAGS+= -DSOFTFLOAT_FOR_GCC
9 9
10SRCS.softfloat= softfloat.c 10SRCS.softfloat= softfloat.c
11 11
12SRCS.softfloat+=fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \ 12SRCS.softfloat+=fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \
13 fpgetsticky.c fpsetsticky.c 13 fpgetsticky.c fpsetsticky.c
14 14
15.if ${MACHINE:Mearm*} != "" 15.if ${MACHINE_ARCH:Mearm*} != ""
16SRCS.softfloat+=__aeabi_dcmpeq.c __aeabi_fcmpeq.c 16SRCS.softfloat+=__aeabi_dcmpeq.c __aeabi_fcmpeq.c
17SRCS.softfloat+=__aeabi_dcmpge.c __aeabi_fcmpge.c 17SRCS.softfloat+=__aeabi_dcmpge.c __aeabi_fcmpge.c
18SRCS.softfloat+=__aeabi_dcmpgt.c __aeabi_fcmpgt.c 18SRCS.softfloat+=__aeabi_dcmpgt.c __aeabi_fcmpgt.c
19SRCS.softfloat+=__aeabi_dcmple.c __aeabi_fcmple.c 19SRCS.softfloat+=__aeabi_dcmple.c __aeabi_fcmple.c
20SRCS.softfloat+=__aeabi_dcmplt.c __aeabi_fcmplt.c 20SRCS.softfloat+=__aeabi_dcmplt.c __aeabi_fcmplt.c
21SRCS.softfloat+=__aeabi_dcmpun.c __aeabi_fcmpun.c 21SRCS.softfloat+=__aeabi_dcmpun.c __aeabi_fcmpun.c
22.else 22.else
23SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \ 23SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
24 eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \ 24 eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \
25 eqtf2.c netf2.c gttf2.c getf2.c lttf2.c letf2.c negtf2.c \ 25 eqtf2.c netf2.c gttf2.c getf2.c lttf2.c letf2.c negtf2.c \
26 nexf2.c gtxf2.c gexf2.c negxf2.c unordsf2.c unorddf2.c 26 nexf2.c gtxf2.c gexf2.c negxf2.c unordsf2.c unorddf2.c
27.endif 27.endif
28 28