glibc does not build anymore on i686

[Andreas Jaeger <aj at suse dot de>]

In file included from ../posix/sched.h:32,
                 from ../include/sched.h:2,
                 from ../linuxthreads/sysdeps/pthread/pthread.h:20,
                 from ../include/pthread.h:1,
                 from ../linuxthreads/sysdeps/pthread/bits/libc-lock.h:24,
                 from ../sysdeps/generic/ldsodefs.h:38,
                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
                 from ../sysdeps/unix/sysv/linux/init-first.c:30:
../sysdeps/unix/sysv/linux/bits/sched.h:96: error: redefinition of `__cpu_mask'
../sysdeps/unix/sysv/linux/bits/sched.h:96: error: `__cpu_mask' previously declared here
../sysdeps/unix/sysv/linux/bits/sched.h:106: error: conflicting types for `cpu_set_t'
../sysdeps/unix/sysv/linux/bits/sched.h:106: error: previous declaration of `cpu_set_t'
make[2]: *** [/builds/glibc/gcc-3.3/csu/init-first.o] Error 1

The problem is that both these files include bits/sched.h:

./posix/sched.h:#include <bits/sched.h>
./linuxthreads/sysdeps/pthread/bits/pthreadtypes.h:#include <bits/sched.h>

and both files are included.  But why is pthreadtypes.h including
bits/sched.h?  This looks broken since we have:
# error "Never include <bits/sched.h> directly; use <sched.h> instead."

Andreas
-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj