summaryrefslogtreecommitdiff
path: root/lib/libm
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2014-08-11 08:20:57 +0000
committermrg <mrg@NetBSD.org>2014-08-11 08:20:57 +0000
commit0bc2fd0078fc834fece05d20456f7ed37d8fceb8 (patch)
treef9200b999f6665ded80d12a58b0c3d037d4d75ab /lib/libm
parent9d498262e8ab8459621dac5ddbfa6e3fabaf79d9 (diff)
revert parts of 1.163 that affect the x86 build.
possibly, we want to build the i386 fenv.c for compat build, but they seem largely compatible and for now, just go back to what we had before that wasn't breaking the build or generating bug reports.
Diffstat (limited to 'lib/libm')
-rw-r--r--lib/libm/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index 3bbaa417c2d..8b9458b1bad 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2014/08/10 23:25:50 matt Exp $
+# $NetBSD: Makefile,v 1.164 2014/08/11 08:20:57 mrg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -92,9 +92,10 @@ COPTS.e_sqrtl.c += -DHAVE_FENV_H
COMMON_SRCS+= s_nexttoward.c
.endif
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-.elif ((${LIBC_MACHINE_ARCH} == "i386") || (${LIBC_MACHINE_ARCH} == "x86_64"))
+.elif ((${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64"))
-.if (${LIBC_MACHINE_ARCH} == "x86_64")
+# XXX consider making this LIBC_MACHINE_ARCH?
+.if (${MACHINE_ARCH} == "x86_64")
.PATH: ${.CURDIR}/arch/x86_64
.endif
.PATH: ${.CURDIR}/arch/i387
@@ -116,7 +117,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
# do not pick up the i387 asm version, it is incorrect
s_modf.o s_modf.pico s_modf.po s_modf.d: s_modf.c
-.if (${LIBC_MACHINE_ARCH} == "i386")
+.if (${MACHINE_ARCH} == "i386")
SUBDIR=arch/i387
.endif
.elif (${LIBC_MACHINE_ARCH} == "m68k")