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/sparc | |
| parent | 09e6d0d93f5a520c5819dda4ad20beeb4823f0d9 (diff) | |
knf & ansi; drahn ok
Diffstat (limited to 'libexec/ld.so/sparc')
| -rw-r--r-- | libexec/ld.so/sparc/ldasm.S | 6 | ||||
| -rw-r--r-- | libexec/ld.so/sparc/rtld_machine.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libexec/ld.so/sparc/ldasm.S b/libexec/ld.so/sparc/ldasm.S index c7a3cf5f86c..b5beae47e50 100644 --- a/libexec/ld.so/sparc/ldasm.S +++ b/libexec/ld.so/sparc/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.10 2002/12/18 19:20:02 drahn Exp $ */ +/* $OpenBSD: ldasm.S,v 1.11 2003/02/02 16:57:58 deraadt Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -104,7 +104,7 @@ _dl_start: nop add %sp, DL_DATA_SIZE, %sp ! restore stack - + jmp %o0 mov %l1, %g1 ! restore ps_strings @@ -306,7 +306,7 @@ _dl_sigprocmask: cmp %o2, 0 bne,a 1f st %o0, [%o2] -1: +1: retl clr %o0 diff --git a/libexec/ld.so/sparc/rtld_machine.c b/libexec/ld.so/sparc/rtld_machine.c index 9e630647de4..96349dba377 100644 --- a/libexec/ld.so/sparc/rtld_machine.c +++ b/libexec/ld.so/sparc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.12 2002/12/18 19:21:01 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.13 2003/02/02 16:57:58 deraadt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -361,7 +361,7 @@ _dl_bind(elf_object_t *object, Elf_Word reloff) _dl_sigprocmask(SIG_BLOCK, &nmask, &omask); /* mprotect the actual modified region, not the whole plt */ _dl_mprotect((void*)addr,sizeof (Elf_Addr) * 3, - PROT_READ|PROT_WRITE|PROT_EXEC); + PROT_READ|PROT_WRITE|PROT_EXEC); } _dl_reloc_plt(addr, value); @@ -370,7 +370,7 @@ _dl_bind(elf_object_t *object, Elf_Word reloff) if (object->plt_addr != NULL && object->plt_size != 0) { /* mprotect the actual modified region, not the whole plt */ _dl_mprotect((void*)addr,sizeof (Elf_Addr) * 3, - PROT_READ|PROT_EXEC); + PROT_READ|PROT_EXEC); _dl_sigprocmask(SIG_SETMASK, &omask, NULL); } @@ -447,10 +447,10 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) return; } - 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); - if (object->plt_addr != NULL && object->plt_size != 0) + PROT_READ); + if (object->plt_addr != NULL && object->plt_size != 0) _dl_mprotect((void*)object->plt_addr, object->plt_size, PROT_READ|PROT_EXEC); } |