diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-08-28 14:06:23 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-08-28 14:06:23 +0000 |
commit | 495a47af5643c80ebc6e396e7db686c9e7932e79 (patch) | |
tree | 087b906859a2bb81b46cece1bafa5fc3dacc3e81 /libexec | |
parent | 7bc52819bfa3363b86c7010abae173b784acd0dc (diff) |
whitespace
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/ld.so/library_subr.c | 4 | ||||
-rw-r--r-- | libexec/ld.so/m88k/ldasm.S | 4 | ||||
-rw-r--r-- | libexec/ld.so/sh/ldasm.S | 6 | ||||
-rw-r--r-- | libexec/ld.so/sparc64/rtld_machine.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libexec/ld.so/library_subr.c b/libexec/ld.so/library_subr.c index b51500e70cc..d5771e094c4 100644 --- a/libexec/ld.so/library_subr.c +++ b/libexec/ld.so/library_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library_subr.c,v 1.47 2017/01/24 07:48:36 guenther Exp $ */ +/* $OpenBSD: library_subr.c,v 1.48 2017/08/28 14:06:22 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -380,7 +380,7 @@ again: if (hint != NULL) goto done; } else { - /* + /* * If DT_RUNPATH wasn't set then first check DT_RPATH, * followed by the main program's DT_RPATH. */ diff --git a/libexec/ld.so/m88k/ldasm.S b/libexec/ld.so/m88k/ldasm.S index 69073df6f35..42f7a550007 100644 --- a/libexec/ld.so/m88k/ldasm.S +++ b/libexec/ld.so/m88k/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.25 2017/08/27 21:59:52 deraadt Exp $ */ +/* $OpenBSD: ldasm.S,v 1.26 2017/08/28 14:06:22 deraadt Exp $ */ /* * Copyright (c) 2013 Miodrag Vallat. @@ -145,7 +145,7 @@ ENTRY(_dl_bind_start) ld.d %r4, %r31, 4 * 2 ld.d %r2, %r31, 4 * 0 ld %r1, %r31, REG_SIZE + R1_OFFSET - + jmp.n %r11 addu %r31, %r31, REG_SIZE + PLT_FRAME_SIZE END(_dl_bind_start) diff --git a/libexec/ld.so/sh/ldasm.S b/libexec/ld.so/sh/ldasm.S index 1900fbda227..40a89f1e69a 100644 --- a/libexec/ld.so/sh/ldasm.S +++ b/libexec/ld.so/sh/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.29 2017/08/27 21:59:52 deraadt Exp $ */ +/* $OpenBSD: ldasm.S,v 1.30 2017/08/28 14:06:22 deraadt Exp $ */ /* * Copyright (c) 2006 Dale Rahn @@ -31,7 +31,7 @@ #include <sys/syscall.h> ENTRY(_dl_start) - mov r15, r12 // save for later + mov r15, r12 // save for later mov r15, r4 // sp add #-(4+4+DL_DATA_SIZE), r15 mov r15, r5 // dl_data @@ -51,7 +51,7 @@ ENTRY(_dl_start) mov.l @r12, r5 add #2, r5 shll2 r5 - add r12, r5 // envp + add r12, r5 // envp mov r15, r7 // dl_data mov r7, r6 add #(7*4), r6 diff --git a/libexec/ld.so/sparc64/rtld_machine.c b/libexec/ld.so/sparc64/rtld_machine.c index dd22ec0fa28..88ffdb43160 100644 --- a/libexec/ld.so/sparc64/rtld_machine.c +++ b/libexec/ld.so/sparc64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.59 2017/01/24 07:48:37 guenther Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.60 2017/08/28 14:06:22 deraadt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -421,7 +421,7 @@ _dl_reloc_plt(Elf_Word *where1, Elf_Word *where2, Elf_Word *pltaddr, * be used by other threads even while it's being updated. * This is made slightly more complicated by kbind, for which * we need to pass them to the kernel in the order they get - * written. To that end, we store the word to overwrite the + * written. To that end, we store the word to overwrite the * ba,a,pt at *where1, and the words to overwrite the nops at * where2[0], where2[1], ... * @@ -512,7 +512,7 @@ _dl_reloc_plt(Elf_Word *where1, Elf_Word *where2, Elf_Word *pltaddr, return (2); } else if (value < (1L<<42)) { /* - * Target 42bits or smaller. + * Target 42bits or smaller. * We can generate this pattern: * * The resulting code in the jump slot is: |