23 lines
860 B
Diff
23 lines
860 B
Diff
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
|
|
--- glibc-2.20.mod/sysdeps/unix/sysv/linux/x86/elision-conf.c 2014-09-27 00:25:46.443462345 -0400
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/x86/elision-conf.c 2014-09-27 00:29:53.586615813 -0400
|
|
@@ -62,12 +62,16 @@
|
|
char **argv __attribute__ ((unused)),
|
|
char **environ)
|
|
{
|
|
- __elision_available = HAS_CPU_FEATURE (RTM);
|
|
#ifdef ENABLE_LOCK_ELISION
|
|
+ __elision_available = HAS_CPU_FEATURE (RTM);
|
|
__pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
|
|
-#endif
|
|
if (!HAS_CPU_FEATURE (RTM))
|
|
__elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks */
|
|
+#else
|
|
+ __elision_available = 0;
|
|
+ __pthread_force_elision = 0;
|
|
+ __elision_aconf.retry_try_xbegin = 0;
|
|
+#endif
|
|
}
|
|
|
|
#ifdef SHARED
|