Sync with upstream master
This commit is contained in:
parent
6223dbf32d
commit
daa5a48a9b
|
@ -5,12 +5,12 @@ diff -urN glibc-2.20.mod/sysdeps/unix/sysv/linux/x86/elision-conf.c glibc-2.20/s
|
|||
char **argv __attribute__ ((unused)),
|
||||
char **environ)
|
||||
{
|
||||
- __elision_available = HAS_RTM;
|
||||
- __elision_available = HAS_CPU_FEATURE (RTM);
|
||||
#ifdef ENABLE_LOCK_ELISION
|
||||
+ __elision_available = HAS_RTM;
|
||||
+ __elision_available = HAS_CPU_FEATURE (RTM);
|
||||
__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 */
|
||||
+#else
|
||||
+ __elision_available = 0;
|
||||
|
|
|
@ -1903,7 +1903,7 @@ index 845629d..fcd45c9 100644
|
|||
start of the 4-word lock structure, the next four words
|
||||
are set all to 1 by the Linuxthreads
|
||||
PTHREAD_COND_INITIALIZER. */
|
||||
- int __lock __attribute__ ((aligned(16)));
|
||||
- int __lock __attribute__ ((__aligned__(16)));
|
||||
+ unsigned int __wseq __attribute__ ((aligned(16)));
|
||||
/* Tracks the initialization of this structure:
|
||||
0 initialized with NPTL PTHREAD_COND_INITIALIZER.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
%define glibcsrcdir glibc-2.21-649-gae5eae7
|
||||
%define glibcversion 2.21.90
|
||||
%define glibcrelease 20%{?dist}
|
||||
%define glibcsrcdir glibc-2.22-63-g37d83a0
|
||||
%define glibcversion 2.22.90
|
||||
%define glibcrelease 1%{?dist}
|
||||
# Pre-release tarballs are pulled in from git using a command that is
|
||||
# effectively:
|
||||
#
|
||||
|
@ -1830,6 +1830,9 @@ rm -f *.filelist*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Aug 14 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.22.90-1
|
||||
- Sync with upstream master.
|
||||
|
||||
* Tue Jul 28 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-20
|
||||
- Sync with upstream master.
|
||||
|
||||
|
|
Loading…
Reference in New Issue