More patches have been merged upstream, and ensure we reference the upstream revisions for clarity.
Signed-off-by: Ross Burton <[email protected]> --- ...1-tests-Garm64-test-sve-signal-check-that-SVE-is-prese.patch | 2 +- ...2-coredump-use-glibc-or-musl-register-names-as-appropr.patch | 2 +- .../libunwind/libunwind/0005-Handle-musl-on-PPC32.patch | 2 +- meta/recipes-support/libunwind/libunwind/libatomic.patch | 2 +- meta/recipes-support/libunwind/libunwind/mips-byte-order.patch | 2 +- meta/recipes-support/libunwind/libunwind_1.8.3.bb | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-support/libunwind/libunwind/0001-tests-Garm64-test-sve-signal-check-that-SVE-is-prese.patch b/meta/recipes-support/libunwind/libunwind/0001-tests-Garm64-test-sve-signal-check-that-SVE-is-prese.patch index f7af9a3fce0..c1c0b50033e 100644 --- a/meta/recipes-support/libunwind/libunwind/0001-tests-Garm64-test-sve-signal-check-that-SVE-is-prese.patch +++ b/meta/recipes-support/libunwind/libunwind/0001-tests-Garm64-test-sve-signal-check-that-SVE-is-prese.patch @@ -18,7 +18,7 @@ Handle this case by checking HWCAP for SVE support, and skipping the test unless we know it is available. This check is Linux-specific at present, but the logic is easily extended. -Upstream-Status: Backport +Upstream-Status: Backport [c8499e99dc7422a31c126f2954c8150c62d8a017] Signed-off-by: Ross Burton <[email protected]> --- tests/Garm64-test-sve-signal.c | 19 +++++++++++++++++++ diff --git a/meta/recipes-support/libunwind/libunwind/0002-coredump-use-glibc-or-musl-register-names-as-appropr.patch b/meta/recipes-support/libunwind/libunwind/0002-coredump-use-glibc-or-musl-register-names-as-appropr.patch index f458bc3c6f9..4f07f65c8c3 100644 --- a/meta/recipes-support/libunwind/libunwind/0002-coredump-use-glibc-or-musl-register-names-as-appropr.patch +++ b/meta/recipes-support/libunwind/libunwind/0002-coredump-use-glibc-or-musl-register-names-as-appropr.patch @@ -10,7 +10,7 @@ Handle this by using a macro to use the correct names. Closes #708. -Upstream-Status: Backport +Upstream-Status: Backport [df0807c1c2302c364c281d3d1109ddc10c9c7b19] Signed-off-by: Ross Burton <[email protected]> --- src/coredump/_UCD_access_reg_linux.c | 69 ++++++++++++++++------------ diff --git a/meta/recipes-support/libunwind/libunwind/0005-Handle-musl-on-PPC32.patch b/meta/recipes-support/libunwind/libunwind/0005-Handle-musl-on-PPC32.patch index 63d3c85de49..396c0a45333 100644 --- a/meta/recipes-support/libunwind/libunwind/0005-Handle-musl-on-PPC32.patch +++ b/meta/recipes-support/libunwind/libunwind/0005-Handle-musl-on-PPC32.patch @@ -13,7 +13,7 @@ structures. Closes #709. -Upstream-Status: Submitted [https://github.com/libunwind/libunwind/pull/710] +Upstream-Status: Backport [71559717599cecc4d1ccb2061766ec5c12e10ac6] Signed-off-by: Ross Burton <[email protected]> --- src/ppc32/Ginit.c | 13 ++++++++++--- diff --git a/meta/recipes-support/libunwind/libunwind/libatomic.patch b/meta/recipes-support/libunwind/libunwind/libatomic.patch index e783128e2c0..f6abea44a94 100644 --- a/meta/recipes-support/libunwind/libunwind/libatomic.patch +++ b/meta/recipes-support/libunwind/libunwind/libatomic.patch @@ -7,7 +7,7 @@ Some OS runtimes require libatomic be linked in separately to get standard atomic operations to work. Try to detect that at configure time. -Upstream-Status: Submitted [https://github.com/libunwind/libunwind/pull/732/] +Upstream-Status: Denied [https://github.com/libunwind/libunwind/pull/732/] Signed-off-by: Ross Burton <[email protected]> --- configure.ac | 12 ++++++++++++ diff --git a/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch b/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch index 3336b790553..5c73eaf97fe 100644 --- a/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch +++ b/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch @@ -6,7 +6,7 @@ Subject: [PATCH 2/2] byte order endian.h on musl/mips can't be included in __ASSEMBLER__ mode, so use the __BYTE_ORDER__ symbol instead. -Upstream-Status: Submitted [https://github.com/libunwind/libunwind/pull/816] +Upstream-Status: Backport [https://github.com/libunwind/libunwind/commit/b2d2e81e5fe53b01a0dd39e2e634f963ebeaab43] Signed-off-by: Ross Burton <[email protected]> --- src/mips/getcontext.S | 3 +-- diff --git a/meta/recipes-support/libunwind/libunwind_1.8.3.bb b/meta/recipes-support/libunwind/libunwind_1.8.3.bb index 1a3a816d785..27ab122eb34 100644 --- a/meta/recipes-support/libunwind/libunwind_1.8.3.bb +++ b/meta/recipes-support/libunwind/libunwind_1.8.3.bb @@ -52,4 +52,5 @@ BBCLASSEXTEND = "native" # libunwind-1.8.1/src/elfxx.c:205:44: error: passing argument 3 of '_Uppc32_get_func_addr' from incompatible pointer type [-Wincompatible-pointer-types] # libunwind-1.8.1/src/elfxx.c:279:52: error: passing argument 3 of '_Uppc32_get_func_addr' from incompatible pointer type [-Wincompatible-pointer-types] # and others +# Fixed in https://github.com/libunwind/libunwind/commit/43e609e3f37a3c368d3732e43526ea00bd4e3609 CFLAGS:append:powerpc:libc-musl = " -Wno-error=incompatible-pointer-types" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#248679): https://lists.openembedded.org/g/openembedded-core/message/248679 Mute This Topic: https://lists.openembedded.org/mt/121941076/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
