kvm tools: Cleanup ARCH & uname_M in Makefile

The sed expression for ARCH seems to have been cribbed from the top-level
kernel Makefile, and includes lots of architectures kvmtool doesn't
support - strip it down.

Also call uname -m directly there and get rid of uname_M.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Michael Ellerman
2012-07-04 23:18:58 +10:00
committed by Will Deacon
parent e15b23071e
commit 2f82e465e5
+2 -7
View File
@@ -90,14 +90,9 @@ OBJS += kvm-ipc.o
OBJS += builtin-sandbox.o
OBJS += virtio/mmio.o
# Additional ARCH settings for x86
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/ )
# Translate uname -m into ARCH string
ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/)
uname_M := $(shell uname -m | sed -e s/i.86/i386/)
ifeq ($(ARCH),i386)
ARCH := x86
DEFINES += -DCONFIG_X86_32