diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/dl-hash.h | 5 | ||||
| -rw-r--r-- | sysdeps/generic/libc-start.c | 6 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/i386/i686/dl-hash.h | 6 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.h | 13 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 12 | ||||
| -rw-r--r-- | sysdeps/sh/dl-machine.h | 4 |
8 files changed, 14 insertions, 38 deletions
diff --git a/sysdeps/generic/dl-hash.h b/sysdeps/generic/dl-hash.h index a84bf2416d..243ae14b51 100644 --- a/sysdeps/generic/dl-hash.h +++ b/sysdeps/generic/dl-hash.h @@ -1,5 +1,5 @@ /* Compute hash value for given string according to ELF standard. - Copyright (C) 1995, 1996, 1997, 1998, 2003 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2003,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,8 +25,9 @@ first five operations no overflow is possible so we optimized it a bit. */ static unsigned int -_dl_elf_hash (const unsigned char *name) +_dl_elf_hash (const char *name_arg) { + const unsigned char *name = (const unsigned char *) name_arg; unsigned long int hash = 0; if (*name != '\0') { diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index e0a04cba58..f0d69b443b 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -241,10 +241,10 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), terminate the entire process. */ result = 0; # ifdef SHARED - int *const ptr = __libc_pthread_functions.ptr_nthreads; + unsigned int *const ptr = __libc_pthread_functions.ptr_nthreads; # else - extern int __nptl_nthreads __attribute ((weak)); - int *const ptr = &__nptl_nthreads; + extern unsigned int __nptl_nthreads __attribute ((weak)); + unsigned int *const ptr = &__nptl_nthreads; # endif if (! atomic_decrement_and_test (ptr)) diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 78c083f6ab..a965a4a5fc 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -299,14 +299,14 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, #endif /* !dl_machine_h */ -#ifdef RESOLVE_MAP - /* The i386 never uses Elf32_Rela relocations for the dynamic linker. Prelinked libraries may use Elf32_Rela though. */ #ifdef RTLD_BOOTSTRAP # define ELF_MACHINE_NO_RELA 1 #endif +#ifdef RESOLVE_MAP + /* Perform the relocation specified by RELOC and SYM (which is fully resolved). MAP is the object containing the reloc. */ diff --git a/sysdeps/i386/i686/dl-hash.h b/sysdeps/i386/i686/dl-hash.h index 61183d80da..4bdd998aa8 100644 --- a/sysdeps/i386/i686/dl-hash.h +++ b/sysdeps/i386/i686/dl-hash.h @@ -1,5 +1,5 @@ /* Compute hash alue for given string according to ELF standard. - Copyright (C) 1998, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -27,7 +27,7 @@ would be much slower than the generic C implementation. So don't use it. */ static unsigned int -_dl_elf_hash (const unsigned char *name) +_dl_elf_hash (const char *name) { unsigned int result; unsigned int temp0; @@ -71,7 +71,7 @@ _dl_elf_hash (const unsigned char *name) "jnz 2b\n" "1:\t" : "=&r" (result), "=r" (name), "=&c" (temp0), "=&r" (temp1) - : "0" (0), "1" (name)); + : "0" (0), "1" ((const unsigned char *) name)); return result; } diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index c9081345ab..5ec7262157 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -680,7 +680,7 @@ gaih_inet (const char *name, const struct gaih_service *service, h->h_length); else { - int32_t *addr = (uint32_t *) (*pat)->addr; + uint32_t *addr = (uint32_t *) (*pat)->addr; addr[3] = *(uint32_t *) h->h_addr_list[i]; addr[2] = htonl (0xffff); addr[1] = 0; diff --git a/sysdeps/powerpc/powerpc32/dl-machine.h b/sysdeps/powerpc/powerpc32/dl-machine.h index 6d7d91b3eb..545c19b300 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.h +++ b/sysdeps/powerpc/powerpc32/dl-machine.h @@ -313,19 +313,6 @@ elf_machine_lazy_rel (struct link_map *map, /* elf_machine_runtime_setup handles this. */ } -auto inline void __attribute__ ((always_inline)) -elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, - const ElfW(Sym) *sym, const struct r_found_version *version, - void *const reloc_addr) -{ -} - -auto inline void __attribute__ ((always_inline)) -elf_machine_rel_relative (ElfW(Addr) l_addr, const Elf32_Rel *reloc, - void *const reloc_addr) -{ -} - /* The SVR4 ABI specifies that the JMPREL relocs must be inside the DT_RELA table. */ #define ELF_MACHINE_PLTREL_OVERLAP 1 diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 6fc9df056a..33fc1b6a9c 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -810,17 +810,5 @@ elf_machine_lazy_rel (struct link_map *map, /* elf_machine_runtime_setup handles this. */ } -auto inline void __attribute__ ((always_inline)) -elf_machine_rel (struct link_map *map, const Elf64_Rel *reloc, - const ElfW(Sym) *sym, const struct r_found_version *version, - void *const reloc_addr) -{ -} - -auto inline void __attribute__ ((always_inline)) -elf_machine_rel_relative (ElfW(Addr) l_addr, const Elf64_Rel *reloc, - void *const reloc_addr) -{ -} #endif /* RESOLVE */ diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index b66b4f0e42..e73c6d79c3 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -256,11 +256,11 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc, #endif /* !dl_machine_h */ -#ifdef RESOLVE_MAP - /* SH never uses Elf32_Rel relocations. */ #define ELF_MACHINE_NO_REL 1 +#ifdef RESOLVE_MAP + /* Perform the relocation specified by RELOC and SYM (which is fully resolved). MAP is the object containing the reloc. */ |