djdelorie / rpms / glibc

Forked from rpms/glibc 3 years ago
Clone
f60aa2d
diff -urN glibc-2.20.mod/sysdeps/unix/sysv/linux/x86/elision-conf.c glibc-2.20/sysdeps/unix/sysv/linux/x86/elision-conf.c
f60aa2d
--- glibc-2.20.mod/sysdeps/unix/sysv/linux/x86/elision-conf.c	2014-09-27 00:25:46.443462345 -0400
f60aa2d
+++ glibc-2.20/sysdeps/unix/sysv/linux/x86/elision-conf.c	2014-09-27 00:29:53.586615813 -0400
f60aa2d
@@ -62,12 +62,16 @@
f60aa2d
 	      char **argv  __attribute__ ((unused)),
f60aa2d
 	      char **environ)
f60aa2d
 {
f60aa2d
-  __elision_available = HAS_RTM;
f60aa2d
 #ifdef ENABLE_LOCK_ELISION
f60aa2d
+  __elision_available = HAS_RTM;
f60aa2d
   __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
f60aa2d
-#endif
f60aa2d
   if (!HAS_RTM)
f60aa2d
     __elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks */
f60aa2d
+#else
f60aa2d
+  __elision_available = 0;
f60aa2d
+  __pthread_force_elision = 0;
f60aa2d
+  __elision_aconf.retry_try_xbegin = 0;
f60aa2d
+#endif
f60aa2d
 }
f60aa2d
 
f60aa2d
 #ifdef SHARED