public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf: Fix perf annotate

Browse Source 
This command requires objdump, so make sure it can find it.
This commit is contained in:
Eelco Dolstra 2017-06-12 13:19:42 +02:00
parent d8f2284808
commit 63e9d1c51e
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/kernel/perf-binutils-path.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ru -x '*~' linux-4.9.31-orig/tools/perf/util/annotate.c linux-4.9.31/tools/perf/util/annotate.c
--- linux-4.9.31-orig/tools/perf/util/annotate.c 2017-06-07 12:08:04.000000000 +0200
+++ linux-4.9.31/tools/perf/util/annotate.c 2017-06-12 13:10:08.811079574 +0200
@@ -1350,7 +1350,7 @@
"%s %s%s --start-address=0x%016" PRIx64
" --stop-address=0x%016" PRIx64
" -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
- objdump_path ? objdump_path : "objdump",
+ objdump_path ? objdump_path : OBJDUMP_PATH,
disassembler_style ? "-M " : "",
disassembler_style ? disassembler_style : "",
map__rip_2objdump(map, sym->start),

13
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -11,7 +11,9 @@ assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "perf-linux-${kernel.version}"; name = "perf-linux-${kernel.version}";
inherit (kernel) src patches; inherit (kernel) src;
patches = kernel.patches ++ [ ./perf-binutils-path.patch ];
preConfigure = '' preConfigure = ''
cd tools/perf cd tools/perf
@ -30,9 +32,12 @@ stdenv.mkDerivation {
# Note: we don't add elfutils to buildInputs, since it provides a # Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff. # bad `ld' and other stuff.
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE =
"-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" [ "-Wno-error=cpp"
] "-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
]
# gcc before 6 doesn't know these options # gcc before 6 doesn't know these options
++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [
"-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"