rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Sync with upstream master

Browse Source
This commit is contained in:
Siddhesh Poyarekar 2015-08-14 12:30:00 +05:30
parent 6223dbf32d
commit daa5a48a9b
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glibc-disable-rwlock-elision.patch
View File

@ -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 **argv __attribute__ ((unused)),
char **environ) char **environ)
{ {
- __elision_available = HAS_RTM; - __elision_available = HAS_CPU_FEATURE (RTM);
#ifdef ENABLE_LOCK_ELISION #ifdef ENABLE_LOCK_ELISION
+ __elision_available = HAS_RTM; + __elision_available = HAS_CPU_FEATURE (RTM);
__pthread_force_elision = __libc_enable_secure ? 0 : __elision_available; __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
-#endif -#endif
if (!HAS_RTM) if (!HAS_CPU_FEATURE (RTM))
__elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks */ __elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks */
+#else +#else
+ __elision_available = 0; + __elision_available = 0;

2
glibc-new-condvar.patch
View File

@ -1903,7 +1903,7 @@ index 845629d..fcd45c9 100644
start of the 4-word lock structure, the next four words start of the 4-word lock structure, the next four words
are set all to 1 by the Linuxthreads are set all to 1 by the Linuxthreads
PTHREAD_COND_INITIALIZER. */ PTHREAD_COND_INITIALIZER. */
- int __lock __attribute__ ((aligned(16))); - int __lock __attribute__ ((__aligned__(16)));
+ unsigned int __wseq __attribute__ ((aligned(16))); + unsigned int __wseq __attribute__ ((aligned(16)));
/* Tracks the initialization of this structure: /* Tracks the initialization of this structure:
0 initialized with NPTL PTHREAD_COND_INITIALIZER. 0 initialized with NPTL PTHREAD_COND_INITIALIZER.

9
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.21-649-gae5eae7 %define glibcsrcdir glibc-2.22-63-g37d83a0
%define glibcversion 2.21.90 %define glibcversion 2.22.90
%define glibcrelease 20%{?dist} %define glibcrelease 1%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -1830,6 +1830,9 @@ rm -f *.filelist*
%endif %endif
%changelog %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 * Tue Jul 28 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-20
- Sync with upstream master. - Sync with upstream master.

2
sources
View File

@ -1 +1 @@
48b648f9f14cf9ffded0841359fc4f20 glibc-2.21-649-gae5eae7.tar.gz 54ff725de33e1fb05de316819a0846dc glibc-2.22-63-g37d83a0.tar.gz