summaryrefslogtreecommitdiff
path: root/rescue
diff options
context:
space:
mode:
authorhe <he@NetBSD.org>2009-08-21 15:16:45 +0000
committerhe <he@NetBSD.org>2009-08-21 15:16:45 +0000
commit6ef3b52d49df7c01870de49a255261f2e0810e41 (patch)
treedf9617ae44a352dcb03c0b767e93fcbfe3c25c07 /rescue
parentbc2b50ede9539368cd25926876c2ddd820d2bbad (diff)
Add a new list.ldd.noaout, which is a copy of list.ldd but without
the a.out support. Tweak Makefile so that the a.out support is not built for mips.
Diffstat (limited to 'rescue')
-rw-r--r--rescue/Makefile9
-rw-r--r--rescue/list.ldd.noaout12
2 files changed, 19 insertions, 2 deletions
diff --git a/rescue/Makefile b/rescue/Makefile
index ffdbbd06080..bade6cc842f 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/01/07 00:39:23 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2009/08/21 15:16:45 he Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -35,11 +35,16 @@ LISTS+= ${.CURDIR}/list.crypto
CRUNCHENV+= MKKERBEROS=no # for ssh
.endif
+.if ${MACHINE_CPU} != "mips"
LISTS+= ${.CURDIR}/list.ldd
LDD_AOUTDIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/aout && ${PRINTOBJDIR}
+PARSELISTENV+= LDD_AOUTDIR=${LDD_AOUTDIR}
+.else
+LISTS+= ${.CURDIR}/list.ldd.noaout
+.endif
LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf32 && ${PRINTOBJDIR}
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 && ${PRINTOBJDIR}
-PARSELISTENV+= LDD_AOUTDIR=${LDD_AOUTDIR} LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
+PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
# Specially built objects to override the behaviour of
# various library functions
diff --git a/rescue/list.ldd.noaout b/rescue/list.ldd.noaout
new file mode 100644
index 00000000000..6c218d5df96
--- /dev/null
+++ b/rescue/list.ldd.noaout
@@ -0,0 +1,12 @@
+# $NetBSD: list.ldd.noaout,v 1.1 2009/08/21 15:16:46 he Exp $
+
+PROG ldd
+
+LIBS ${LDD_ELF32DIR}/libldd_elf32.a
+LIBS ${LDD_ELF64DIR}/libldd_elf64.a
+
+SPECIAL ldd keepsymbols _rtld_pagesz _rtld_error _rtld_trust
+SPECIAL ldd keepsymbols _rtld_default_paths _rtld_paths
+SPECIAL ldd keepsymbols _rtld_xforms _rtld_objmain
+SPECIAL ldd keepsymbols _rtld_objtail _rtld_objlist
+SPECIAL ldd keepsymbols print_needed main_local main_progname