diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-11-26 12:02:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-11-26 12:02:23 +0000 |
| commit | cb0509a8d5a3569117babe0a24dc4946cf6c06c1 (patch) | |
| tree | 85cc83f80f4dff0f7a7b2580865f6341ad3e79ae /elf/dl-runtime.c | |
| parent | 0155a7737f5653e07015421b962b70fd8831c4ad (diff) | |
Update.
1998-11-26 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mips/dl-machine.h (ELF_MACHINE_NO_PLT): New defined macro.
(elf_machine_got_rel): Remove scope variable. Use scope from the map.
Don't modify _dl_global_scope_end in the end.
(__dl_runtime_resolv): Also use scope from the map.
* sysdeps/mips/mips64/dl-machine.h: Likewise.
* elf/dl-runtime.c: Don't define fixup and profile_fixup if
ELF_MACHINE_NO_PLT is defined.
* sysdeps/mips/sys/ucontext.h: New file.
Patches by kaz Kojima <kkojima@rr.iij4u.or.jp>.
1998-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/pselect.c (__pselect): Change interface,
set/restore sigmask.
* misc/sys/select.h: Change declaration according to Stevens' Unix
Network Programming.
* include/sys/select.h (__pselect): Likewise.
Reported by <bwelling@anomaly.munge.com> [PR libc/872].
* include/fpu_control.h: New file, contains __setfpucw
declaration.
* sysdeps/generic/fpu_control.h: Remove __setfpucw declaration,
it's an internal symbol.
* sysdeps/alpha/fpu/fpu_control.h: Likewise.
* sysdeps/arm/fpu/fpu_control.h: Likewise.
* sysdeps/i386/fpu_control.h: Likewise.
* sysdeps/m68k/fpu_control.h: Likewise.
* sysdeps/powerpc/fpu_control.h: Likewise.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Likewise.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Likewise.
Diffstat (limited to 'elf/dl-runtime.c')
| -rw-r--r-- | elf/dl-runtime.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 38ecf96525..91700c2764 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -39,11 +39,12 @@ to that address. Future calls will bounce directly from the PLT to the function. */ +#ifndef ELF_MACHINE_NO_PLT static ElfW(Addr) __attribute__ ((unused)) fixup ( -#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, -#endif +# ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS + ELF_MACHINE_RUNTIME_FIXUP_ARGS, +# endif struct link_map *l, ElfW(Word) reloc_offset) { const ElfW(Sym) *const symtab @@ -96,9 +97,9 @@ fixup ( return value; } +#endif - -#ifndef PROF +#if !defined PROF && !defined ELF_MACHINE_NO_PLT static ElfW(Addr) __attribute__ ((unused)) profile_fixup ( @@ -172,7 +173,7 @@ profile_fixup ( return value; } -#endif /* PROF */ +#endif /* PROF && ELF_MACHINE_NO_PLT */ /* This macro is defined in dl-machine.h to define the entry point called |