r6727 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any
Author: aurel32
Date: 2015-12-01 22:32:37 +0000 (Tue, 01 Dec 2015)
New Revision: 6727
Removed:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-mangle-tls_dtor_list.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/cvs-mangle-tls_dtor_list.diff: Upstream.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-01 21:49:15 UTC (rev 6726)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-01 22:32:37 UTC (rev 6727)
@@ -74,6 +74,7 @@
* debian/patches/any/cvs-rfc3542-advanced-api.diff: Upstreamed.
* debian/patches/any/cvs-check-localplt.diff: Upstreamed.
* debian/patches/any/cvs-ld_pointer_guard.diff: Upstreamed.
+ * debian/patches/any/cvs-mangle-tls_dtor_list.diff: Upstream.
-- Adam Conrad <adconrad@0c3.net> Tue, 15 Sep 2015 17:57:41 -0600
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/cvs-mangle-tls_dtor_list.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/cvs-mangle-tls_dtor_list.diff 2015-12-01 21:49:15 UTC (rev 6726)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/cvs-mangle-tls_dtor_list.diff 2015-12-01 22:32:37 UTC (rev 6727)
@@ -1,35 +0,0 @@
-2015-10-06 Florian Weimer <fweimer@redhat.com>
-
- [BZ #19018]
- * stdlib/cxa_thread_atexit_impl.c (__cxa_thread_atexit_impl):
- Mangle function pointer before storing it.
- (__call_tls_dtors): Demangle function pointer before calling it.
-
---- a/stdlib/cxa_thread_atexit_impl.c
-+++ b/stdlib/cxa_thread_atexit_impl.c
-@@ -98,6 +98,10 @@ static __thread struct link_map *lm_cache;
- int
- __cxa_thread_atexit_impl (dtor_func func, void *obj, void *dso_symbol)
- {
-+#ifdef PTR_MANGLE
-+ PTR_MANGLE (func);
-+#endif
-+
- /* Prepend. */
- struct dtor_list *new = calloc (1, sizeof (struct dtor_list));
- new->func = func;
-@@ -142,9 +146,13 @@ __call_tls_dtors (void)
- while (tls_dtor_list)
- {
- struct dtor_list *cur = tls_dtor_list;
-+ dtor_func func = cur->func;
-+#ifdef PTR_DEMANGLE
-+ PTR_DEMANGLE (func);
-+#endif
-
- tls_dtor_list = tls_dtor_list->next;
-- cur->func (cur->obj);
-+ func (cur->obj);
-
- /* Ensure that the MAP dereference happens before
- l_tls_dtor_count decrement. That way, we protect this access from a
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-01 21:49:15 UTC (rev 6726)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-01 22:32:37 UTC (rev 6727)
@@ -239,4 +239,3 @@
any/submitted-resolv-ipv6-nameservers.diff
any/local-static-dlopen-search-path.diff
any/local-math-logb.diff
-any/cvs-mangle-tls_dtor_list.diff
Reply to: