diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index d14dedd1..891e9f3 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 15 15:45:03 UTC 2014 - schwab@suse.de
+
+- add non-elision-enabled libpthread
+
 -------------------------------------------------------------------
 Mon May 12 13:22:40 UTC 2014 - schwab@suse.de
 
diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec
index 89a7165..8b6b3a9 100644
--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@@ -626,17 +626,21 @@ configure_and_build_glibc() {
 	    profile="--enable-profile"
 	fi
 %endif
-	CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
-        CC="$BuildCC" CXX="$BuildCCplus"  ../configure \
+	elision=--enable-lock-elision
+	if [ "$dirname" = "noelision" ]; then
+	    elision=--disable-lock-elision
+	fi
+	../configure \
+		CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
+		CC="$BuildCC" CXX="$BuildCCplus" \
 		--prefix=%{_prefix} \
 		--libexecdir=%{_libexecdir} --infodir=%{_infodir} \
 		--enable-add-ons=nptl$addons \
-	        $profile \
+	        $profile $elision \
 		"$@" \
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif
-		--enable-lock-elision \
 		--build=%{target} --host=%{target} \
 %ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x
 		--enable-multi-arch \
@@ -698,6 +702,10 @@ configure_and_build_glibc() {
 	%endif
 %endif # optimize_power
 
+%ifarch i686 x86_64
+configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
+%endif
+
 #
 # Build html documentation
 #
@@ -799,10 +807,9 @@ do
   else
     cp -a ${lib}.so $destdir/$libbaseso
   fi
-  # Emulate ldconfig
-  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
 done
 cd ..
+cc-base/elf/ldconfig -vn $destdir
 }
 
 # Install power-optimized glibc
@@ -817,7 +824,7 @@ cd ..
 	install_optimized_variant power7 power7 ".."
 	%endif
 	%if %{powerpc_optimize_cpu_cell}
-	install_optimized_variant ppc-cell-be  ppc-cell-be ".."
+	install_optimized_variant ppc-cell-be ppc-cell-be ".."
 	%endif
 	%if %{powerpc_optimize_cpu_power6}
 	# power6 is compatible with power6x
@@ -825,17 +832,23 @@ cd ..
 	if test -d %{buildroot}/%{_lib}/power6; then
 	    mkdir -p %{buildroot}/%{_lib}/power6x
 	    for i in %{buildroot}/%{_lib}/power6/*.so; do
-		b=`basename $i`
-		ln -vs	../power6/$b %{buildroot}/%{_lib}/power6x/$b
-		libbase=${b%.so}
-		libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
-		# Emulate ldconfig
-		ln -sf $libbaseso %{buildroot}/%{_lib}/power6x/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+		b=$(basename $i)
+		ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b
 	    done
+	    cc-base/elf/ldconfig -vn %{buildroot}/%{_lib}/power6x
 	fi
 	%endif
 %endif # optimize_power
 
+%ifarch i686 x86_64
+cd cc-noelision
+destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
+mkdir -p $destdir
+install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
+cd ..
+cc-base/elf/ldconfig -vn $destdir
+%endif
+
 # Install locales
 %if %{build_locales}
 	# XXX Do not install locales in parallel!
@@ -1184,6 +1197,9 @@ exit 0
 		%{optimized_libs ppc-cell-be}
 	%endif
 %endif # optimize_power
+%ifarch i686 x86_64
+/%{_lib}/noelision
+%endif
 %dir %attr(0700,root,root) /var/cache/ldconfig
 /sbin/ldconfig
 %{_bindir}/gencat
@@ -1204,10 +1220,7 @@ exit 0
 %ifarch i586
 %files obsolete
 %defattr (755,root,root,755)
-%dir /%{_lib}/obsolete/
-	%dir /%{_lib}/obsolete/noversion
-	/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so
-	/%{_lib}/obsolete/noversion/libNoVersion.so.1
+/%{_lib}/obsolete
 %endif
 
 %files locale -f libc.lang
diff --git a/glibc-utils.changes b/glibc-utils.changes
index d14dedd1..891e9f3 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 15 15:45:03 UTC 2014 - schwab@suse.de
+
+- add non-elision-enabled libpthread
+
 -------------------------------------------------------------------
 Mon May 12 13:22:40 UTC 2014 - schwab@suse.de
 
diff --git a/glibc-utils.spec b/glibc-utils.spec
index fd7a8f3..8d93109 100644
--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@@ -626,17 +626,21 @@ configure_and_build_glibc() {
 	    profile="--enable-profile"
 	fi
 %endif
-	CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
-        CC="$BuildCC" CXX="$BuildCCplus"  ../configure \
+	elision=--enable-lock-elision
+	if [ "$dirname" = "noelision" ]; then
+	    elision=--disable-lock-elision
+	fi
+	../configure \
+		CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
+		CC="$BuildCC" CXX="$BuildCCplus" \
 		--prefix=%{_prefix} \
 		--libexecdir=%{_libexecdir} --infodir=%{_infodir} \
 		--enable-add-ons=nptl$addons \
-	        $profile \
+	        $profile $elision \
 		"$@" \
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif
-		--enable-lock-elision \
 		--build=%{target} --host=%{target} \
 %ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x
 		--enable-multi-arch \
@@ -698,6 +702,10 @@ configure_and_build_glibc() {
 	%endif
 %endif # optimize_power
 
+%ifarch i686 x86_64
+configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
+%endif
+
 #
 # Build html documentation
 #
@@ -799,10 +807,9 @@ do
   else
     cp -a ${lib}.so $destdir/$libbaseso
   fi
-  # Emulate ldconfig
-  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
 done
 cd ..
+cc-base/elf/ldconfig -vn $destdir
 }
 
 # Install power-optimized glibc
@@ -817,7 +824,7 @@ cd ..
 	install_optimized_variant power7 power7 ".."
 	%endif
 	%if %{powerpc_optimize_cpu_cell}
-	install_optimized_variant ppc-cell-be  ppc-cell-be ".."
+	install_optimized_variant ppc-cell-be ppc-cell-be ".."
 	%endif
 	%if %{powerpc_optimize_cpu_power6}
 	# power6 is compatible with power6x
@@ -825,17 +832,23 @@ cd ..
 	if test -d %{buildroot}/%{_lib}/power6; then
 	    mkdir -p %{buildroot}/%{_lib}/power6x
 	    for i in %{buildroot}/%{_lib}/power6/*.so; do
-		b=`basename $i`
-		ln -vs	../power6/$b %{buildroot}/%{_lib}/power6x/$b
-		libbase=${b%.so}
-		libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
-		# Emulate ldconfig
-		ln -sf $libbaseso %{buildroot}/%{_lib}/power6x/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+		b=$(basename $i)
+		ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b
 	    done
+	    cc-base/elf/ldconfig -vn %{buildroot}/%{_lib}/power6x
 	fi
 	%endif
 %endif # optimize_power
 
+%ifarch i686 x86_64
+cd cc-noelision
+destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
+mkdir -p $destdir
+install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
+cd ..
+cc-base/elf/ldconfig -vn $destdir
+%endif
+
 # Install locales
 %if %{build_locales}
 	# XXX Do not install locales in parallel!
@@ -1184,6 +1197,9 @@ exit 0
 		%{optimized_libs ppc-cell-be}
 	%endif
 %endif # optimize_power
+%ifarch i686 x86_64
+/%{_lib}/noelision
+%endif
 %dir %attr(0700,root,root) /var/cache/ldconfig
 /sbin/ldconfig
 %{_bindir}/gencat
@@ -1204,10 +1220,7 @@ exit 0
 %ifarch i586
 %files obsolete
 %defattr (755,root,root,755)
-%dir /%{_lib}/obsolete/
-	%dir /%{_lib}/obsolete/noversion
-	/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so
-	/%{_lib}/obsolete/noversion/libNoVersion.so.1
+/%{_lib}/obsolete
 %endif
 
 %files locale -f libc.lang
diff --git a/glibc.changes b/glibc.changes
index d14dedd1..891e9f3 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 15 15:45:03 UTC 2014 - schwab@suse.de
+
+- add non-elision-enabled libpthread
+
 -------------------------------------------------------------------
 Mon May 12 13:22:40 UTC 2014 - schwab@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 4bc0abc..f17140d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -626,17 +626,21 @@ configure_and_build_glibc() {
 	    profile="--enable-profile"
 	fi
 %endif
-	CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
-        CC="$BuildCC" CXX="$BuildCCplus"  ../configure \
+	elision=--enable-lock-elision
+	if [ "$dirname" = "noelision" ]; then
+	    elision=--disable-lock-elision
+	fi
+	../configure \
+		CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
+		CC="$BuildCC" CXX="$BuildCCplus" \
 		--prefix=%{_prefix} \
 		--libexecdir=%{_libexecdir} --infodir=%{_infodir} \
 		--enable-add-ons=nptl$addons \
-	        $profile \
+	        $profile $elision \
 		"$@" \
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif
-		--enable-lock-elision \
 		--build=%{target} --host=%{target} \
 %ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x
 		--enable-multi-arch \
@@ -698,6 +702,10 @@ configure_and_build_glibc() {
 	%endif
 %endif # optimize_power
 
+%ifarch i686 x86_64
+configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
+%endif
+
 #
 # Build html documentation
 #
@@ -799,10 +807,9 @@ do
   else
     cp -a ${lib}.so $destdir/$libbaseso
   fi
-  # Emulate ldconfig
-  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
 done
 cd ..
+cc-base/elf/ldconfig -vn $destdir
 }
 
 # Install power-optimized glibc
@@ -817,7 +824,7 @@ cd ..
 	install_optimized_variant power7 power7 ".."
 	%endif
 	%if %{powerpc_optimize_cpu_cell}
-	install_optimized_variant ppc-cell-be  ppc-cell-be ".."
+	install_optimized_variant ppc-cell-be ppc-cell-be ".."
 	%endif
 	%if %{powerpc_optimize_cpu_power6}
 	# power6 is compatible with power6x
@@ -825,17 +832,23 @@ cd ..
 	if test -d %{buildroot}/%{_lib}/power6; then
 	    mkdir -p %{buildroot}/%{_lib}/power6x
 	    for i in %{buildroot}/%{_lib}/power6/*.so; do
-		b=`basename $i`
-		ln -vs	../power6/$b %{buildroot}/%{_lib}/power6x/$b
-		libbase=${b%.so}
-		libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
-		# Emulate ldconfig
-		ln -sf $libbaseso %{buildroot}/%{_lib}/power6x/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+		b=$(basename $i)
+		ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b
 	    done
+	    cc-base/elf/ldconfig -vn %{buildroot}/%{_lib}/power6x
 	fi
 	%endif
 %endif # optimize_power
 
+%ifarch i686 x86_64
+cd cc-noelision
+destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
+mkdir -p $destdir
+install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
+cd ..
+cc-base/elf/ldconfig -vn $destdir
+%endif
+
 # Install locales
 %if %{build_locales}
 	# XXX Do not install locales in parallel!
@@ -1184,6 +1197,9 @@ exit 0
 		%{optimized_libs ppc-cell-be}
 	%endif
 %endif # optimize_power
+%ifarch i686 x86_64
+/%{_lib}/noelision
+%endif
 %dir %attr(0700,root,root) /var/cache/ldconfig
 /sbin/ldconfig
 %{_bindir}/gencat
@@ -1204,10 +1220,7 @@ exit 0
 %ifarch i586
 %files obsolete
 %defattr (755,root,root,755)
-%dir /%{_lib}/obsolete/
-	%dir /%{_lib}/obsolete/noversion
-	/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so
-	/%{_lib}/obsolete/noversion/libNoVersion.so.1
+/%{_lib}/obsolete
 %endif
 
 %files locale -f libc.lang