summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-01-18 19:00:47 (GMT)
committerCatalin Marinas <catalin.marinas@arm.com>2013-01-22 17:51:00 (GMT)
commitf1b99392caf120d7533da260318fae0eb5053737 (patch)
tree494c9ec72ffac8e0c7652694316ce6429ce0d046 /Makefile
parent9cf2b72b25f3f6a5a1a46a4f36037e66de52465c (diff)
downloadlinux-f1b99392caf120d7533da260318fae0eb5053737.tar.xz
arm64: makefile: fix uname munging when setting ARCH on native machine
By popular demand, arch/aarch64 is now known as arch/arm64. However, uname -m (and indeed the GNU triplet) still use aarch64 as the machine string. This patch fixes native builds of both the kernel and perf tools by updating the relevant Makefiles to munge the output of uname -m and set the ARCH variable appropriately. Cc: <stable@vger.kernel.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 253a455..2cd4c6b 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
- -e s/sh[234].*/sh/ )
+ -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )
# Cross compiling and selecting different set of gcc/bin-utils
# ---------------------------------------------------------------------------