diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:37:00 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:37:00 +0200 |
| commit | f9e888643115b4b2f28853ebd1733f4410fb8839 (patch) | |
| tree | 58c69f6cef623679080e8933b6c79880bfbd7cb8 /elf/tlsdeschtab.h | |
| parent | d78eef6ebc008f784f501ce208bef12c6eafda27 (diff) | |
| parent | b934acf0e93c5a220551ed6e686bb9d45a24a8cc (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'elf/tlsdeschtab.h')
| -rw-r--r-- | elf/tlsdeschtab.h | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |