From 192ee88a05cc00b8886068bdd5e47547fe302728 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 22 Jul 2017 17:41:53 +0100 Subject: [PATCH] [i386] perf tools: Fix unwind build (fixes FTBFS) --- debian/changelog | 1 + .../perf-tools-fix-unwind-build-on-i386.patch | 35 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch diff --git a/debian/changelog b/debian/changelog index ef8d69318..b7024ff97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (4.12.2-1~exp2) UNRELEASED; urgency=medium * [mips*/octeon] Fix broken EDAC driver (fixes FTBFS) * [armhf] Revert "gpu: host1x: Add IOMMU support" * [armhf] udeb: Replace imx-ipuv3-crtc with imxdrm in fb-modules + * [i386] perf tools: Fix unwind build (fixes FTBFS) -- Ben Hutchings Tue, 18 Jul 2017 13:26:41 +0100 diff --git a/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch b/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch new file mode 100644 index 000000000..f9baa7bd3 --- /dev/null +++ b/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch @@ -0,0 +1,35 @@ +From: Ben Hutchings +Date: Sat, 22 Jul 2017 17:37:33 +0100 +Subject: perf tools: Fix unwind build on i386 +Forwarded: no + +EINVAL may not be defined when building unwind-libunwind.c with +REMOTE_UNWIND_LIBUNWIND, resulting in a compiler error in +LIBUNWIND__ARCH_REG_ID(). Its only caller, access_reg(), only checks +for a negative return value and doesn't care what it is. So change +-EINVAL to -1. + +Fixes: 52ffe0ff02fc ("Support x86(32-bit) cross platform callchain unwind.") +Signed-off-by: Ben Hutchings +--- + +--- a/tools/perf/arch/x86/util/unwind-libunwind.c ++++ b/tools/perf/arch/x86/util/unwind-libunwind.c +@@ -66,7 +66,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum) + break; + default: + pr_err("unwind: invalid reg id %d\n", regnum); +- return -EINVAL; ++ return -1; + } + + return id; +@@ -106,7 +106,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum) + break; + default: + pr_err("unwind: invalid reg id %d\n", regnum); +- return -EINVAL; ++ return -1; + } + + return id; diff --git a/debian/patches/series b/debian/patches/series index 83537a657..b9c3bcd87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -61,6 +61,7 @@ bugfix/x86/platform-x86-ideapad-laptop-add-ideapad-v510-15ikb-t.patch bugfix/x86/platform-x86-ideapad-laptop-add-several-models-to-no.patch bugfix/mips/mips-octeon-fix-broken-edac-driver.patch debian/revert-gpu-host1x-add-iommu-support.patch +bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch # Arch features features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch