diff options
| author | Andreas Jaeger <aj@suse.de> | 2000-04-13 23:55:40 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2000-04-13 23:55:40 +0000 |
| commit | 490a9ab75c787cf06cd43a1d4c5dfe74ff4a7907 (patch) | |
| tree | 553375e9190076d7d574156024f875d657834577 | |
| parent | 44a202c059d42b91585115ec5bb16a637b63e934 (diff) | |
| download | glibc-490a9ab75c787cf06cd43a1d4c5dfe74ff4a7907.tar.gz | |
Update.
* sysdeps/mips/dl-machine.h (__dl_runtime_resolve): Handle symbol
versioning.
2000-04-13 Andreas Jaeger <aj@suse.de>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/mips/dl-machine.h | 47 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/clone.S | 7 |
3 files changed, 47 insertions, 12 deletions
@@ -1,5 +1,10 @@ 2000-04-13 Andreas Jaeger <aj@suse.de> + * sysdeps/mips/dl-machine.h (__dl_runtime_resolve): Handle symbol + versioning. + +2000-04-13 Andreas Jaeger <aj@suse.de> + * sysdeps/unix/sysv/linux/mips/clone.S: Fix function. * sysdeps/unix/mips/pipe.S: Reorder instructions since .reorder is diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 3d8349173a..fecd3e17f9 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -233,22 +233,51 @@ __dl_runtime_resolve (ElfW(Word) sym_index, \ = (const ElfW(Word)) l->l_info[DT_MIPS (LOCAL_GOTNO)]->d_un.d_val; \ const ElfW(Word) gotsym \ = (const ElfW(Word)) l->l_info[DT_MIPS (GOTSYM)]->d_un.d_val; \ - const ElfW(Sym) *definer; \ - ElfW(Addr) loadbase; \ + const ElfW(Sym) *sym; \ ElfW(Addr) funcaddr; \ + ElfW(Addr) value; \ \ /* Look up the symbol's run-time value. */ \ - definer = &symtab[sym_index]; \ + sym = &symtab[sym_index]; \ + /* FIXME: The symbol versioning stuff is not tested yet. */ \ + if (__builtin_expect (ELFW(ST_VISIBILITY) (sym->st_other), 0) == 0) \ + { \ + switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL) \ + { \ + default: \ + { \ + const ElfW(Half) *vernum = \ + (const void *) D_PTR (l, l_info[VERSYMIDX (DT_VERSYM)]); \ + ElfW(Half) ndx = vernum[sym_index]; \ + const struct r_found_version *version = &l->l_versions[ndx]; \ \ - /* FIXME: Handle symbol versioning correctly. */ \ - loadbase = _dl_lookup_symbol (strtab + definer->st_name, l, &definer, \ - l->l_scope, R_MIPS_REL32); \ + if (version->hash != 0) \ + { \ + value = _dl_lookup_versioned_symbol(strtab + sym->st_name, l, \ + &sym, l->l_scope, version,\ + R_MIPS_REL32); \ + break; \ + } \ + /* Fall through. */ \ + } \ + case 0: \ + value = _dl_lookup_symbol (strtab + sym->st_name, l, &sym, \ + l->l_scope, R_MIPS_REL32); \ + } \ \ + /* Currently value contains the base load address of the object \ + that defines sym. Now add in the symbol offset. */ \ + value = (sym ? value + sym->st_value : 0); \ + } \ + else \ + /* We already found the symbol. The module (and therefore its load \ + address) is also known. */ \ + value = l->l_addr + sym->st_value; \ + \ /* Apply the relocation with that value. */ \ - funcaddr = loadbase + definer->st_value; \ - *(got + local_gotno + sym_index - gotsym) = funcaddr; \ + *(got + local_gotno + sym_index - gotsym) = value; \ \ - return funcaddr; \ + return value; \ } \ \ asm ("\n \ diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S index 1bb5c29d3c..0398ba348e 100644 --- a/sysdeps/unix/sysv/linux/mips/clone.S +++ b/sysdeps/unix/sysv/linux/mips/clone.S @@ -86,12 +86,13 @@ error: At this point we have s0=arg, s1=fn. */ -NESTED(__thread_start,FRAMESZ,sp) +ENTRY(__thread_start) /* cp is already loaded. */ + .cprestore 16 /* The stackframe has been created on entry of clone(). */ /* Resort the arg for user's function. */ - move a0,0(sp) /* Function pointer. */ - move t9,4(sp) /* Argument pointer. */ + lw t9,0(sp) /* Function pointer. */ + lw a0,4(sp) /* Argument pointer. */ /* Call the user's function. */ jalr t9 |