diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2005-12-02 20:17:22 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2005-12-02 20:17:22 +0000 |
| commit | c765d33228533999fa93edb4ff5000c62ae9b41f (patch) | |
| tree | 146b44497d34edb1af49e259345194c2e09788da /libexec/ld.so | |
| parent | 4ec4fb127350c1ca3a155bc1b61cf8292077fd1f (diff) | |
fix RELOC_COPY on powerpc when symbol is weak. use relocation address
instead of symbol address. okay drahn@
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/powerpc/rtld_machine.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c index a5c7c0c44d6..e7f1e3787b9 100644 --- a/libexec/ld.so/powerpc/rtld_machine.c +++ b/libexec/ld.so/powerpc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.39 2005/09/22 13:59:47 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.40 2005/12/02 20:17:21 kurt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -393,8 +393,7 @@ _dl_printf(" found other symbol at %x size %d\n", src_loff + cpysrc->st_value, cpysrc->st_size); #endif _dl_bcopy((void *)(src_loff + cpysrc->st_value), - (void *)(ooff + this->st_value+ relas->r_addend), - size); + r_addr, size); } else fails++; } |