diff mbox

[4/4] kvm tools: Cleanup ARCH & uname_M in Makefile

Message ID 1341407938-23478-4-git-send-email-michael@ellerman.id.au (mailing list archive)
State New, archived
Headers show

Commit Message

Michael Ellerman July 4, 2012, 1:18 p.m. UTC 
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>
---
 tools/kvm/Makefile |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index 501387b..f9e1ec1 100644
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -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/ )
-
-uname_M      := $(shell uname -m | sed -e s/i.86/i386/)
+# Translate uname -m into ARCH string
+ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/)
+
 ifeq ($(ARCH),i386)
 	ARCH         := x86
 	DEFINES      += -DCONFIG_X86_32