From c2a329735e7381aed4b98c7639b20e201d8adaeb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 11 Dec 1998 15:32:09 +0000 Subject: Update. * sysdeps/powerpc/dl-machine.h (elf_machine_matches_host): Mark static inline, not extern inline. (elf_machine_dynamic): Likewise. (elf_machine_lazy_rel): Likewise. (elf_machine_plt_value): Likewise. * sysdeps/powerpc/backtrace.c: Include stddef.h to get NULL definition. Patches by Franz Sirl . --- ChangeLog | 9 +++++++++ sysdeps/powerpc/backtrace.c | 3 ++- sysdeps/powerpc/dl-machine.h | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e42d5e2dd0..c1b01d1512 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 1998-12-11 Ulrich Drepper + * sysdeps/powerpc/dl-machine.h (elf_machine_matches_host): Mark + static inline, not extern inline. + (elf_machine_dynamic): Likewise. + (elf_machine_lazy_rel): Likewise. + (elf_machine_plt_value): Likewise. + * sysdeps/powerpc/backtrace.c: Include stddef.h to get NULL + definition. + Patches by Franz Sirl . + * sysdeps/mips/dl-machine.h (elf_machine_rel): Fixl_addr parameter type. Reported by job bogan . diff --git a/sysdeps/powerpc/backtrace.c b/sysdeps/powerpc/backtrace.c index 7d71fbd9a8..a89d33294b 100644 --- a/sysdeps/powerpc/backtrace.c +++ b/sysdeps/powerpc/backtrace.c @@ -18,6 +18,7 @@ Boston, MA 02111-1307, USA. */ #include +#include /* This is the stack layout we see with every stack frame. Note that every routine is required by the ABI to lay out the stack @@ -40,7 +41,7 @@ __backtrace (void **array, int size) { struct layout *current; int count; - + /* Force gcc to spill LR. */ asm volatile ("" : "=l"(current)); diff --git a/sysdeps/powerpc/dl-machine.h b/sysdeps/powerpc/dl-machine.h index 6542b1d3b2..79fa274450 100644 --- a/sysdeps/powerpc/dl-machine.h +++ b/sysdeps/powerpc/dl-machine.h @@ -25,7 +25,7 @@ #include /* Return nonzero iff E_MACHINE is compatible with the running host. */ -extern inline int +static inline int elf_machine_matches_host (Elf32_Half e_machine) { return e_machine == EM_PPC; @@ -34,7 +34,7 @@ elf_machine_matches_host (Elf32_Half e_machine) /* Return the link-time address of _DYNAMIC, stored as the first value in the GOT. */ -extern inline Elf32_Addr +static inline Elf32_Addr elf_machine_dynamic (void) { Elf32_Addr *got; @@ -238,7 +238,7 @@ extern int __elf_machine_runtime_setup (struct link_map *map, int lazy, int profile); #define elf_machine_runtime_setup __elf_machine_runtime_setup -extern inline void +static inline void elf_machine_lazy_rel (Elf32_Addr l_addr, const Elf32_Rela *reloc) { /* elf_machine_runtime_setup handles this. */ @@ -252,7 +252,7 @@ extern void __elf_machine_fixup_plt(struct link_map *map, #define elf_machine_fixup_plt __elf_machine_fixup_plt /* Return the final value of a plt relocation. */ -extern inline Elf32_Addr +static inline Elf32_Addr elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc, Elf32_Addr value) { -- cgit 1.4.1