Merge branch 'perf/urgent' into perf/core

Merge the latest fixes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-03-11 11:53:50 +01:00
parent e65312fe86 b8ad0f912b
commit 0066f3b93e
450 changed files with 4478 additions and 2554 deletions
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@ -503,7 +503,7 @@ else
 endif

 ifeq ($(feature-libbfd), 1)
-  EXTLIBS += -lbfd
+  EXTLIBS += -lbfd -lz -liberty
 endif

 ifdef NO_DEMANGLE
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@ -122,7 +122,7 @@ test-libpython-version.bin:
 	$(BUILD) $(FLAGS_PYTHON_EMBED)

 test-libbfd.bin:
-	$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl
+	$(BUILD) -DPACKAGE='"perf"' -lbfd -lz -liberty -ldl

 test-liberty.bin:
 	$(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty