[src/trunk]: src/lib/libc Match against LIBC_MACHINE_ARCH for MKCOMPAT

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

details:   https://anonhg.NetBSD.org/src/rev/f7ee7a10b083
branches:  trunk
changeset: 786505:f7ee7a10b083
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Apr 30 01:42:03 2013 +0000

description:
Match against LIBC_MACHINE_ARCH for MKCOMPAT

diffstat:

 lib/libc/Makefile                  |  4 +++-
 lib/libc/arch/arm/Makefile.inc     |  6 +++---
 lib/libc/arch/arm/gen/Makefile.inc |  4 ++--
 lib/libc/softfloat/Makefile.inc    |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 28566a992c66 -r f7ee7a10b083 lib/libc/Makefile
--- a/lib/libc/Makefile Tue Apr 30 01:41:01 2013 +0000
+++ b/lib/libc/Makefile Tue Apr 30 01:42:03 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.156 2013/04/27 08:00:40 matt Exp $
+#      $NetBSD: Makefile,v 1.157 2013/04/30 01:42:03 matt Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -19,6 +19,8 @@
 
 .include "Makefile.inc"
 
+LIBC_MACHINE_ARCH?=    ${MACHINE_ARCH}         # for MKCOMPAT
+
 LIB=           c
 CPPFLAGS+=     -I${.CURDIR}/include -I${.CURDIR}
 
diff -r 28566a992c66 -r f7ee7a10b083 lib/libc/arch/arm/Makefile.inc
--- a/lib/libc/arch/arm/Makefile.inc    Tue Apr 30 01:41:01 2013 +0000
+++ b/lib/libc/arch/arm/Makefile.inc    Tue Apr 30 01:42:03 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2013/02/03 01:55:19 matt Exp $
+# $NetBSD: Makefile.inc,v 1.21 2013/04/30 01:42:03 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 
 CPPFLAGS += -I.
 
-.if ${MACHINE_ARCH:Mearm*} != ""
+.if !empty(LIBC_MACHINE_ARCH:Mearm*)
 SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S
 SRCS+= __aeabi_lcmp.c __aeabi_ulcmp.c
 SRCS+= fixunsgen_ieee754.c fixunssfsi_ieee754.c
@@ -18,7 +18,7 @@
 CPPFLAGS += -DSOFTFLOAT
 
 # for earm, use the 64-bit softfloat
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb"
+.if ${LIBC_MACHINE_ARCH} == "arm" || ${LIBC_MACHINE_ARCH} == "armeb"
 SOFTFLOAT_BITS=32
 .endif
 
diff -r 28566a992c66 -r f7ee7a10b083 lib/libc/arch/arm/gen/Makefile.inc
--- a/lib/libc/arch/arm/gen/Makefile.inc        Tue Apr 30 01:41:01 2013 +0000
+++ b/lib/libc/arch/arm/gen/Makefile.inc        Tue Apr 30 01:42:03 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2013/01/26 07:09:41 matt Exp $
+# $NetBSD: Makefile.inc,v 1.22 2013/04/30 01:42:04 matt Exp $
 
 SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divsi3.S \
        fabs.c flt_rounds.c modsi3.S umodsi3.S divide.S divsi3.S udivsi3.S
@@ -11,7 +11,7 @@
 SRCS+= isnanf_ieee754.c isnand_ieee754.c
 SRCS+= signbitf_ieee754.c signbitd_ieee754.c
 
-.if ${MACHINE_ARCH:Mearm*} != ""
+.if !empty(LIBC_MACHINE_ARCH:Mearm*)
 SRCS+= __aeabi_fcmpun.c __aeabi_dcmpun.c
 SRCS+= __aeabi_idiv0.c __aeabi_ldiv0.c
 .endif
diff -r 28566a992c66 -r f7ee7a10b083 lib/libc/softfloat/Makefile.inc
--- a/lib/libc/softfloat/Makefile.inc   Tue Apr 30 01:41:01 2013 +0000
+++ b/lib/libc/softfloat/Makefile.inc   Tue Apr 30 01:42:03 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2013/04/16 12:26:28 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2013/04/30 01:42:04 matt Exp $
 
 SOFTFLOAT_BITS?=64
 .PATH:         ${ARCHDIR}/softfloat \
@@ -12,7 +12,7 @@
 SRCS.softfloat+=fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \
                fpgetsticky.c fpsetsticky.c
 
-.if ${MACHINE_ARCH:Mearm*} != ""
+.if !empty(LIBC_MACHINE_ARCH:Mearm*)
 SRCS.softfloat+=__aeabi_dcmpeq.c __aeabi_fcmpeq.c
 SRCS.softfloat+=__aeabi_dcmpge.c __aeabi_fcmpge.c
 SRCS.softfloat+=__aeabi_dcmpgt.c __aeabi_fcmpgt.c