commit 57073e27816f1f4215e372fa548f19bef300a6d7
author Michael Ellerman <mpe@ellerman.id.au> Thu Aug 11 16:03:15 2016 +1000
committer Michael Ellerman <mpe@ellerman.id.au> Tue Sep 13 17:37:06 2016 +1000
tree 4f5c64e1e7bdc5e8e15805d7a1cb0c7269d4e9c3
parent 68201fbbb04a030864f8560b05d43d8019f7f8df

powerpc/Makefile: Construct the UTS_MACHINE value more concisely

Use the standard Kbuild trick of foo-y to make the construction of
UTC_MACHINE less verbose.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

arch/powerpc/Makefile

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index c941d53..50d020a 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -43,20 +43,6 @@
 endif
 endif
 
-ifeq ($(CONFIG_PPC64),y)
-ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
-OLDARCH	:= ppc64le
-else
-OLDARCH	:= ppc64
-endif
-else
-ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
-OLDARCH	:= ppcle
-else
-OLDARCH	:= ppc
-endif
-endif
-
 # BITS is used as extension for files which are available in a 32 bit
 # and a 64 bit version to simplify shared Makefiles.
 # e.g.: obj-y += foo_$(BITS).o
@@ -68,7 +54,10 @@
         BITS := 32
 endif
 
-UTS_MACHINE := $(OLDARCH)
+machine-y = ppc
+machine-$(CONFIG_PPC64) += 64
+machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
+UTS_MACHINE := $(subst $(space),,$(machine-y))
 
 ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
 override LD	+= -EL