Thanks, applied as 01d53ce9aadc0d9cf73995df821414fa8f13e89d. Michael
[sent from post-receive hook] On Fri, 19 Jan 2024 21:28:10 +0100, Christian Melki <[email protected]> wrote: > A bunch of bugfixes mostly. > https://github.com/libunwind/libunwind/releases/tag/v1.8.0 > > * Remove patchset, included in the release. > > * Rearrange options for a cleaner configure_helper call. > Add disable-nto (neutrino). > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/libunwind-1.7.2/0001-Fix-FTBFS-on-Linux-ppc32.patch > b/patches/libunwind-1.7.2/0001-Fix-FTBFS-on-Linux-ppc32.patch > deleted file mode 100644 > index 687352c9c5dc..000000000000 > --- a/patches/libunwind-1.7.2/0001-Fix-FTBFS-on-Linux-ppc32.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Stephen Webb <[email protected]> > -Date: Fri, 26 May 2023 16:22:08 -0400 > -Subject: [PATCH] Fix FTBFS on Linux ppc32 > - > -Looks like the Linux ucontext structure has changed for PPC at some > -point. This probably needs some kind of version check, or else ancient > -kernels will need to stick with 1.6 or earlier. > ---- > - src/ppc32/ucontext_i.h | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/src/ppc32/ucontext_i.h b/src/ppc32/ucontext_i.h > -index 64f8ed878ad8..ee93c697941c 100644 > ---- a/src/ppc32/ucontext_i.h > -+++ b/src/ppc32/ucontext_i.h > -@@ -44,8 +44,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > SOFTWARE. */ > - //#define MQ_IDX 36 > - #define LINK_IDX 36 > - > --#define _UC_MCONTEXT_GPR(x) ( (void *)&dmy_ctxt.uc_mcontext.gregs[x] - > (void *)&dmy_ctxt) ) > --#define _UC_MCONTEXT_FPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.fpregs[x] - > (void *)&dmy_ctxt) ) > -+#define _UC_MCONTEXT_GPR(x) ( ((void > *)&dmy_ctxt.uc_mcontext.uc_regs->gregs[x] - (void *)&dmy_ctxt) ) > -+#define _UC_MCONTEXT_FPR(x) ( ((void > *)&dmy_ctxt.uc_mcontext.uc_regs->fpregs.fpregs[x] - (void *)&dmy_ctxt) ) > - > - /* These are dummy structures used only for obtaining the offsets of the > - various structure members. */ > diff --git a/patches/libunwind-1.7.2/series b/patches/libunwind-1.7.2/series > deleted file mode 100644 > index a0ed18563622..000000000000 > --- a/patches/libunwind-1.7.2/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Fix-FTBFS-on-Linux-ppc32.patch > -# d4292b5d50e8bb810f28be03e3b69c40 - git-ptx-patches magic > diff --git a/rules/libunwind.make b/rules/libunwind.make > index 8684aa8d0bb6..b1cd40a5835a 100644 > --- a/rules/libunwind.make > +++ b/rules/libunwind.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBUNWIND) += libunwind > # > # Paths and names > # > -LIBUNWIND_VERSION := 1.7.2 > -LIBUNWIND_MD5 := 35799cd8e475d3e157230ad2590c10f1 > +LIBUNWIND_VERSION := 1.8.0 > +LIBUNWIND_MD5 := c66dabc3d032eee8f4053595af7c31cb > LIBUNWIND := libunwind-$(LIBUNWIND_VERSION) > LIBUNWIND_SUFFIX := tar.gz > LIBUNWIND_URL := > https://github.com/libunwind/libunwind/releases/download/v$(LIBUNWIND_VERSION)/$(LIBUNWIND).$(LIBUNWIND_SUFFIX) > @@ -38,20 +38,21 @@ LIBUNWIND_CONF_OPT := \ > --includedir=/usr/include/libunwind \ > --$(call ptx/disen, PTXCONF_ARCH_PPC)-coredump \ > --enable-ptrace \ > + --disable-nto \ > --enable-setjmp \ > - --disable-documentation \ > - --disable-tests \ > --enable-weak-backtrace \ > --enable-unwind-header \ > + --disable-per-thread-cache \ > + --disable-tests \ > --disable-debug \ > --disable-cxx-exceptions \ > + --disable-documentation \ > --enable-debug-frame \ > --enable-block-signals \ > --enable-conservative-checks \ > --disable-msabi-support \ > --disable-minidebuginfo \ > --enable-zlibdebuginfo \ > - --disable-per-thread-cache \ > --without-testdriver > > # > ----------------------------------------------------------------------------
