arrfab / rpms / glibc

Forked from rpms/glibc 4 years ago
Clone

Blame SOURCES/glibc-rh1505492-unused-15.patch

147e83
Declare elision_available in elision_init under the preprocessor
147e83
conditional, to avoid an unused variable warning.
147e83
147e83
Upstream, this has been obsoleted by other elision-related changes.
147e83
147e83
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
147e83
index 69b4fa4c66e89bc6..cc5efb811352adf1 100644
147e83
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
147e83
+++ b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
147e83
@@ -66,8 +66,8 @@ elision_init (int argc __attribute__ ((unused)),
147e83
 	      char **argv  __attribute__ ((unused)),
147e83
 	      char **environ)
147e83
 {
147e83
-  int elision_available = HAS_CPU_FEATURE (RTM);
147e83
 #ifdef ENABLE_LOCK_ELISION
147e83
+  int elision_available = HAS_CPU_FEATURE (RTM);
147e83
   if (!__libc_enable_secure && elision_available)
147e83
     {
147e83
       /* RHEL 7 specific change: Check if elision is enabled for the