1 files changed, 6 insertions, 1 deletions

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 940257b5774e..56d62d3fb167 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -52,7 +52,10 @@ ifeq ($(ARCH),i386)
 endif
 ifeq ($(ARCH),x86_64)
         ARCH := x86
-        IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
+        IS_X86_64 := 0
+        ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
+                IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
+        endif
         ifeq (${IS_X86_64}, 1)
                 RAW_ARCH := x86_64
                 ARCH_CFLAGS := -DARCH_X86_64
@@ -279,6 +282,7 @@ LIB_H += util/thread.h
 LIB_H += util/thread_map.h
 LIB_H += util/trace-event.h
 LIB_H += util/probe-finder.h
+LIB_H += util/dwarf-aux.h
 LIB_H += util/probe-event.h
 LIB_H += util/pstack.h
 LIB_H += util/cpumap.h
@@ -435,6 +439,7 @@ else
         BASIC_CFLAGS += -DDWARF_SUPPORT
         EXTLIBS += -lelf -ldw
         LIB_OBJS += $(OUTPUT)util/probe-finder.o
+        LIB_OBJS += $(OUTPUT)util/dwarf-aux.o
 endif # PERF_HAVE_DWARF_REGS
 endif # NO_DWARF