aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2013-01-23 15:28:17 -0600
committerLinus Torvalds2013-01-23 15:28:17 -0600
commitc1b84144c2123f274d2613369d83fc5c05d54ffa (patch)
tree543a8a734a124624dcbc8196fe1fa301caf16bca /tools/perf/Makefile
parentdb2336697e1389fef752fc67d12921e2343c30f6 (diff)
parentf1b99392caf120d7533da260318fae0eb5053737 (diff)
downloadkernel-omap-c1b84144c2123f274d2613369d83fc5c05d54ffa.tar.gz
kernel-omap-c1b84144c2123f274d2613369d83fc5c05d54ffa.tar.xz
kernel-omap-c1b84144c2123f274d2613369d83fc5c05d54ffa.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 fixes from Catalin Marinas: - ELF coredump fix (more registers dumped than what user space expects) - SUBARCH name generation (s/aarch64/arm64/) * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: arm64: makefile: fix uname munging when setting ARCH on native machine arm64: elf: fix core dumping to match what glibc expects
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r--tools/perf/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 891bc77bdb2c..8ab05e543ef4 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -58,7 +58,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
58 -e s/arm.*/arm/ -e s/sa110/arm/ \ 58 -e s/arm.*/arm/ -e s/sa110/arm/ \
59 -e s/s390x/s390/ -e s/parisc64/parisc/ \ 59 -e s/s390x/s390/ -e s/parisc64/parisc/ \
60 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ 60 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
61 -e s/sh[234].*/sh/ ) 61 -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )
62NO_PERF_REGS := 1 62NO_PERF_REGS := 1
63 63
64CC = $(CROSS_COMPILE)gcc 64CC = $(CROSS_COMPILE)gcc