summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-08-01 07:47:16 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-05 15:11:05 -0700
commitbb6d1127bc82f9934a9a2f787806f7e61855e84c (patch)
tree6339ed446b828a9805616089769c97ad2ac695e8
parent76bb0f55a965cd17faffbca3616afb6209090dac (diff)
downloadglibc-hjl/cpuid/2.22.tar.gz
Update x86 elision-conf.c for <cpu-features.h>hjl/cpuid/2.22
This patch updates x86 elision-conf.c to use the newly defined HAS_CPU_FEATURE from <cpu-features.h>. * sysdeps/unix/sysv/linux/x86/elision-conf.c (elision_init): Replace HAS_RTM with HAS_CPU_FEATURE (RTM).
-rw-r--r--sysdeps/unix/sysv/linux/x86/elision-conf.c4
1 files 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 */
}