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/dl-runtime.c | |
| parent | d78eef6ebc008f784f501ce208bef12c6eafda27 (diff) | |
| parent | b934acf0e93c5a220551ed6e686bb9d45a24a8cc (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'elf/dl-runtime.c')
| -rw-r--r-- | elf/dl-runtime.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 9ac2726102..828474838c 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -62,9 +62,7 @@ _dl_fixup ( # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, # endif - /* GKM FIXME: Fix trampoline to pass bounds so we can do - without the `__unbounded' qualifier. */ - struct link_map *__unbounded l, ElfW(Word) reloc_arg) + struct link_map *l, ElfW(Word) reloc_arg) { const ElfW(Sym) *const symtab = (const void *) D_PTR (l, l_info[DT_SYMTAB]); @@ -150,7 +148,7 @@ _dl_fixup ( return elf_machine_fixup_plt (l, result, reloc, rel_addr, value); } -#if !defined PROF && !__BOUNDED_POINTERS__ +#ifndef PROF DL_FIXUP_VALUE_TYPE __attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE _dl_profile_fixup ( |