[src/trunk]: src Changes for MKCOMPAT for earm.

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

details:   https://anonhg.NetBSD.org/src/rev/7cdbf8d7a090
branches:  trunk
changeset: 786347:7cdbf8d7a090
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Apr 27 06:24:22 2013 +0000

description:
Changes for MKCOMPAT for earm.

diffstat:

 lib/libarch/Makefile                    |  4 ++--
 lib/libexecinfo/Makefile                |  5 +++--
 libexec/ld.elf_so/arch/arm/Makefile.inc |  4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r b1cd691eeae8 -r 7cdbf8d7a090 lib/libarch/Makefile
--- a/lib/libarch/Makefile      Sat Apr 27 06:17:53 2013 +0000
+++ b/lib/libarch/Makefile      Sat Apr 27 06:24:22 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2011/07/28 20:30:07 dyoung Exp $
+#      $NetBSD: Makefile,v 1.25 2013/04/27 06:24:22 matt Exp $
 
 # These should always be a MACHINE_CPU value
 ARCHDIRS= alpha arm i386 m68k sparc x86_64
@@ -14,7 +14,7 @@
 
 # Build the library if SRCS is now defined ...
 .if defined(SRCS)
-.if defined(MLIBDIR) && ${MLIBDIR} != "none"
+.if defined(MLIBDIR) && ${MLIBDIR} != "none" && ${MACHINE_CPU} != "arm"
 LIB=   ${MLIBDIR}
 .else
 LIB=   ${MACHINE_CPU}
diff -r b1cd691eeae8 -r 7cdbf8d7a090 lib/libexecinfo/Makefile
--- a/lib/libexecinfo/Makefile  Sat Apr 27 06:17:53 2013 +0000
+++ b/lib/libexecinfo/Makefile  Sat Apr 27 06:24:22 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/04/25 14:48:09 matt Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/27 06:24:23 matt Exp $
 
 .include <bsd.own.mk>
 
+LIBEXECINFO_MACHINE_ARCH?= ${MACHINE_ARCH}
 USE_UNWIND=yes
 WARNS?=4
 INCSDIR=/usr/include
@@ -19,7 +20,7 @@
 
 .if ${USE_UNWIND} == "yes"
 SRCS+=unwind.c
-.if !empty(MACHINE_ARCH:Mearm)
+.if !empty(LIBEXECINFO_MACHINE_ARCH:Mearm)
 SRCS+=unwind_arm_ehabi_stub.c
 .endif
 .else
diff -r b1cd691eeae8 -r 7cdbf8d7a090 libexec/ld.elf_so/arch/arm/Makefile.inc
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc   Sat Apr 27 06:17:53 2013 +0000
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc   Sat Apr 27 06:24:22 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.16 2013/04/24 22:37:20 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.17 2013/04/27 06:25:03 matt Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -6,7 +6,7 @@
 CPPFLAGS+=     -fpic
 
 CPPFLAGS+=     -DELFSIZE=32
-.if !empty(MACHINE_ARCH:Mearm*)
+.if !empty(LDELFSO_MACHINE_ARCH:Mearm*)
 CPPFLAGS+=     -DHAVE_INITFINI_ARRAY
 SRCS+=         find_exidx.c
 .endif