[src/trunk]: src/libexec/ld.elf_so simplify the logic for compat ld.elf_so an...

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

details:   https://anonhg.NetBSD.org/src/rev/a8d7bf880cf9
branches:  trunk
changeset: 749946:a8d7bf880cf9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Dec 13 09:31:47 2009 +0000

description:
simplify the logic for compat ld.elf_so and move it here.  we now can
find the libc objdir for multiple compat ld.elf_so's, too.

diffstat:

 libexec/ld.elf_so/Makefile                 |  13 +++++++------
 libexec/ld.elf_so/arch/i386/Makefile.inc   |   6 +-----
 libexec/ld.elf_so/arch/i386/Makefile.ld32  |   3 ---
 libexec/ld.elf_so/arch/sparc/Makefile.inc  |   6 +-----
 libexec/ld.elf_so/arch/sparc/Makefile.ld32 |   3 ---
 5 files changed, 9 insertions(+), 22 deletions(-)

diffs (85 lines):

diff -r 693bd44876bb -r a8d7bf880cf9 libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Sun Dec 13 09:29:27 2009 +0000
+++ b/libexec/ld.elf_so/Makefile        Sun Dec 13 09:31:47 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.92 2009/12/13 09:01:45 mrg Exp $
+#      $NetBSD: Makefile,v 1.93 2009/12/13 09:31:47 mrg Exp $
 #
 # NOTE: when changing ld.so, ensure that ldd still compiles.
 #
@@ -38,8 +38,6 @@
      (${MACHINE_ARCH} == "vax")) &&                                    \
     ${OBJECT_FMT} == "ELF" && ${MKPIC} != "no"
 
-PROG?=         ld.elf_so
-
 LDFLAGS+=      -shared -symbolic -nostartfiles
 LDFLAGS+=      -Wl,-static
 
@@ -49,12 +47,15 @@
 .include "$M/Makefile.inc"
 .endif
 
-# Support src/compat/libexec/ld.elf_so.
+# Support compat ld.elf_so.
 .if defined(MLIBDIR)
-CLIBOBJ!=      cd ${NETBSDSRCDIR}/compat/lib/libc && ${PRINTOBJDIR}
+PROG=          ld.elf_so-${MLIBDIR}
+CPPFLAGS+=     -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
 .else
+PROG=          ld.elf_so
+.endif
+
 CLIBOBJ!=      cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
-.endif
 
 SRCS+=         rtld.c reloc.c symbol.c xmalloc.c xprintf.c debug.c \
                map_object.c load.c search.c headers.c paths.c expand.c
diff -r 693bd44876bb -r a8d7bf880cf9 libexec/ld.elf_so/arch/i386/Makefile.inc
--- a/libexec/ld.elf_so/arch/i386/Makefile.inc  Sun Dec 13 09:29:27 2009 +0000
+++ b/libexec/ld.elf_so/arch/i386/Makefile.inc  Sun Dec 13 09:31:47 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.13 2009/12/13 08:25:20 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.14 2009/12/13 09:31:47 mrg Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -8,7 +8,3 @@
 CPPFLAGS+=     -DELFSIZE=32
 
 LDFLAGS+=      -Wl,-e,.rtld_start
-
-.if defined(MLIBDIR)
-.include "Makefile.ld32"
-.endif
diff -r 693bd44876bb -r a8d7bf880cf9 libexec/ld.elf_so/arch/i386/Makefile.ld32
--- a/libexec/ld.elf_so/arch/i386/Makefile.ld32 Sun Dec 13 09:29:27 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: Makefile.ld32,v 1.1 2009/01/06 02:15:06 mrg Exp $
-
-CPPFLAGS+=     -DRTLD_ARCH_SUBDIR=\"i386\"
diff -r 693bd44876bb -r a8d7bf880cf9 libexec/ld.elf_so/arch/sparc/Makefile.inc
--- a/libexec/ld.elf_so/arch/sparc/Makefile.inc Sun Dec 13 09:29:27 2009 +0000
+++ b/libexec/ld.elf_so/arch/sparc/Makefile.inc Sun Dec 13 09:31:47 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.13 2009/12/13 08:25:20 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.14 2009/12/13 09:31:47 mrg Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -8,7 +8,3 @@
 CPPFLAGS+=     -DELFSIZE=32
 
 LDFLAGS+=      -Wl,-e,_rtld_start
-
-.if defined(MLIBDIR)
-.include "Makefile.ld32"
-.endif
diff -r 693bd44876bb -r a8d7bf880cf9 libexec/ld.elf_so/arch/sparc/Makefile.ld32
--- a/libexec/ld.elf_so/arch/sparc/Makefile.ld32        Sun Dec 13 09:29:27 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: Makefile.ld32,v 1.1 2009/01/06 02:15:06 mrg Exp $
-
-CPPFLAGS+=     -DRTLD_ARCH_SUBDIR=\"sparc\"