2d1a45ccb1
The lock elision support in glibc has a runtime check even if the build option is disabled. This patch from Fedora completely disables that check if the build option is disabled, and we disable this now.
24 lines
765 B
Diff
24 lines
765 B
Diff
Taken from Fedora, disable the lock elision run time check if it's not enabled
|
|
at build time.
|
|
|
|
--- sysdeps/unix/sysv/linux/x86/elision-conf.c 2014-09-27 00:25:46.443462345 -0400
|
|
+++ 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_RTM;
|
|
#ifdef ENABLE_LOCK_ELISION
|
|
+ __elision_available = HAS_RTM;
|
|
__pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
|
|
-#endif
|
|
if (!HAS_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
|