diff options
| author | Andreas Jaeger <aj@suse.de> | 2004-09-24 17:09:04 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2004-09-24 17:09:04 +0000 |
| commit | 7090d3caa163bc003d02e16dc981985dea883b24 (patch) | |
| tree | 3ff6fdd0fbf8481bcd6f06ac1cc30f756da1d1d7 /elf | |
| parent | 362038b0cab33f8e61ada54aaaf4312e44a0922b (diff) | |
| download | glibc-7090d3caa163bc003d02e16dc981985dea883b24.tar.gz glibc-7090d3caa163bc003d02e16dc981985dea883b24.tar.xz glibc-7090d3caa163bc003d02e16dc981985dea883b24.zip | |
* sysdeps/x86_64/dl-machine.h (elf_machine_rela_relative): Remove
static, add always_inline attribute. (elf_machine_rela): Likewise. (elf_machine_lazy_rel): Likewise. * elf/dynamic-link.h (elf_get_dynamic_info): Make static dependend on !RESOLVE so that it's not defined in local scope. * locale/weight.h (findidx): Remove static, it's not supported anymore with GCC 4.0 in a block scope. * locale/weightwc.h (findidx): Likewise. * posix/regcomp.c (seek_collating_symbol_entry): Likewise. (lookup_collation_sequence_value): Likewise. (build_range_exp): Likewise. (build_collating_symbol): Likewise. * iconv/iconvconfig.c (write_output): Likewise. * elf/do-rel.h (elf_dynamic_do_rel): Likewise.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/do-rel.h | 4 | ||||
| -rw-r--r-- | elf/dynamic-link.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/elf/do-rel.h b/elf/do-rel.h index 726418748c..990b9615e0 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -1,5 +1,5 @@ /* Do relocations for ELF dynamic linking. - Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1995-2003, 2004 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 @@ -49,7 +49,7 @@ relocations; they should be set up to call _dl_runtime_resolve, rather than fully resolved now. */ -static inline void __attribute__ ((always_inline)) +auto inline void __attribute__ ((always_inline)) elf_dynamic_do_rel (struct link_map *map, ElfW(Addr) reladdr, ElfW(Addr) relsize, int lazy) diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index 5d48b16511..f9559dc59c 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -64,8 +64,12 @@ elf_machine_lazy_rel (struct link_map *map, /* Read the dynamic section at DYN and fill in INFO with indices DT_*. */ - -static inline void __attribute__ ((unused, always_inline)) +#ifndef RESOLVE +static +#else +auto +#endif +inline void __attribute__ ((unused, always_inline)) elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) { ElfW(Dyn) *dyn = l->l_ld; |