commit: c8d170da873918e7969852ffdd48ff2904f65432 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Jul 7 07:12:49 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Jul 7 09:39:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d170da
sys-libs/libunwind: fix ABI_X86=x32 build Reported-by: Jan Ziak Closes: https://bugs.gentoo.org/614374 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-libs/libunwind/files/libunwind-1.5.0-x32.patch | 17 +++++++++++++++++ sys-libs/libunwind/libunwind-1.5.0-r1.ebuild | 1 + 2 files changed, 18 insertions(+) diff --git a/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch b/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch new file mode 100644 index 00000000000..a3bbc81f45b --- /dev/null +++ b/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/614374 + +From: kasperk81 <83082615+kasper...@users.noreply.github.com> +Date: Wed, 30 Jun 2021 23:23:22 +0000 +Subject: [PATCH] Fix -mx32 compilation error + +--- a/src/x86_64/Gos-linux.c ++++ b/src/x86_64/Gos-linux.c +@@ -149,7 +149,7 @@ x86_64_sigreturn (unw_cursor_t *cursor) + __asm__ __volatile__ ("mov %0, %%rsp;" + "mov %1, %%rax;" + "syscall" +- :: "r"(sc), "i"(SYS_rt_sigreturn) ++ :: "r"((uint64_t)sc), "i"(SYS_rt_sigreturn) + : "memory"); + abort(); + } diff --git a/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild b/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild index ae510ed27fe..082fdab6ed8 100644 --- a/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild +++ b/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild @@ -49,6 +49,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092 "${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch "${FILESDIR}"/${PN}-1.2-ia64-missing.patch + "${FILESDIR}"/${PN}-1.5.0-x32.patch # needs refresh: #"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch )
