Module Name: src
Committed By: mrg
Date: Mon Aug 11 08:20:57 UTC 2014
Modified Files:
src/lib/libm: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 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.163 src/lib/libm/Makefile:1.164
--- src/lib/libm/Makefile:1.163 Sun Aug 10 23:25:50 2014
+++ src/lib/libm/Makefile Mon Aug 11 08:20:57 2014
@@ -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
# 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")
