Module Name: src
Committed By: mrg
Date: Sat Aug 22 06:52:16 UTC 2009
Modified Files:
src/rescue: Makefile list.ldd
src/usr.bin/ldd: Makefile ldd.1 ldd.c ldd.h
Removed Files:
src/rescue: list.ldd.noaout
src/usr.bin/ldd: ldd_aout.c
src/usr.bin/ldd/aout: Makefile
Log Message:
kill ldd_aout. it didn't work anyway...not since i don't know when.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/rescue/Makefile
cvs rdiff -u -r1.1 -r1.2 src/rescue/list.ldd
cvs rdiff -u -r1.1 -r0 src/rescue/list.ldd.noaout
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/ldd/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/ldd/ldd.1
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/ldd/ldd.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/ldd/ldd.h
cvs rdiff -u -r1.4 -r0 src/usr.bin/ldd/ldd_aout.c
cvs rdiff -u -r1.1 -r0 src/usr.bin/ldd/aout/Makefile
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.23 src/rescue/Makefile:1.24
--- src/rescue/Makefile:1.23 Fri Aug 21 15:16:45 2009
+++ src/rescue/Makefile Sat Aug 22 06:52:15 2009
@@ -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 @@
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}
Index: src/rescue/list.ldd
diff -u src/rescue/list.ldd:1.1 src/rescue/list.ldd:1.2
--- src/rescue/list.ldd:1.1 Wed Jan 7 00:39:24 2009
+++ src/rescue/list.ldd Sat Aug 22 06:52:15 2009
@@ -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
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.12 src/usr.bin/ldd/Makefile:1.13
--- src/usr.bin/ldd/Makefile:1.12 Thu Aug 20 21:07:47 2009
+++ src/usr.bin/ldd/Makefile Sat Aug 22 06:52:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/08/20 21:07:47 he Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/22 06:52:16 mrg Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -9,12 +9,6 @@
MAN= ldd.1
-.if (${MACHINE_CPU} != "mips")
-SUBDIR= aout
-LIB_AOUTDIR!= cd ${.CURDIR}/aout && ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_AOUTDIR}/libldd_aout.a
-.endif
-
SUBDIR+= elf32 elf64
.if (${MACHINE_ARCH} != "alpha")
Index: src/usr.bin/ldd/ldd.1
diff -u src/usr.bin/ldd/ldd.1:1.14 src/usr.bin/ldd/ldd.1:1.15
--- src/usr.bin/ldd/ldd.1:1.14 Wed Apr 30 13:11:01 2008
+++ src/usr.bin/ldd/ldd.1 Sat Aug 22 06:52:16 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: ldd.1,v 1.14 2008/04/30 13:11:01 martin Exp $
+.\" $NetBSD: ldd.1,v 1.15 2009/08/22 06:52:16 mrg Exp $
.\"
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -53,26 +53,10 @@
and allows customization of
.Nm ldd Ns 's
output.
-The first format argument is used for library objects and is equivalent
-to the
-.Xr ld.aout_so 1
-environment variable
-.Ev LD_TRACE_LOADED_OBJECTS_FMT1 .
-It defaults to
-.Qq "\et-l%o.%m =\*[Gt] %p\en"
-for elf and
-.Qq "\et-l%o.%m =\*[Gt] %p (%x)\en"
-for a.out.
-The second format argument is used for non-library objects and it is equivalent
-to the
-.Xr ld.aout_so 1
-environment variable
-.Ev LD_TRACE_LOADED_OBJECTS_FMT2 .
-It defaults to
-.Qq "\et%o =\*[Gt] %p\en"
-for elf and
-.Qq "\et%o (%x)\en"
-for a.out.
+The first format argument is used for library objects and defaults to
+.Qq "\et-l%o.%m =\*[Gt] %p\en" .
+The second format argument is used for non-library objects defaults to
+.Qq "\et%o =\*[Gt] %p\en" .
.Pp
These arguments are interpreted as format strings a la
.Xr printf 3
@@ -111,7 +95,6 @@
are recognized and have their usual meaning.
.Sh SEE ALSO
.Xr ld 1 ,
-.Xr ld.aout_so 1 ,
.Xr ld.elf_so 1 ,
.Xr nm 1 ,
.Xr rtld 1
Index: src/usr.bin/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.8 src/usr.bin/ldd/ldd.c:1.9
--- src/usr.bin/ldd/ldd.c:1.8 Thu Aug 20 21:06:17 2009
+++ src/usr.bin/ldd/ldd.c Sat Aug 22 06:52:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.8 2009/08/20 21:06:17 he Exp $ */
+/* $NetBSD: ldd.c,v 1.9 2009/08/22 06:52:16 mrg Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.8 2009/08/20 21:06:17 he Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.9 2009/08/22 06:52:16 mrg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -156,9 +156,6 @@
#if defined(_LP64) && !defined(__alpha__)
&& elf32_ldd(fd, *argv, fmt1, fmt2) == -1
#endif
-#if !defined(__mips__)
- && aout_ldd(fd, *argv, fmt1, fmt2) == -1
-#endif
)
warnx("%s", error_message);
close(fd);
Index: src/usr.bin/ldd/ldd.h
diff -u src/usr.bin/ldd/ldd.h:1.2 src/usr.bin/ldd/ldd.h:1.3
--- src/usr.bin/ldd/ldd.h:1.2 Tue Feb 3 03:01:02 2009
+++ src/usr.bin/ldd/ldd.h Sat Aug 22 06:52:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.h,v 1.2 2009/02/03 03:01:02 mrg Exp $ */
+/* $NetBSD: ldd.h,v 1.3 2009/08/22 06:52:16 mrg Exp $ */
/*
* Copyright (c) 2008 Matthew R. Green
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-int aout_ldd(int, char *, char *, char *);
int elf32_ldd(int, char *, char *, char *);
#ifdef _LP64
