Fix locale/weight.h with GCC 3.5

[Andreas Jaeger]

On Monday 06 September 2004 20:51, Andreas Jaeger wrote:
> Compiling glibc with GCC 3.5 I got the following failure:
>
> In file included from strcoll_l.c:87:
> ../locale/weight.h: In function `__strcoll_l':
> ../locale/weight.h:24: error: invalid storage class for function `findidx'
> make[2]: *** [/builds/glibc/3.5/string/strcoll_l.o] Error 1
> make[2]: Leaving directory `/cvs/libc/string'
>
> Since we include weight.h in block scope, we have to remove the static to
> make it work with GCC 3.5 (see
> http://gcc.gnu.org/ml/gcc-patches/2004-08/msg02641.html).  There are some
> more places that fail similiar.
>
> Ok to commit the appended patch?
>
> There're some more places like this - expect a followup-email tomorrow,

This is a mess - if I change elf/dynamic-link.h in a similar way  (see below) 
I finally get:

/builds/glibc/3.5/elf/dl-load.os(.text+0x0): In function 
`elf_get_dynamic_info':
/cvs/libc/elf/dynamic-link.h:70: multiple definition of `elf_get_dynamic_info'
/builds/glibc/3.5/elf/rtld.os(.text+0x40):/cvs/libc/elf/dynamic-link.h:70: 
firstdefined here

Any ideas?

Andreas

============================================================
Index: elf/dynamic-link.h
--- elf/dynamic-link.h 6 Mar 2004 09:47:17 -0000 1.50
+++ elf/dynamic-link.h 6 Sep 2004 19:22:03 -0000
@@ -65,7 +65,7 @@ elf_machine_lazy_rel (struct link_map *m
 
 /* Read the dynamic section at DYN and fill in INFO with indices DT_*.  */
 
-static inline void __attribute__ ((unused, always_inline))
+inline void __attribute__ ((unused, always_inline))
 elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
 {
   ElfW(Dyn) *dyn = l->l_ld;


-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux AG, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/libc-hacker/attachments/20040906/8939f707/attachment.sig>