From 54dff050027d5b9d20ff034b12bcacdfc010fa25 Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 31 Mar 2021 22:28:01 +0800 Subject: glib-2.0: upgrade 2.66.7 -> 2.68.0 the following patches are refreshed: 0001-Set-host_machine-correctly-when-building-with-mingw3.patch 0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch 0001-tests-codegen.py-removing-unecessary-print-statement.patch relocate-modules.patch the following patches are removed since they are included in 2.68.0: 0001-gobject-Drop-use-of-volatile-from-get_type-macros.patch 0002-tests-Fix-non-atomic-access-to-a-shared-variable.patch 0003-tests-Fix-non-atomic-access-to-a-shared-variable.patch 0004-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0005-tests-Fix-non-atomic-access-to-some-shared-variables.patch 0006-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0007-gdbusconnection-Drop-unnecessary-volatile-qualifiers.patch 0008-gdbuserror-Drop-unnecessary-volatile-qualifiers-from.patch 0009-gio-Drop-unnecessary-volatile-qualifiers-from-intern.patch 0010-kqueue-Fix-unlocked-access-to-shared-variable.patch 0011-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0012-tests-Fix-non-atomic-access-to-some-shared-variables.patch 0013-gatomic-Drop-unnecessary-volatile-qualifiers-from-in.patch 0014-gatomic-Drop-unnecessary-volatile-qualifiers-from-ma.patch 0015-glib-Drop-unnecessary-volatile-qualifiers-from-inter.patch 0016-gobject-Drop-unnecessary-volatile-qualifiers-from-in.patch 0017-gmessages-Drop-unnecessary-volatile-qualifiers-from-.patch 0018-gtypes-Drop-volatile-qualifier-from-gatomicrefcount.patch 0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch 0020-gobject-Drop-volatile-qualifier-from-GObject.ref_cou.patch 0021-tests-Drop-unnecessary-volatile-qualifiers-from-test.patch 0022-build-Drop-unnecessary-volatile-qualifiers-from-conf.patch 0023-gdbusprivate-Avoid-a-warning-about-a-statement-with-.patch 0024-tests-Add-comment-to-volatile-atomic-tests.patch 0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch 0026-gtype-Fix-some-typos-in-comments.patch 0027-gtype-Add-some-missing-atomic-accesses-to-init_state.patch 0028-gresource-Fix-a-pointer-mismatch-with-an-atomic-load.patch 0029-docs-Document-not-to-use-volatile-qualifiers.patch (From OE-Core rev: fde4cb18e28e98f934c0742292f7ec183a568233) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...-g_atomic-primitives-correctly-in-destruc.patch | 77 ---------------------- 1 file changed, 77 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch b/meta/recipes-core/glib-2.0/glib-2.0/0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch deleted file mode 100644 index c15a3b8a57..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0025-gthread-Use-g_atomic-primitives-correctly-in-destruc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 6bd0a4b29753570a2c20b61b5ad2c0068567b7b6 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Mon, 16 Nov 2020 16:44:29 +0000 -Subject: [PATCH 25/29] gthread: Use g_atomic() primitives correctly in - destructor list -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In the Windows destructor list, consistently access -`g_private_destructors` using atomic primitives. - -`g_atomic_pointer_compare_and_exchange()` should be equivalent to -`InterlockedCompareExchangePointer()`, but is a bit more understandable -in a general GLib context, and pairs with `g_atomic_pointer_get()`. (I -can’t find a Windows API equivalent for that.) - -Signed-off-by: Philip Withnall - -Helps: #600 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] ---- - glib/gthread-win32.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c -index 0c37dc6c1..20aca6fa1 100644 ---- a/glib/gthread-win32.c -+++ b/glib/gthread-win32.c -@@ -301,7 +301,7 @@ struct _GPrivateDestructor - GPrivateDestructor *next; - }; - --static GPrivateDestructor * volatile g_private_destructors; -+static GPrivateDestructor *g_private_destructors; /* (atomic) prepend-only */ - static CRITICAL_SECTION g_private_lock; - - static DWORD -@@ -329,7 +329,7 @@ g_private_get_impl (GPrivate *key) - g_thread_abort (errno, "malloc"); - destructor->index = impl; - destructor->notify = key->notify; -- destructor->next = g_private_destructors; -+ destructor->next = g_atomic_pointer_get (&g_private_destructors); - - /* We need to do an atomic store due to the unlocked - * access to the destructor list from the thread exit -@@ -337,13 +337,14 @@ g_private_get_impl (GPrivate *key) - * - * It can double as a sanity check... - */ -- if (InterlockedCompareExchangePointer (&g_private_destructors, destructor, -- destructor->next) != destructor->next) -+ if (!g_atomic_pointer_compare_and_exchange (&g_private_destructors, -+ destructor->next, -+ destructor)) - g_thread_abort (0, "g_private_get_impl(1)"); - } - - /* Ditto, due to the unlocked access on the fast path */ -- if (InterlockedCompareExchangePointer (&key->p, impl, NULL) != NULL) -+ if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, impl)) - g_thread_abort (0, "g_private_get_impl(2)"); - } - LeaveCriticalSection (&g_private_lock); -@@ -635,7 +636,7 @@ g_thread_win32_thread_detach (void) - */ - dtors_called = FALSE; - -- for (dtor = g_private_destructors; dtor; dtor = dtor->next) -+ for (dtor = g_atomic_pointer_get (&g_private_destructors); dtor; dtor = dtor->next) - { - gpointer value; - --- -2.30.1 - -- cgit v1.2.3-54-g00ecf