aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mips
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@codesourcery.com>2006-03-03 01:06:48 +0000
committerDaniel Jacobowitz <dan@codesourcery.com>2006-03-03 01:06:48 +0000
commit6428ce3cdad3d587fb77f2f1d0d7036f780fa9e0 (patch)
tree0b9ab606ed6e36b293b65483dfb10f331f59a0d3 /sysdeps/mips
parent43b83c6fe172730ffe39b3fbcf54add3ce92b084 (diff)
downloadglibc-6428ce3cdad3d587fb77f2f1d0d7036f780fa9e0.tar.xz
glibc-6428ce3cdad3d587fb77f2f1d0d7036f780fa9e0.zip
* sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
(INTERNAL_SYSCALL): Update internal_syscall##nr invocation. (INTERNAL_SYSCALL_NCS): New. (internal_syscall0, internal_syscall1, internal_syscall2, internal_syscall3, internal_syscall4, internal_syscall5, internal_syscall6): Take ncs_init, cs_init, and input arguments. Use them. Correct types for registers. * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h (INTERNAL_SYSCALL): Update internal_syscall##nr invocation. (INTERNAL_SYSCALL_NCS): New. (internal_syscall0, internal_syscall1, internal_syscall2, internal_syscall3, internal_syscall4, internal_syscall5, internal_syscall6): Take ncs_init, cs_init, and input arguments. Use them. * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list: Remove recvfrom and sendto. Mark lseek, msgrcv, and msgsnd as cancellation points. * sysdeps/mips/dl-machine.h (elf_machine_rel): Remove unused "value". Use Elf(Addr) for TLS relocation targets. * sysdeps/unix/sysv/linux/mips/mips64/Makefile: New file. * sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h (lll_futex_wait, lll_futex_timed_wait, lll_futex_wake, lll_futex_requeue): Cast futexp to long for n64. * sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h: New file.
Diffstat (limited to 'sysdeps/mips')
-rw-r--r--sysdeps/mips/dl-machine.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index c04609f9bc..b91218479d 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. MIPS version.
- Copyright (C) 1996-2001, 2002, 2003, 2004, 2005
+ Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
@@ -336,28 +336,24 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
# endif
{
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
- Elf32_Addr value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
-
- if (sym)
- value += sym->st_value;
switch (r_type)
{
case R_MIPS_TLS_DTPMOD64:
case R_MIPS_TLS_DTPMOD32:
if (sym_map)
- *(ElfW(Word) *)reloc_addr = sym_map->l_tls_modid;
+ *(ElfW(Addr) *)reloc_addr = sym_map->l_tls_modid;
break;
case R_MIPS_TLS_DTPREL64:
case R_MIPS_TLS_DTPREL32:
- *(ElfW(Word) *)reloc_addr += TLS_DTPREL_VALUE (sym);
+ *(ElfW(Addr) *)reloc_addr += TLS_DTPREL_VALUE (sym);
break;
case R_MIPS_TLS_TPREL32:
case R_MIPS_TLS_TPREL64:
CHECK_STATIC_TLS (map, sym_map);
- *(ElfW(Word) *)reloc_addr += TLS_TPREL_VALUE (sym_map, sym);
+ *(ElfW(Addr) *)reloc_addr += TLS_TPREL_VALUE (sym_map, sym);
break;
}