aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2004-09-24 17:09:04 +0000
committerAndreas Jaeger <aj@suse.de>2004-09-24 17:09:04 +0000
commit7090d3caa163bc003d02e16dc981985dea883b24 (patch)
tree3ff6fdd0fbf8481bcd6f06ac1cc30f756da1d1d7
parent362038b0cab33f8e61ada54aaaf4312e44a0922b (diff)
downloadglibc-7090d3caa163bc003d02e16dc981985dea883b24.zip
glibc-7090d3caa163bc003d02e16dc981985dea883b24.tar.gz
glibc-7090d3caa163bc003d02e16dc981985dea883b24.tar.bz2
* 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.
-rw-r--r--elf/do-rel.h4
-rw-r--r--elf/dynamic-link.h8
-rw-r--r--iconv/iconvconfig.c3
-rw-r--r--locale/weight.h4
-rw-r--r--locale/weightwc.h4
-rw-r--r--posix/regcomp.c8
-rw-r--r--sysdeps/x86_64/dl-machine.h9
7 files changed, 24 insertions, 16 deletions
diff --git a/elf/do-rel.h b/elf/do-rel.h
index 7264187..990b961 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 5d48b16..f9559dc 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;
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index da0d54f..e21f03e 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -1011,7 +1011,8 @@ write_output (void)
char finalname[prefix_len + sizeof (GCONV_MODULES_CACHE)];
/* Function to insert the names. */
- static void name_insert (const void *nodep, VISIT value, int level)
+ auto void
+ name_insert (const void *nodep, VISIT value, int level)
{
struct name *name;
unsigned int idx;
diff --git a/locale/weight.h b/locale/weight.h
index d67e9d9..dc70a00 100644
--- a/locale/weight.h
+++ b/locale/weight.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper, <drepper@cygnus.com>.
@@ -18,7 +18,7 @@
02111-1307 USA. */
/* Find index of weight. */
-static inline int32_t
+auto inline int32_t
__attribute ((always_inline))
findidx (const unsigned char **cpp)
{
diff --git a/locale/weightwc.h b/locale/weightwc.h
index 9957893..ff5e63a 100644
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper, <drepper@cygnus.com>.
@@ -18,7 +18,7 @@
02111-1307 USA. */
/* Find index of weight. */
-static inline int32_t
+auto inline int32_t
__attribute ((always_inline))
findidx (const wint_t **cpp)
{
diff --git a/posix/regcomp.c b/posix/regcomp.c
index bc9e56b..9b435a8 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -2682,7 +2682,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
Seek the collating symbol entry correspondings to NAME.
Return the index of the symbol in the SYMB_TABLE. */
- static inline int32_t
+ auto inline int32_t
__attribute ((always_inline))
seek_collating_symbol_entry (name, name_len)
const unsigned char *name;
@@ -2715,7 +2715,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
Look up the collation sequence value of BR_ELEM.
Return the value if succeeded, UINT_MAX otherwise. */
- static inline unsigned int
+ auto inline unsigned int
__attribute ((always_inline))
lookup_collation_sequence_value (br_elem)
bracket_elem_t *br_elem;
@@ -2783,7 +2783,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
mbcset->range_ends, is a pointer argument sinse we may
update it. */
- static inline reg_errcode_t
+ auto inline reg_errcode_t
__attribute ((always_inline))
build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
re_charset_t *mbcset;
@@ -2866,7 +2866,7 @@ parse_bracket_exp (regexp, dfa, token, syntax, err)
COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
pointer argument sinse we may update it. */
- static inline reg_errcode_t
+ auto inline reg_errcode_t
__attribute ((always_inline))
build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
re_charset_t *mbcset;
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 302545f..b932f51d 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -355,7 +355,8 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
MAP is the object containing the reloc. */
-static inline void
+auto inline void
+__attribute__ ((always_inline))
elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
const Elf64_Sym *sym, const struct r_found_version *version,
void *const reloc_addr_arg)
@@ -520,7 +521,8 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
}
}
-static inline void
+auto inline void
+__attribute ((always_inline))
elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
void *const reloc_addr_arg)
{
@@ -529,7 +531,8 @@ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
*reloc_addr = l_addr + reloc->r_addend;
}
-static inline void
+auto inline void
+__attribute ((always_inline))
elf_machine_lazy_rel (struct link_map *map,
Elf64_Addr l_addr, const Elf64_Rela *reloc)
{