summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-02-07 14:44:18 -0800
committerRoland McGrath <roland@hack.frob.com>2013-02-07 14:44:18 -0800
commitf1d70dad5381352b3cad04b5ee0dd0efe2627683 (patch)
tree09ee58dd09a6fd5f18131b98cc337a001e90fcb2 /elf
parent7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c (diff)
downloadglibc-f1d70dad5381352b3cad04b5ee0dd0efe2627683.tar.gz
Remove lots of inline keywords.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-deps.c4
-rw-r--r--elf/tlsdeschtab.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index fe90df61b1..cd1c236b2e 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -155,9 +155,7 @@ _dl_map_object_deps (struct link_map *map,
const char *errstring;
const char *objname;
- auto inline void preload (struct link_map *map);
-
- inline void preload (struct link_map *map)
+ void preload (struct link_map *map)
{
known[nlist].done = 0;
known[nlist].map = map;
diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h
index 8de9861110..155f4fdd9b 100644
--- a/elf/tlsdeschtab.h
+++ b/elf/tlsdeschtab.h
@@ -129,7 +129,7 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset)
or a futex wake to wake up any waiting threads, but let's try to
avoid introducing such dependencies. */
-inline static int
+static int
_dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller)
{
if (caller != td->entry)
@@ -147,7 +147,7 @@ _dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller)
return 0;
}
-inline static void
+static void
_dl_tlsdesc_wake_up_held_fixups (void)
{
__rtld_lock_unlock_recursive (GL(dl_load_lock));