r6849 - in glibc-package/branches/glibc-2.22/debian: . patches patches/alpha
Author: aurel32
Date: 2015-12-31 00:01:52 +0000 (Thu, 31 Dec 2015)
New Revision: 6849
Removed:
glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-abilist.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
* debian/patches/git-updates.diff: update to the latest commit of the
2.22 branch.
* debian/patches/alpha/submitted-abilist.diff: drop, merged upstream.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-29 23:50:57 UTC (rev 6848)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-31 00:01:52 UTC (rev 6849)
@@ -51,6 +51,9 @@
* debian/testsuite-xfail-debian.mk: allow stdlib/tst-makecontext to fail
on armel and armhf, as it is a new test introduced with glibc 2.22 and
not a regression.
+ * debian/patches/git-updates.diff: update to the latest commit of the
+ 2.22 branch.
+ * debian/patches/alpha/submitted-abilist.diff: drop, merged upstream.
-- Aurelien Jarno <aurel32@debian.org> Thu, 10 Dec 2015 23:41:13 +0100
Deleted: glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-abilist.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-abilist.diff 2015-12-29 23:50:57 UTC (rev 6848)
+++ glibc-package/branches/glibc-2.22/debian/patches/alpha/submitted-abilist.diff 2015-12-31 00:01:52 UTC (rev 6849)
@@ -1,27 +0,0 @@
-2015-12-07 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/alpha/libc.abilist [GLIBC_2.22]: move
- to keep the file sorted.
-
---- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
-+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
-@@ -1822,9 +1822,6 @@ GLIBC_2.17
- GLIBC_2.18
- GLIBC_2.18 A
- __cxa_thread_atexit_impl F
--GLIBC_2.22
-- GLIBC_2.22 A
-- fmemopen F
- GLIBC_2.2
- GLIBC_2.2 A
- _IO_adjust_wcolumn F
-@@ -2015,6 +2012,9 @@ GLIBC_2.2.4
- GLIBC_2.2.6
- GLIBC_2.2.6 A
- __nanosleep F
-+GLIBC_2.22
-+ GLIBC_2.22 A
-+ fmemopen F
- GLIBC_2.3
- GLIBC_2.3 A
- __ctype_b_loc F
Modified: glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff 2015-12-29 23:50:57 UTC (rev 6848)
+++ glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff 2015-12-31 00:01:52 UTC (rev 6849)
@@ -1,10 +1,25 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.22/master from glibc-2.22
diff --git a/ChangeLog b/ChangeLog
-index cb9124e..5c92a3e 100644
+index cb9124e..f77829e 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,240 @@
+@@ -1,3 +1,255 @@
++2015-12-31 Aurelien Jarno <aurelien@aurel32.net>
++
++ * sysdeps/unix/sysv/linux/alpha/libc.abilist [GLIBC_2.22]: Move
++ to keep the file sorted.
++ * sysdeps/unix/sysv/linux/hppa/libc.abilist [GLIBC_2.22]: Likewise.
++
++2015-12-17 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
++
++ [BZ #19174]
++ * sysdeps/powerpc/nptl/elide.h (__elide_lock): Fix usage of
++ .skip_lock_out_of_tbegin_retries.
++ * sysdeps/unix/sysv/linux/powerpc/elision-lock.c
++ (__lll_lock_elision): Likewise, and respect a value of
++ try_tbegin <= 0.
++
+2015-12-03 Andrew Senkevich <andrew.senkevich@intel.com>
+
+ * math/Makefile ($(inst_libdir)/libm.so): Corrected path to
@@ -246,7 +261,7 @@
* version.h (RELEASE): Set to "stable".
diff --git a/NEWS b/NEWS
-index 4c31de7..e100318 100644
+index 4c31de7..e1c1e58 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,16 @@ See the end for copying conditions.
@@ -258,7 +273,7 @@
+* The following bugs are resolved with this release:
+
+ 18589, 18743, 18778, 18781, 18787, 18796, 18870, 18887, 18921, 18928,
-+ 18969, 19018, 19058, 19178.
++ 18969, 19018, 19058, 19174, 19178.
+
+* The LD_POINTER_GUARD environment variable can no longer be used to
+ disable the pointer guard feature. It is always enabled.
@@ -963,7 +978,7 @@
obstack_free (&weightpool, NULL);
diff --git a/math/Makefile b/math/Makefile
-index 6388bae..76f99fb 100644
+index 6388bae..2c9d72d 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -98,7 +98,7 @@ $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
@@ -1691,7 +1706,7 @@
return true;
}
diff --git a/sysdeps/powerpc/nptl/elide.h b/sysdeps/powerpc/nptl/elide.h
-index 389f5a5..12171f4 100644
+index 389f5a5..2e1e443 100644
--- a/sysdeps/powerpc/nptl/elide.h
+++ b/sysdeps/powerpc/nptl/elide.h
@@ -23,67 +23,78 @@
@@ -1706,7 +1721,7 @@
+ otherwise. */
static inline bool
-__elide_lock (uint8_t *adapt_count, int is_lock_free)
-+__get_new_count (uint8_t *adapt_count)
++__get_new_count (uint8_t *adapt_count, int attempt)
{
- if (*adapt_count > 0)
+ /* A persistent failure indicates that a retry will probably
@@ -1751,7 +1766,7 @@
- return false;
+ /* Same logic as above, but for a number of temporary failures in a
+ a row. */
-+ else if (__elision_aconf.skip_lock_out_of_tbegin_retries > 0
++ else if (attempt <= 1 && __elision_aconf.skip_lock_out_of_tbegin_retries > 0
+ && __elision_aconf.try_tbegin > 0)
+ *adapt_count = __elision_aconf.skip_lock_out_of_tbegin_retries;
+ return true;
@@ -1804,7 +1819,7 @@
+ __builtin_tabort (_ABORT_LOCK_BUSY); \
+ } \
+ else \
-+ if (!__get_new_count(&adapt_count)) \
++ if (!__get_new_count (&adapt_count,i)) \
+ break; \
+ } \
+ ret; \
@@ -1837,6 +1852,30 @@
#include <shm-directory.h>
+diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
+index 58c8b32..aa20e22 100644
+--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
++++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
+@@ -1822,9 +1822,6 @@ GLIBC_2.17
+ GLIBC_2.18
+ GLIBC_2.18 A
+ __cxa_thread_atexit_impl F
+-GLIBC_2.22
+- GLIBC_2.22 A
+- fmemopen F
+ GLIBC_2.2
+ GLIBC_2.2 A
+ _IO_adjust_wcolumn F
+@@ -2015,6 +2012,9 @@ GLIBC_2.2.4
+ GLIBC_2.2.6
+ GLIBC_2.2.6 A
+ __nanosleep F
++GLIBC_2.22
++ GLIBC_2.22 A
++ fmemopen F
+ GLIBC_2.3
+ GLIBC_2.3 A
+ __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h b/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
index abde83e..6e73504 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
@@ -1901,6 +1940,30 @@
})
# define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
+diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
+index cf0ad90..224e1f3 100644
+--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
++++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
+@@ -95,9 +95,6 @@ GLIBC_2.18
+ GLIBC_2.19
+ GLIBC_2.19 A
+ fanotify_mark F
+-GLIBC_2.22
+- GLIBC_2.22 A
+- fmemopen F
+ GLIBC_2.2
+ GLIBC_2.2 A
+ _Exit F
+@@ -1863,6 +1860,9 @@ GLIBC_2.2.4
+ GLIBC_2.2.6
+ GLIBC_2.2.6 A
+ __nanosleep F
++GLIBC_2.22
++ GLIBC_2.22 A
++ fmemopen F
+ GLIBC_2.3
+ GLIBC_2.3 A
+ __ctype_b_loc F
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
index 83c0340..9d5c542 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h
@@ -1940,6 +2003,47 @@
return SYSCALL_CANCEL (openat, fd, file, oflag, mode);
}
libc_hidden_def (__OPENAT)
+diff --git a/sysdeps/unix/sysv/linux/powerpc/elision-lock.c b/sysdeps/unix/sysv/linux/powerpc/elision-lock.c
+index 7f9bcc2..c6731ca 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/elision-lock.c
++++ b/sysdeps/unix/sysv/linux/powerpc/elision-lock.c
+@@ -72,8 +72,7 @@ __lll_lock_elision (int *lock, short *adapt_count, EXTRAARG int pshared)
+ goto use_lock;
+ }
+
+- int try_begin = aconf.try_tbegin;
+- while (1)
++ for (int i = aconf.try_tbegin; i > 0; i--)
+ {
+ if (__builtin_tbegin (0))
+ {
+@@ -87,21 +86,19 @@ __lll_lock_elision (int *lock, short *adapt_count, EXTRAARG int pshared)
+ /* A persistent failure indicates that a retry will probably
+ result in another failure. Use normal locking now and
+ for the next couple of calls. */
+- if (try_begin-- <= 0
+- || _TEXASRU_FAILURE_PERSISTENT (__builtin_get_texasru ()))
++ if (_TEXASRU_FAILURE_PERSISTENT (__builtin_get_texasru ()))
+ {
+ if (aconf.skip_lock_internal_abort > 0)
+ *adapt_count = aconf.skip_lock_internal_abort;
+ goto use_lock;
+ }
+- /* Same logic as above, but for for a number of temporary failures
+- in a row. */
+- else if (aconf.skip_lock_out_of_tbegin_retries > 0
+- && aconf.try_tbegin > 0)
+- *adapt_count = aconf.skip_lock_out_of_tbegin_retries;
+ }
+ }
+
++ /* Fall back to locks for a bit if retries have been exhausted */
++ if (aconf.try_tbegin > 0 && aconf.skip_lock_out_of_tbegin_retries > 0)
++ *adapt_count = aconf.skip_lock_out_of_tbegin_retries;
++
+ use_lock:
+ return LLL_LOCK ((*lock), pshared);
+ }
diff --git a/sysdeps/x86/fpu/bits/math-vector.h b/sysdeps/x86/fpu/bits/math-vector.h
index f9e798b..f3bfb86 100644
--- a/sysdeps/x86/fpu/bits/math-vector.h
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-29 23:50:57 UTC (rev 6848)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-31 00:01:52 UTC (rev 6849)
@@ -40,7 +40,6 @@
alpha/local-gcc4.1.diff
alpha/submitted-dl-support.diff
alpha/local-string-functions.diff
-alpha/submitted-abilist.diff
alpha/submitted-fegetenv-namespace.diff
alpha/submitted-termios_h.diff
Reply to: