Module Name: src
Committed By: matt
Date: Tue Apr 30 01:42:04 UTC 2013
Modified Files:
src/lib/libc: Makefile
src/lib/libc/arch/arm: Makefile.inc
src/lib/libc/arch/arm/gen: Makefile.inc
src/lib/libc/softfloat: Makefile.inc
Log Message:
Match against LIBC_MACHINE_ARCH for MKCOMPAT
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/lib/libc/Makefile
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/arch/arm/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/arch/arm/gen/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/softfloat/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.156 src/lib/libc/Makefile:1.157
--- src/lib/libc/Makefile:1.156 Sat Apr 27 08:00:40 2013
+++ src/lib/libc/Makefile Tue Apr 30 01:42:03 2013
@@ -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}
Index: src/lib/libc/arch/arm/Makefile.inc
diff -u src/lib/libc/arch/arm/Makefile.inc:1.20 src/lib/libc/arch/arm/Makefile.inc:1.21
--- src/lib/libc/arch/arm/Makefile.inc:1.20 Sun Feb 3 01:55:19 2013
+++ src/lib/libc/arch/arm/Makefile.inc Tue Apr 30 01:42:03 2013
@@ -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 @@ SRCS+= __aeabi_read_tp.S __sigaction14_s
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 @@ SRCS+= arm_initfini.c
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
Index: src/lib/libc/arch/arm/gen/Makefile.inc
diff -u src/lib/libc/arch/arm/gen/Makefile.inc:1.21 src/lib/libc/arch/arm/gen/Makefile.inc:1.22
--- src/lib/libc/arch/arm/gen/Makefile.inc:1.21 Sat Jan 26 07:09:41 2013
+++ src/lib/libc/arch/arm/gen/Makefile.inc Tue Apr 30 01:42:04 2013
@@ -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+= isinff_ieee754.c isinfd_ieee754.c
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
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.14 src/lib/libc/softfloat/Makefile.inc:1.15
--- src/lib/libc/softfloat/Makefile.inc:1.14 Tue Apr 16 12:26:28 2013
+++ src/lib/libc/softfloat/Makefile.inc Tue Apr 30 01:42:04 2013
@@ -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= softfloat.c
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
