summaryrefslogtreecommitdiff
path: root/rescue
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2009-08-22 06:52:15 +0000
committermrg <mrg@NetBSD.org>2009-08-22 06:52:15 +0000
commita9208fb155d7b9c5f9d364086dcf22c276b9e4cc (patch)
tree3865667c67fcdda6e11af76a76e8d1d1a1643ebe /rescue
parent7488d6c7befd40f4112a62e04b6e2656547b076d (diff)
kill ldd_aout. it didn't work anyway...not since i don't know when.
Diffstat (limited to 'rescue')
-rw-r--r--rescue/Makefile8
-rw-r--r--rescue/list.ldd3
-rw-r--r--rescue/list.ldd.noaout12
3 files changed, 2 insertions, 21 deletions
diff --git a/rescue/Makefile b/rescue/Makefile
index bade6cc842f..07ad8ed6887 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/08/21 15:16:45 he Exp $
+# $NetBSD: Makefile,v 1.24 2009/08/22 06:52:15 mrg Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -35,13 +35,7 @@ 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_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
diff --git a/rescue/list.ldd b/rescue/list.ldd
index d8edcfd5d01..dd576287a86 100644
--- a/rescue/list.ldd
+++ b/rescue/list.ldd
@@ -1,8 +1,7 @@
-# $NetBSD: list.ldd,v 1.1 2009/01/07 00:39:24 mrg Exp $
+# $NetBSD: list.ldd,v 1.2 2009/08/22 06:52:15 mrg Exp $
PROG ldd
-LIBS ${LDD_AOUTDIR}/libldd_aout.a
LIBS ${LDD_ELF32DIR}/libldd_elf32.a
LIBS ${LDD_ELF64DIR}/libldd_elf64.a
diff --git a/rescue/list.ldd.noaout b/rescue/list.ldd.noaout
deleted file mode 100644
index 6c218d5df96..00000000000
--- a/rescue/list.ldd.noaout
+++ /dev/null
@@ -1,12 +0,0 @@
-# $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