[src/trunk]: src/lib/libm revert parts of 1.163 that affect the x86 build.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f0034a995cba
branches:  trunk
changeset: 798222:f0034a995cba
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 11 08:20:57 2014 +0000

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

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

diffs (31 lines):

diff -r f595bf2583fd -r f0034a995cba lib/libm/Makefile
--- a/lib/libm/Makefile Mon Aug 11 06:02:38 2014 +0000
+++ b/lib/libm/Makefile Mon Aug 11 08:20:57 2014 +0000
@@ -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 @@
 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 @@
 # 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")