yann@1: Fixes yann@1: In file included from dynamic-link.h:22, yann@1: from dl-reloc.c:265: yann@1: ../sysdeps/arm/dl-machine.h: In function '_dl_relocate_object': yann@1: ../sysdeps/arm/dl-machine.h:371: error: invalid storage class for function 'fix_bad_pc24' yann@1: ../sysdeps/arm/dl-machine.h:406: error: invalid storage class for function 'elf_machine_rel' yann@1: ../sysdeps/arm/dl-machine.h:532: error: invalid storage class for function 'elf_machine_rela' yann@1: ../sysdeps/arm/dl-machine.h:612: error: invalid storage class for function 'elf_machine_rel_relative' yann@1: ../sysdeps/arm/dl-machine.h:621: error: invalid storage class for function 'elf_machine_rela_relative' yann@1: ../sysdeps/arm/dl-machine.h:630: error: invalid storage class for function 'elf_machine_lazy_rel' yann@1: make[2]: Leaving directory `/home/dank/queue/jobdir.k8/crosstool-dev/build/arm-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3.3/glibc-2.3.3/elf' yann@1: yann@1: when building glibc-2.3.[34] with gcc-4.0 yann@1: yann@1: Like yann@1: http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/arm/dl-machine.h.diff?r1=1.51&r2=1.52&cvsroot=glibc yann@1: but works with older compilers, and fixes fix_bad_pc24. yann@1: yann@1: yann@1: --- glibc-2.3.4/sysdeps/arm/dl-machine.h.old Sun Mar 20 17:54:37 2005 yann@1: +++ glibc-2.3.4/sysdeps/arm/dl-machine.h Sun Mar 20 17:57:32 2005 yann@1: @@ -359,7 +359,14 @@ yann@1: # endif yann@1: yann@1: /* Deal with an out-of-range PC24 reloc. */ yann@1: -static Elf32_Addr yann@1: +#if __GNUC__ >= 4 yann@1: + auto inline Elf32_Addr yann@1: +#else yann@1: + static inline Elf32_Addr yann@1: +#endif yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute ((always_inline)) yann@1: +#endif yann@1: fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value) yann@1: { yann@1: static void *fix_page; yann@1: @@ -392,7 +399,14 @@ yann@1: /* Perform the relocation specified by RELOC and SYM (which is fully resolved). yann@1: MAP is the object containing the reloc. */ yann@1: yann@1: -static inline void yann@1: +#if __GNUC__ >= 4 yann@1: + auto inline void yann@1: +#else yann@1: + static inline void yann@1: +#endif yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute ((always_inline)) yann@1: +#endif yann@1: elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, yann@1: const Elf32_Sym *sym, const struct r_found_version *version, yann@1: void *const reloc_addr_arg) yann@1: @@ -517,7 +531,14 @@ yann@1: } yann@1: yann@1: # ifndef RTLD_BOOTSTRAP yann@1: -static inline void yann@1: +#if __GNUC__ >= 4 yann@1: + auto inline void yann@1: +#else yann@1: + static inline void yann@1: +#endif yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute ((always_inline)) yann@1: +#endif yann@1: elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, yann@1: const Elf32_Sym *sym, const struct r_found_version *version, yann@1: void *const reloc_addr_arg) yann@1: @@ -597,7 +618,14 @@ yann@1: } yann@1: # endif yann@1: yann@1: -static inline void yann@1: +#if __GNUC__ >= 4 yann@1: + auto inline void yann@1: +#else yann@1: + static inline void yann@1: +#endif yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute ((always_inline)) yann@1: +#endif yann@1: elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, yann@1: void *const reloc_addr_arg) yann@1: { yann@1: @@ -606,7 +634,14 @@ yann@1: } yann@1: yann@1: # ifndef RTLD_BOOTSTRAP yann@1: -static inline void yann@1: +#if __GNUC__ >= 4 yann@1: + auto inline void yann@1: +#else yann@1: + static inline void yann@1: +#endif yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute ((always_inline)) yann@1: +#endif yann@1: elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, yann@1: void *const reloc_addr_arg) yann@1: { yann@1: @@ -615,7 +650,14 @@ yann@1: } yann@1: # endif yann@1: yann@1: -static inline void yann@1: +#if __GNUC__ >= 4 yann@1: + auto inline void yann@1: +#else yann@1: + static inline void yann@1: +#endif yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute ((always_inline)) yann@1: +#endif yann@1: elf_machine_lazy_rel (struct link_map *map, yann@1: Elf32_Addr l_addr, const Elf32_Rel *reloc) yann@1: {