summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/ld/ldd/ldd.16
-rw-r--r--gnu/usr.bin/ld/rtld/Makefile5
-rw-r--r--gnu/usr.bin/ld/rtld/ld.so.1 (renamed from gnu/usr.bin/ld/rtld/rtld.1)8
3 files changed, 9 insertions, 10 deletions
diff --git a/gnu/usr.bin/ld/ldd/ldd.1 b/gnu/usr.bin/ld/ldd/ldd.1
index 6d7ed604fda..24e4b4a349c 100644
--- a/gnu/usr.bin/ld/ldd/ldd.1
+++ b/gnu/usr.bin/ld/ldd/ldd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldd.1,v 1.5 1998/04/28 07:37:20 deraadt Exp $
+.\" $OpenBSD: ldd.1,v 1.6 2000/05/25 21:49:02 deraadt Exp $
.\" $NetBSD: ldd.1,v 1.2 1995/10/08 23:39:58 pk Exp $
.\"
.\" Copyright (c) 1993 Paul Kranenburg
@@ -51,11 +51,11 @@ depend on yet other shared objects.
Zero, one or two
.Fl f
options may be given. The argument is a format string passed to
-.Xr rtld 1
+.Xr ld.so 1
and allows customization of
.Nm ldd Ns 's
output. See
-.Xr rtld 1
+.Xr ld.so 1
for a list of recognised conversion characters.
.Sh SEE ALSO
.Xr ld 1 ,
diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 05d36b0963c..0dfee53a396 100644
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 1998/03/26 19:47:20 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 2000/05/25 21:49:02 deraadt Exp $
# $NetBSD: Makefile,v 1.11 1995/10/09 00:11:24 pk Exp $
PROG= ld.so
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
#NOMAN= noman
-MAN= rtld.1
+MAN= ld.so.1
LDDIR?= $(.CURDIR)/..
#PICFLAG=-pic
# As there is relocation going on behind GCC's back, don't cache function addresses.
@@ -14,7 +14,6 @@ LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
ASFLAGS+=-k
LDADD+= -lc_pic
BINDIR= /usr/libexec
-MLINKS= rtld.1 ld.so.1
.PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) ${.CURDIR}/../../../../lib/libc/stdio
diff --git a/gnu/usr.bin/ld/rtld/rtld.1 b/gnu/usr.bin/ld/rtld/ld.so.1
index f83bf8a2de5..72e2de980fc 100644
--- a/gnu/usr.bin/ld/rtld/rtld.1
+++ b/gnu/usr.bin/ld/rtld/ld.so.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rtld.1,v 1.12 1999/09/06 23:37:22 aaron Exp $
+.\" $OpenBSD: ld.so.1,v 1.1 2000/05/25 21:49:02 deraadt Exp $
.\" $NetBSD: rtld.1,v 1.2 1995/10/08 23:43:28 pk Exp $
.\"
.\" Copyright (c) 1995 Paul Kranenburg
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd June 27, 1995
-.Dt RTLD 1
+.Dt ld.so 1
.Os
.Sh NAME
.Nm ld.so
@@ -111,7 +111,7 @@ for details
.Pc \&.
.Em crt0
passes control to
-.Nm rtld Ns 's
+.Nm ld.so Ns 's
entry point before the program's
.Fn main
routine is called. Thus,
@@ -184,7 +184,7 @@ The library's major version number.
The library's minor version number.
.It \&%p
The full pathname as determined by
-.Nm rtld Ns 's
+.Nm ld.so Ns 's
library search rules.
.It \&%x
The library's load address.