no multiarch build issues

[Andi Kleen]

On Tue, Jul 02, 2013 at 11:13:20PM +0200, Markus Trippelsdorf wrote:
> On 2013.07.02 at 22:43 +0200, Markus Trippelsdorf wrote:
> > On 2013.07.02 at 22:35 +0200, Andi Kleen wrote:
> > > > Unfortunately no:
> > > > 
> > > > ../nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c:21:23: fatal error:
> > > > init-arch.h: No such file or directory
> > > 
> > > Odd. What distribution is that? Are you building without multiarch?
> > 
> > Gentoo without multiarch:
> > 
> >  ~/glibc/configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
> >  --with-headers=/usr/include --enable-add-ons=nptl,libidn
> >  --enable-kernel=3.9 --with-tls --with-__thread --enable-bind-now
> >  --without-gd --without-cvs --disable-profile --disable-multi-arch
> > 
> > The following patch fixes the issue above:
> > 
> > diff --git a/nptl/sysdeps/unix/sysv/linux/x86/Makefile b/nptl/sysdeps/unix/sysv/linux/x86/Makefile
> > index 61b7552..a361578 100644
> > --- a/nptl/sysdeps/unix/sysv/linux/x86/Makefile
> > +++ b/nptl/sysdeps/unix/sysv/linux/x86/Makefile
> > @@ -1,3 +1,6 @@
> > -libpthread-sysdep_routines += init-arch
> > +CFLAGS-elision-lock.c = -I../sysdeps/x86_64/multiarch
> > +CFLAGS-elision-unlock.c = -I../sysdeps/x86_64/multiarch
> > +CFLAGS-elision-timed.c = -I../sysdeps/x86_64/multiarch
> > +CFLAGS-elision-trylock.c = -I../sysdeps/x86_64/multiarch
> >  libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
> >  			      elision-trylock
> > 
> > But the build now fails later:
> > 
> > /var/tmp/glibc-build/nptl/libpthread_pic.a(elision-lock.os): In function
> > `elision_init':
> > /home/markus/glibc/nptl/../nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c:73:
> > undefined reference to `__get_cpu_features'
> > collect2: error: ld returned 1 exit status
> > make[2]: *** [/var/tmp/glibc-build/nptl/libpthread.so] Error 1
> 
> This is fixed by the following patch. Glibc now builds without errors.

But you just didn't specify --enable-lock-elision right?

I don't think that's the correct fix, it is now completely disabled.

> 
> diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
> index 118cfa7..5fa2268 100644
> --- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
> +++ b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
> @@ -70,8 +70,8 @@ elision_init (int argc __attribute__ ((unused)),
>  	      char **argv  __attribute__ ((unused)),
>  	      char **environ)
>  {
> -  __elision_available = HAS_RTM;
>  #ifdef ENABLE_LOCK_ELISION
> +  __elision_available = HAS_RTM;
>    __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
>    __rwlock_rtm_enabled = __libc_enable_secure ? 0 : __elision_available;
>  #endif
> -- 
> Markus
> 

-- 
ak@linux.intel.com -- Speaking for myself only.