summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-04-09 02:08:28 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-04-09 02:08:28 +0000
commit149decaa8de707e4ca7b88bda67f8a667aad2eb6 (patch)
tree32ea0a0eb62dd5053268f634dc681d1a2089933e /gnu
parentad21f482f358ac6e93b9c34b6e7bbd38ab01dc43 (diff)
the the
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/ld/ld.16
-rw-r--r--gnu/usr.bin/ld/ld.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 8cf68b3222c..ab745b4c125 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: ld.1,v 1.5 1997/04/09 01:32:38 deraadt Exp $
+.\" $Id: ld.1,v 1.6 1997/04/09 02:08:26 deraadt Exp $
.\"
.Dd October 14, 1993
.Dt LD 1
@@ -37,7 +37,7 @@
.Nd link editor
.Sh SYNOPSIS
.Nm ld
-.Op Fl MNnrSstXxz
+.Op Fl MNnprSstXxz
.Bk -words
.Op Fl A Ar symbol-file
.Op Fl assert Ar keyword
@@ -178,6 +178,8 @@ specified libraries.
.It Fl o Ar filename
Specifies the name of the output file. Defaults to
.Dq a.out .
+.It Fl p
+Make the data segment start on a page boundary.
.It Fl Q
Produce a
.Dv QMAGIC
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index 88db530db28..0b282ee4ada 100644
--- a/gnu/usr.bin/ld/ld.c
+++ b/gnu/usr.bin/ld/ld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.c,v 1.6 1997/02/21 07:28:11 tholo Exp $ */
+/* $OpenBSD: ld.c,v 1.7 1997/04/09 02:08:27 deraadt Exp $ */
/*-
* This code is derived from software copyrighted by the Free Software
@@ -2977,7 +2977,7 @@ perform_relocation(data, data_size, reloc, nreloc, entry, dataseg)
case N_DATA:
case N_DATA | N_EXT:
/*
- * A word that points to beginning of the the
+ * A word that points to beginning of the
* data section initially contains not 0 but
* rather the "address" of that section in
* the input file, which is the length of the