This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Get rid of __elision_available
- From: Andreas Schwab <schwab at suse dot de>
- To: libc-alpha at sourceware dot org
- Date: Mon, 05 Dec 2016 12:19:00 +0100
- Subject: [PATCH] Get rid of __elision_available
- Authentication-results: sourceware.org; auth=none
There is nothing that uses that variable.
Andreas.
* sysdeps/unix/sysv/linux/x86/elision-conf.h
(__elision_available): Don't declare.
* sysdeps/unix/sysv/linux/x86/elision-conf.c
(__elision_available): Don't define.
(elision_init): Don't set __elision_available.
---
sysdeps/unix/sysv/linux/x86/elision-conf.c | 11 +++--------
sysdeps/unix/sysv/linux/x86/elision-conf.h | 1 -
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/x86/elision-conf.c b/sysdeps/unix/sysv/linux/x86/elision-conf.c
index 0d98133804..c8e77a64ee 100644
--- a/sysdeps/unix/sysv/linux/x86/elision-conf.c
+++ b/sysdeps/unix/sysv/linux/x86/elision-conf.c
@@ -43,11 +43,6 @@ struct elision_config __elision_aconf =
.skip_trylock_internal_abort = 3,
};
-/* Set when the CPU supports elision. When false elision is never attempted.
- */
-
-int __elision_available attribute_hidden;
-
/* Force elision for all new locks. This is used to decide whether existing
DEFAULT locks should be automatically upgraded to elision in
pthread_mutex_lock(). Disabled for suid programs. Only used when elision
@@ -62,11 +57,11 @@ elision_init (int argc __attribute__ ((unused)),
char **argv __attribute__ ((unused)),
char **environ)
{
- __elision_available = HAS_CPU_FEATURE (RTM);
+ int elision_available = HAS_CPU_FEATURE (RTM);
#ifdef ENABLE_LOCK_ELISION
- __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
+ __pthread_force_elision = __libc_enable_secure ? 0 : elision_available;
#endif
- if (!HAS_CPU_FEATURE (RTM))
+ if (!elision_available)
__elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks */
}
diff --git a/sysdeps/unix/sysv/linux/x86/elision-conf.h b/sysdeps/unix/sysv/linux/x86/elision-conf.h
index 6c479b31e7..39bf5d9dd7 100644
--- a/sysdeps/unix/sysv/linux/x86/elision-conf.h
+++ b/sysdeps/unix/sysv/linux/x86/elision-conf.h
@@ -33,7 +33,6 @@ struct elision_config
extern struct elision_config __elision_aconf attribute_hidden;
-extern int __elision_available attribute_hidden;
extern int __pthread_force_elision attribute_hidden;
/* Tell the test suite to test elision for this architecture. */
--
2.11.0
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."