patches/glibc/2.3.3/glibc-2.3.3-allow-gcc-4.0-elf-2.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jul 28 21:34:41 2007 +0000 (2007-07-28)
changeset 301 2be7232a73ac
permissions -rw-r--r--
Bump version to 0.2.2.
     1 Fixes
     2 
     3 In file included from dynamic-link.h:310,
     4                  from dl-reloc.c:265:
     5 do-rel.h:56: error: invalid storage class for function 'elf_dynamic_do_rela'
     6 In file included from dl-reloc.c:265:
     7 dynamic-link.h: In function '_dl_relocate_object':
     8 dynamic-link.h:33: error: invalid storage class for function 'elf_get_dynamic_info'
     9 
    10 when building glibc-2.3.3 with gcc-4.0
    11 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
    12 but works with older compilers, too
    13 
    14 --- glibc-2.3.3/elf/do-rel.h.old	2005-03-16 13:09:37.000000000 -0800
    15 +++ glibc-2.3.3/elf/do-rel.h	2005-03-16 13:10:50.000000000 -0800
    16 @@ -49,7 +49,14 @@
    17     relocations; they should be set up to call _dl_runtime_resolve, rather
    18     than fully resolved now.  */
    19  
    20 -static inline void __attribute__ ((always_inline))
    21 +#if __GNUC__ >= 4
    22 +  auto inline void
    23 +#else
    24 +  static inline void
    25 +#endif
    26 +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
    27 +  __attribute ((always_inline))
    28 +#endif
    29  elf_dynamic_do_rel (struct link_map *map,
    30  		    ElfW(Addr) reladdr, ElfW(Addr) relsize,
    31  		    int lazy)
    32 --- glibc-2.3.3/elf/dynamic-link.h.old	2005-03-16 13:22:35.000000000 -0800
    33 +++ glibc-2.3.3/elf/dynamic-link.h	2005-03-16 13:26:23.000000000 -0800
    34 @@ -27,8 +27,17 @@
    35  
    36  
    37  /* Read the dynamic section at DYN and fill in INFO with indices DT_*.  */
    38 -
    39 -static inline void __attribute__ ((unused, always_inline))
    40 +#if !defined(RESOLVE) || __GNUC__ < 4
    41 +static
    42 +#else
    43 +auto
    44 +#endif
    45 +inline void 
    46 +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
    47 +  __attribute__ ((unused, always_inline))
    48 +#else
    49 +  __attribute__ ((unused))
    50 +#endif
    51  elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
    52  {
    53    ElfW(Dyn) *dyn = l->l_ld;