summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libexec/ld.so/amd64/ldasm.S38
-rw-r--r--libexec/ld.so/amd64/rtld_machine.c8
-rw-r--r--libexec/ld.so/amd64/syscall.h4
-rw-r--r--libexec/ld.so/x86_64/ldasm.S38
-rw-r--r--libexec/ld.so/x86_64/rtld_machine.c8
-rw-r--r--libexec/ld.so/x86_64/syscall.h4
6 files changed, 50 insertions, 50 deletions
diff --git a/libexec/ld.so/amd64/ldasm.S b/libexec/ld.so/amd64/ldasm.S
index 515529439a2..15128e99706 100644
--- a/libexec/ld.so/amd64/ldasm.S
+++ b/libexec/ld.so/amd64/ldasm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldasm.S,v 1.2 2004/02/10 16:59:08 drahn Exp $ */
+/* $OpenBSD: ldasm.S,v 1.3 2004/02/23 20:52:04 deraadt Exp $ */
/*
* Copyright (c) 2002,2004 Dale Rahn
@@ -34,9 +34,9 @@
#include <machine/asm.h>
.text
- .align 4
- .globl _dl_start
- .type _dl_start,@function
+ .align 4
+ .globl _dl_start
+ .type _dl_start,@function
_dl_start:
movq %rsp, %r12 # save stack pointer for _rtld
pushq %rbx # save ps_strings
@@ -50,8 +50,8 @@ _dl_start:
movq %rsi, %rcx # dl_data
movq DL_LOFF_OFFSET(%rsi), %rdx # loff from dl_data
- movq (%r12), %rdi
- leaq 16(%r12,%rdi,8), %rsi # envp
+ movq (%r12), %rdi
+ leaq 16(%r12,%rdi,8), %rsi # envp
movq %r12, %rdi
addq $8,%rdi # argv
call _dl_boot@PLT # _dl_boot(argv,envp,loff,dl_data)
@@ -105,7 +105,7 @@ DL_SYSCALL2(sysctl,__sysctl)
.global _dl_sigprocmask
.type _dl_sigprocmask,@function
_dl_sigprocmask:
- movq (%rsi),%rsi # fetch indirect ...
+ movq (%rsi),%rsi # fetch indirect...
movl $SYS_sigprocmask, %eax
movq %rcx, %r10
syscall
@@ -121,20 +121,20 @@ _dl_sigprocmask:
.type _dl_bind_start,@function
_dl_bind_start:
pushfq # save registers
- pushq %rax
- pushq %rcx
- pushq %rdx
- pushq %rsi
- pushq %rdi
- pushq %r8
- pushq %r9
- pushq %r10
- pushq %r11
+ pushq %rax
+ pushq %rcx
+ pushq %rdx
+ pushq %rsi
+ pushq %rdi
+ pushq %r8
+ pushq %r9
+ pushq %r10
+ pushq %r11
movq 80(%rsp), %rdi # Copy of reloff
movq 88(%rsp), %rsi # Copy of obj
- call _dl_bind@PLT # Call the binder
- movq %rax,88(%rsp) # Store function to be called in obj
+ call _dl_bind@PLT # Call the binder
+ movq %rax,88(%rsp) # Store function to be called in obj
popq %r11 # restore registers
popq %r10
@@ -147,6 +147,6 @@ _dl_bind_start:
popq %rax
popfq
- leaq 8(%rsp),%rsp # Discard reloff, do not change eflags
+ leaq 8(%rsp),%rsp # Discard reloff, do not change eflags
ret
diff --git a/libexec/ld.so/amd64/rtld_machine.c b/libexec/ld.so/amd64/rtld_machine.c
index 2f4a2a7fb83..d930b21b94c 100644
--- a/libexec/ld.so/amd64/rtld_machine.c
+++ b/libexec/ld.so/amd64/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.4 2004/02/10 16:14:11 drahn Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.5 2004/02/23 20:52:04 deraadt Exp $ */
/*
* Copyright (c) 2002,2004 Dale Rahn
@@ -218,7 +218,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz)
_dl_printf("relocation error %d idx %d\n", type, i);
_dl_exit(20);
}
-
+
if (type == R_TYPE(NONE))
continue;
@@ -368,7 +368,7 @@ _dl_bind(elf_object_t *object, int index)
SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size, object);
if (this == NULL) {
_dl_printf("lazy binding failed!\n");
- *((int *)0) = 0; /* XXX */
+ *((int *)0) = 0; /* XXX */
}
newval = ooff + this->st_value + rel->r_addend;
@@ -396,7 +396,7 @@ _dl_bind(elf_object_t *object, int index)
void
_dl_md_reloc_got(elf_object_t *object, int lazy)
{
- extern void _dl_bind_start(void); /* XXX */
+ extern void _dl_bind_start(void); /* XXX */
Elf_Addr *pltgot = (Elf_Addr *)object->Dyn.info[DT_PLTGOT];
int i, num;
Elf_RelA *rel;
diff --git a/libexec/ld.so/amd64/syscall.h b/libexec/ld.so/amd64/syscall.h
index 91436a14f2f..0656c00f685 100644
--- a/libexec/ld.so/amd64/syscall.h
+++ b/libexec/ld.so/amd64/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.1 2004/02/10 14:18:14 drahn Exp $ */
+/* $OpenBSD: syscall.h,v 1.2 2004/02/23 20:52:05 deraadt Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -57,7 +57,7 @@ int _dl_sysctl(int *, u_int, void *, size_t *, void *, size_t);
static inline off_t
_dl_lseek(int fildes, off_t offset, int whence)
{
- return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
+ return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
}
#endif /*__DL_SYSCALL_H__*/
diff --git a/libexec/ld.so/x86_64/ldasm.S b/libexec/ld.so/x86_64/ldasm.S
index 515529439a2..15128e99706 100644
--- a/libexec/ld.so/x86_64/ldasm.S
+++ b/libexec/ld.so/x86_64/ldasm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldasm.S,v 1.2 2004/02/10 16:59:08 drahn Exp $ */
+/* $OpenBSD: ldasm.S,v 1.3 2004/02/23 20:52:04 deraadt Exp $ */
/*
* Copyright (c) 2002,2004 Dale Rahn
@@ -34,9 +34,9 @@
#include <machine/asm.h>
.text
- .align 4
- .globl _dl_start
- .type _dl_start,@function
+ .align 4
+ .globl _dl_start
+ .type _dl_start,@function
_dl_start:
movq %rsp, %r12 # save stack pointer for _rtld
pushq %rbx # save ps_strings
@@ -50,8 +50,8 @@ _dl_start:
movq %rsi, %rcx # dl_data
movq DL_LOFF_OFFSET(%rsi), %rdx # loff from dl_data
- movq (%r12), %rdi
- leaq 16(%r12,%rdi,8), %rsi # envp
+ movq (%r12), %rdi
+ leaq 16(%r12,%rdi,8), %rsi # envp
movq %r12, %rdi
addq $8,%rdi # argv
call _dl_boot@PLT # _dl_boot(argv,envp,loff,dl_data)
@@ -105,7 +105,7 @@ DL_SYSCALL2(sysctl,__sysctl)
.global _dl_sigprocmask
.type _dl_sigprocmask,@function
_dl_sigprocmask:
- movq (%rsi),%rsi # fetch indirect ...
+ movq (%rsi),%rsi # fetch indirect...
movl $SYS_sigprocmask, %eax
movq %rcx, %r10
syscall
@@ -121,20 +121,20 @@ _dl_sigprocmask:
.type _dl_bind_start,@function
_dl_bind_start:
pushfq # save registers
- pushq %rax
- pushq %rcx
- pushq %rdx
- pushq %rsi
- pushq %rdi
- pushq %r8
- pushq %r9
- pushq %r10
- pushq %r11
+ pushq %rax
+ pushq %rcx
+ pushq %rdx
+ pushq %rsi
+ pushq %rdi
+ pushq %r8
+ pushq %r9
+ pushq %r10
+ pushq %r11
movq 80(%rsp), %rdi # Copy of reloff
movq 88(%rsp), %rsi # Copy of obj
- call _dl_bind@PLT # Call the binder
- movq %rax,88(%rsp) # Store function to be called in obj
+ call _dl_bind@PLT # Call the binder
+ movq %rax,88(%rsp) # Store function to be called in obj
popq %r11 # restore registers
popq %r10
@@ -147,6 +147,6 @@ _dl_bind_start:
popq %rax
popfq
- leaq 8(%rsp),%rsp # Discard reloff, do not change eflags
+ leaq 8(%rsp),%rsp # Discard reloff, do not change eflags
ret
diff --git a/libexec/ld.so/x86_64/rtld_machine.c b/libexec/ld.so/x86_64/rtld_machine.c
index 2f4a2a7fb83..d930b21b94c 100644
--- a/libexec/ld.so/x86_64/rtld_machine.c
+++ b/libexec/ld.so/x86_64/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.4 2004/02/10 16:14:11 drahn Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.5 2004/02/23 20:52:04 deraadt Exp $ */
/*
* Copyright (c) 2002,2004 Dale Rahn
@@ -218,7 +218,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz)
_dl_printf("relocation error %d idx %d\n", type, i);
_dl_exit(20);
}
-
+
if (type == R_TYPE(NONE))
continue;
@@ -368,7 +368,7 @@ _dl_bind(elf_object_t *object, int index)
SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size, object);
if (this == NULL) {
_dl_printf("lazy binding failed!\n");
- *((int *)0) = 0; /* XXX */
+ *((int *)0) = 0; /* XXX */
}
newval = ooff + this->st_value + rel->r_addend;
@@ -396,7 +396,7 @@ _dl_bind(elf_object_t *object, int index)
void
_dl_md_reloc_got(elf_object_t *object, int lazy)
{
- extern void _dl_bind_start(void); /* XXX */
+ extern void _dl_bind_start(void); /* XXX */
Elf_Addr *pltgot = (Elf_Addr *)object->Dyn.info[DT_PLTGOT];
int i, num;
Elf_RelA *rel;
diff --git a/libexec/ld.so/x86_64/syscall.h b/libexec/ld.so/x86_64/syscall.h
index 91436a14f2f..0656c00f685 100644
--- a/libexec/ld.so/x86_64/syscall.h
+++ b/libexec/ld.so/x86_64/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.1 2004/02/10 14:18:14 drahn Exp $ */
+/* $OpenBSD: syscall.h,v 1.2 2004/02/23 20:52:05 deraadt Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -57,7 +57,7 @@ int _dl_sysctl(int *, u_int, void *, size_t *, void *, size_t);
static inline off_t
_dl_lseek(int fildes, off_t offset, int whence)
{
- return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
+ return _dl__syscall((quad_t)SYS_lseek, fildes, 0, offset, whence);
}
#endif /*__DL_SYSCALL_H__*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 12:14:45 +0000