diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-02-02 16:57:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-02-02 16:57:59 +0000 |
| commit | 9de3e81d3ae0edf58696f5ef45356a2fbc615b9e (patch) | |
| tree | 68a91274148408935b2018b28ae24be4b18c8c26 /libexec/ld.so/i386 | |
| parent | 09e6d0d93f5a520c5819dda4ad20beeb4823f0d9 (diff) | |
knf & ansi; drahn ok
Diffstat (limited to 'libexec/ld.so/i386')
| -rw-r--r-- | libexec/ld.so/i386/ldasm.S | 6 | ||||
| -rw-r--r-- | libexec/ld.so/i386/rtld_machine.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S index c3ff47b5234..cf20d25310d 100644 --- a/libexec/ld.so/i386/ldasm.S +++ b/libexec/ld.so/i386/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.3 2002/12/18 19:20:02 drahn Exp $ */ +/* $OpenBSD: ldasm.S,v 1.4 2003/02/02 16:57:58 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -266,13 +266,13 @@ _dl_bind_start: pushl %edi pushl %ds pushl %es - + pushl 44(%esp) # Copy of reloff pushl 44(%esp) # Copy of obj call _dl_bind@PLT # Call the binder addl $8,%esp # pop binder args movl %eax,44(%esp) # Store function to be called in obj - + popl %es # restore registers popl %ds popl %edi diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c index e8ce94c1927..750bb2f4c1b 100644 --- a/libexec/ld.so/i386/rtld_machine.c +++ b/libexec/ld.so/i386/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.6 2002/12/18 19:20:02 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.7 2003/02/02 16:57:58 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -384,7 +384,7 @@ _dl_bind(elf_object_t *object, int index) sigfillset(&nmask); _dl_sigprocmask(SIG_BLOCK, &nmask, &omask); _dl_mprotect((void*)object->got_addr, object->got_size, - PROT_READ|PROT_WRITE); + PROT_READ|PROT_WRITE); } _dl_reloc_plt(addr, ooff + this->st_value); @@ -471,7 +471,7 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) } /* PLT is already RO on i386, no point in mprotecting it, just GOT */ - if (object->got_addr != NULL && object->got_size != 0) + if (object->got_addr != NULL && object->got_size != 0) _dl_mprotect((void*)object->got_addr, object->got_size, - PROT_READ); + PROT_READ); } |