arm64: makefile: fix uname munging when setting ARCH on native machine (f1b99392) · Commits · 戴 / test

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>

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		# ---------------------------------------------------------------------------

tools/perf/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ ARCH ?= $(shell echo $(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/ )
		NO_PERF_REGS := 1

		CC = $(CROSS_COMPILE)gcc

Admin message