yann@1: Fixes yann@1: yann@1: In file included from dynamic-link.h:310, yann@1: from dl-reloc.c:265: yann@1: do-rel.h:56: error: invalid storage class for function 'elf_dynamic_do_rela' yann@1: In file included from dl-reloc.c:265: yann@1: dynamic-link.h: In function '_dl_relocate_object': yann@1: dynamic-link.h:33: error: invalid storage class for function 'elf_get_dynamic_info' yann@1: yann@1: when building glibc-2.3.3 with gcc-4.0 yann@1: 2nd hunk is like http://sourceware.org/cgi-bin/cvsweb.cgi/libc/elf/dynamic-link.h.diff?r1=1.50&r2=1.51&cvsroot=glibc yann@1: but works with older compilers, too yann@1: yann@1: --- glibc-2.3.3/elf/do-rel.h.old 2005-03-16 13:09:37.000000000 -0800 yann@1: +++ glibc-2.3.3/elf/do-rel.h 2005-03-16 13:10:50.000000000 -0800 yann@1: @@ -49,7 +49,14 @@ yann@1: relocations; they should be set up to call _dl_runtime_resolve, rather yann@1: than fully resolved now. */ yann@1: yann@1: -static inline void __attribute__ ((always_inline)) 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_dynamic_do_rel (struct link_map *map, yann@1: ElfW(Addr) reladdr, ElfW(Addr) relsize, yann@1: int lazy) yann@1: --- glibc-2.3.3/elf/dynamic-link.h.old 2005-03-16 13:22:35.000000000 -0800 yann@1: +++ glibc-2.3.3/elf/dynamic-link.h 2005-03-16 13:26:23.000000000 -0800 yann@1: @@ -27,8 +27,17 @@ yann@1: yann@1: yann@1: /* Read the dynamic section at DYN and fill in INFO with indices DT_*. */ yann@1: - yann@1: -static inline void __attribute__ ((unused, always_inline)) yann@1: +#if !defined(RESOLVE) || __GNUC__ < 4 yann@1: +static yann@1: +#else yann@1: +auto yann@1: +#endif yann@1: +inline void yann@1: +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) yann@1: + __attribute__ ((unused, always_inline)) yann@1: +#else yann@1: + __attribute__ ((unused)) yann@1: +#endif yann@1: elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) yann@1: { yann@1: ElfW(Dyn) *dyn = l->l_ld;