perf tools: Fix unwind build on i386
authorBen Hutchings <ben@decadent.org.uk>
Sat, 22 Jul 2017 16:37:33 +0000 (17:37 +0100)
committerSalvatore Bonaccorso <carnil@debian.org>
Thu, 26 Sep 2019 12:19:06 +0000 (13:19 +0100)
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 <ben@decadent.org.uk>
Gbp-Pq: Topic bugfix/x86
Gbp-Pq: Name perf-tools-fix-unwind-build-on-i386.patch

tools/perf/arch/x86/util/unwind-libunwind.c

index 05920e3edf7a7a060f259ff9086d342ab4c39271..0ed9ceaef0fdf230b379cbc8aaeb09eb16da70ac 100644 (file)
@@ -67,7 +67,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;
@@ -107,7 +107,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;