4 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile
index fe9b61e322a5..67e9b3d38e89 100644
--- a/tools/perf/arch/arm/Makefile
+++ b/tools/perf/arch/arm/Makefile
@@ -3,5 +3,5 @@ PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 endif
 ifndef NO_LIBUNWIND
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
 endif
diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c
index da3dc950550c..da3dc950550c 100644
--- a/tools/perf/arch/arm/util/unwind.c
+++ b/tools/perf/arch/arm/util/unwind-libunwind.c
diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile
index 948ea6cfd681..4fa9be983ad1 100644
--- a/tools/perf/arch/x86/Makefile
+++ b/tools/perf/arch/x86/Makefile
@@ -3,7 +3,7 @@ PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 endif
 ifndef NO_LIBUNWIND
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o
 endif
diff --git a/tools/perf/arch/x86/util/unwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c
index 456a88cf5b37..456a88cf5b37 100644
--- a/tools/perf/arch/x86/util/unwind.c
+++ b/tools/perf/arch/x86/util/unwind-libunwind.c

diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile index fe9b61e322a5..67e9b3d38e89 100644 --- a/tools/perf/arch/arm/Makefile +++ b/tools/perf/arch/arm/Makefile
@@ -3,5 +3,5 @@ PERF_HAVE_DWARF_REGS := 1
3	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o	3	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
4	endif	4	endif
5	ifndef NO_LIBUNWIND	5	ifndef NO_LIBUNWIND
6	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o	6	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
7	endif	7	endif


diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c index da3dc950550c..da3dc950550c 100644 --- a/tools/perf/arch/arm/util/unwind.c +++ b/tools/perf/arch/arm/util/unwind-libunwind.c


diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index 948ea6cfd681..4fa9be983ad1 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile
@@ -3,7 +3,7 @@ PERF_HAVE_DWARF_REGS := 1
3	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o	3	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
4	endif	4	endif
5	ifndef NO_LIBUNWIND	5	ifndef NO_LIBUNWIND
6	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o	6	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
7	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o	7	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o
8	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o	8	LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o
9	endif	9	endif


diff --git a/tools/perf/arch/x86/util/unwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c index 456a88cf5b37..456a88cf5b37 100644 --- a/tools/perf/arch/x86/util/unwind.c +++ b/tools/perf/arch/x86/util/unwind-libunwind.c