From 3d497ce3d1ab11a363c543b42737a0696329ed40 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 1 Aug 2015 07:47:16 -0700 Subject: Update x86 elision-conf.c for This patch updates x86 elision-conf.c to use the newly defined HAS_CPU_FEATURE from . * sysdeps/unix/sysv/linux/x86/elision-conf.c (elision_init): Replace HAS_RTM with HAS_CPU_FEATURE (RTM). --- sysdeps/unix/sysv/linux/x86/elision-conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/x86/elision-conf.c b/sysdeps/unix/sysv/linux/x86/elision-conf.c index 84902aca3c..4a73382975 100644 --- a/sysdeps/unix/sysv/linux/x86/elision-conf.c +++ b/sysdeps/unix/sysv/linux/x86/elision-conf.c @@ -62,11 +62,11 @@ elision_init (int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)), char **environ) { - __elision_available = HAS_RTM; + __elision_available = HAS_CPU_FEATURE (RTM); #ifdef ENABLE_LOCK_ELISION __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available; #endif - if (!HAS_RTM) + if (!HAS_CPU_FEATURE (RTM)) __elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks */ } -- cgit 1.4.1