From b93f7e023b8a7db34bb45bc5e3da4b0e24f85956 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 19 Oct 2019 10:54:48 +0200 Subject: community/linux-tools: fixed perf for 32-bit --- community/linux-tools/PKGBUILD | 4 +++ community/linux-tools/linux-perf-32bit.patch | 38 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 community/linux-tools/PKGBUILD create mode 100644 community/linux-tools/linux-perf-32bit.patch diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD new file mode 100644 index 00000000..caae129d --- /dev/null +++ b/community/linux-tools/PKGBUILD @@ -0,0 +1,4 @@ +# fixed in git upstream + +source+=('linux-perf-32bit.patch') +sha256sums+=('5a591dca42c880025c5cbc5cdff653dffd3f17507ce8ae24c9ab8b5f6c6b49b4') diff --git a/community/linux-tools/linux-perf-32bit.patch b/community/linux-tools/linux-perf-32bit.patch new file mode 100644 index 00000000..2509af9e --- /dev/null +++ b/community/linux-tools/linux-perf-32bit.patch @@ -0,0 +1,38 @@ +diff -rauN linux/tools/perf/builtin-diff.c linux-perf-32bit-patch/tools/perf/builtin-diff.c +--- linux/tools/perf/builtin-diff.c 2019-10-19 09:21:45.437624632 +0200 ++++ linux-perf-32bit-patch/tools/perf/builtin-diff.c 2019-10-19 09:24:12.785436727 +0200 +@@ -570,8 +570,8 @@ + if (!pairs_left && !pairs_right) + return 0; + +- l = labs(left->diff.cycles); +- r = labs(right->diff.cycles); ++ l = llabs(left->diff.cycles); ++ r = llabs(right->diff.cycles); + return r - l; + } + +diff -rauN linux/tools/perf/util/session.c linux-perf-32bit-patch/tools/perf/util/session.c +--- linux/tools/perf/util/session.c 2019-10-19 09:21:45.460958163 +0200 ++++ linux-perf-32bit-patch/tools/perf/util/session.c 2019-10-19 09:24:36.045600477 +0200 +@@ -82,7 +82,7 @@ + session->decomp_last = decomp; + } + +- pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size); ++ pr_debug("decomp (B): %zu to %zu\n", src_size, decomp_size); + + return 0; + } +diff -rauN linux/tools/perf/util/zstd.c linux-perf-32bit-patch/tools/perf/util/zstd.c +--- linux/tools/perf/util/zstd.c 2019-10-19 09:20:56.380528776 +0200 ++++ linux-perf-32bit-patch/tools/perf/util/zstd.c 2019-10-19 09:25:09.285827427 +0200 +@@ -99,7 +99,7 @@ + while (input.pos < input.size) { + ret = ZSTD_decompressStream(data->dstream, &output, &input); + if (ZSTD_isError(ret)) { +- pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n", ++ pr_err("failed to decompress (B): %zu -> %zu, dst_size %zu : %s\n", + src_size, output.size, dst_size, ZSTD_getErrorName(ret)); + break; + } -- cgit v1.2.3-70-g09d2