yann@1: Fixes yann@1: yann@1: In file included from strcoll.c:101: yann@1: ../locale/weight.h: In function 'strcoll': yann@1: ../locale/weight.h:23: error: invalid storage class for function 'findidx' yann@1: make[2]: *** [/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.2.5/build-glibc/string/strcoll.o] Error 1 yann@1: make[2]: Leaving directory `/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.2.5/glibc-2.2.5/string' yann@1: make[1]: *** [string/subdir_lib] Error 2 yann@1: make[1]: Leaving directory `/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.2.5/glibc-2.2.5' yann@1: make: *** [all] Error 2 yann@1: yann@1: Discussed here yann@1: http://sources.redhat.com/ml/libc-hacker/2004-09/msg00015.html yann@1: the fix checked in to cvs seems to be yann@1: http://sources.redhat.com/ml/glibc-cvs/2004-q3/msg01071.html yann@1: but that fix doesn't support older gcc's, so I can't use it directly. yann@1: yann@1: Here's a fix the does work with older versions of gcc: yann@1: yann@1: --- glibc-2.2.5/locale/weight.h.old 2001-07-05 21:55:33.000000000 -0700 yann@1: +++ glibc-2.2.5/locale/weight.h 2005-03-10 16:07:46.669579888 -0800 yann@1: @@ -18,7 +18,12 @@ yann@1: 02111-1307 USA. */ yann@1: yann@1: /* Find index of weight. */ yann@1: +#if __GNUC__ >= 4 yann@1: +auto inline int32_t yann@1: +__attribute ((always_inline)) yann@1: +#else yann@1: static inline int32_t yann@1: +#endif yann@1: findidx (const unsigned char **cpp) yann@1: { yann@1: int_fast32_t i = table[*(*cpp)++]; yann@1: --- glibc-2.2.5/locale/weightwc.h.old 2001-08-06 21:26:15.000000000 -0700 yann@1: +++ glibc-2.2.5/locale/weightwc.h 2005-03-10 16:13:08.651631176 -0800 yann@1: @@ -18,7 +18,12 @@ yann@1: 02111-1307 USA. */ yann@1: yann@1: /* Find index of weight. */ yann@1: +#if __GNUC__ >= 4 yann@1: +auto inline int32_t yann@1: +__attribute ((always_inline)) yann@1: +#else yann@1: static inline int32_t yann@1: +#endif yann@1: findidx (const wint_t **cpp) yann@1: { yann@1: int32_t i;