Module Name: src
Committed By: he
Date: Fri Aug 21 15:16:46 UTC 2009
Modified Files:
src/rescue: Makefile
Added Files:
src/rescue: list.ldd.noaout
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/rescue/Makefile
cvs rdiff -u -r0 -r1.1 src/rescue/list.ldd.noaout
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.22 src/rescue/Makefile:1.23
--- src/rescue/Makefile:1.22 Wed Jan 7 00:39:23 2009
+++ src/rescue/Makefile Fri Aug 21 15:16:45 2009
@@ -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 @@
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
Added files:
Index: src/rescue/list.ldd.noaout
diff -u /dev/null src/rescue/list.ldd.noaout:1.1
--- /dev/null Fri Aug 21 15:16:46 2009
+++ src/rescue/list.ldd.noaout Fri Aug 21 15:16:46 2009
@@ -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
