[src/trunk]: src/libexec/ld.elf_so Consistently use LDELFSO_MACHINE_ARCH.

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

details:   https://anonhg.NetBSD.org/src/rev/83afeec878a3
branches:  trunk
changeset: 786605:83afeec878a3
user:      matt <matt%NetBSD.org@localhost>
date:      Fri May 03 15:52:31 2013 +0000

description:
Consistently use LDELFSO_MACHINE_ARCH.

diffstat:

 libexec/ld.elf_so/Makefile              |  26 ++++++++++++++------------
 libexec/ld.elf_so/arch/arm/Makefile.inc |   4 +---
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (72 lines):

diff -r f2826e2c4ee0 -r 83afeec878a3 libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Fri May 03 15:46:53 2013 +0000
+++ b/libexec/ld.elf_so/Makefile        Fri May 03 15:52:31 2013 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.116 2013/04/24 22:37:20 matt Exp $
+#      $NetBSD: Makefile,v 1.117 2013/05/03 15:52:31 matt Exp $
 #
 # NOTE: when changing ld.so, ensure that ldd still compiles.
 #
 
 WARNS?=4
 
+LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH}
+
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
@@ -24,18 +26,18 @@
 .endif
 M=             ${.CURDIR}/arch/${ARCHSUBDIR}
 
-.if ((${MACHINE_ARCH} == "alpha") ||                                   \
+.if ((${LDELFSO_MACHINE_ARCH} == "alpha") ||                           \
      (${MACHINE_CPU} == "arm") ||                                      \
-     (${MACHINE_ARCH} == "hppa") ||                                    \
-     (${MACHINE_ARCH} == "i386") ||                                    \
-     (${MACHINE_ARCH} == "m68k") ||                                    \
+     (${LDELFSO_MACHINE_ARCH} == "hppa") ||                            \
+     (${LDELFSO_MACHINE_ARCH} == "i386") ||                            \
+     (${LDELFSO_MACHINE_ARCH} == "m68k") ||                            \
      (${MACHINE_CPU} == "mips") ||                                     \
-     (${MACHINE_ARCH} == "powerpc") ||                                 \
+     (${LDELFSO_MACHINE_ARCH} == "powerpc") ||                         \
      (${MACHINE_CPU} == "sh3") ||                                      \
-     (${MACHINE_ARCH} == "sparc") ||                                   \
-     (${MACHINE_ARCH} == "sparc64") ||                                 \
-     (${MACHINE_ARCH} == "x86_64") ||                                  \
-     (${MACHINE_ARCH} == "vax")) &&                                    \
+     (${LDELFSO_MACHINE_ARCH} == "sparc") ||                           \
+     (${LDELFSO_MACHINE_ARCH} == "sparc64") ||                         \
+     (${LDELFSO_MACHINE_ARCH} == "x86_64") ||                          \
+     (${LDELFSO_MACHINE_ARCH} == "vax")) &&                            \
     ${MKPIC} != "no"
 
 LDFLAGS+=      ${${ACTIVE_CC} == "clang":? -Wl,-Bsymbolic : -symbolic} \
@@ -91,13 +93,13 @@
 #CPPFLAGS+=    -DDEBUG
 #CPPFLAGS+=    -DRTLD_DEBUG
 #CPPFLAGS+=    -DRTLD_DEBUG_RELOC
-.if !empty(MACHINE_ARCH:Mearm*)
+.if !empty(LDELFSO_MACHINE_ARCH:Mearm*)
 CPPFLAGS+=     -I${NETBSDSRCDIR}/lib/libexecinfo
 .endif
 #DBG=          -g
 COPTS=         -O3 -fomit-frame-pointer
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${LDELFSO_MACHINE_ARCH} == "i386" || ${LDELFSO_MACHINE_ARCH} == "x86_64"
 COPTS+=                -mno-3dnow -mno-mmx -mno-sse -mno-sse2 -mno-sse3
 .endif
 
diff -r f2826e2c4ee0 -r 83afeec878a3 libexec/ld.elf_so/arch/arm/Makefile.inc
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc   Fri May 03 15:46:53 2013 +0000
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc   Fri May 03 15:52:31 2013 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.18 2013/05/03 09:37:17 skrll Exp $
-
-LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH}
+#      $NetBSD: Makefile.inc,v 1.19 2013/05/03 15:52:31 matt Exp $
 
 SRCS+=         rtld_start.S mdreloc.c