Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Thu, Jul 21, 2016 at 09:29:50AM +1000, Stephen Rothwell escreveu:
> Hi Arnaldo,
> 
> On Tue, 19 Jul 2016 23:52:02 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> >
> > Humm, it seems that the compiler used is not the cross one, but the
> > native, check if, say, __powerpc__ is defined.
> 
> Yes, __powerpc__ is defined (unsuprisingly).

Maybe this one?

diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 1f75b0a046cc..3500fcf7bd47 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -1,10 +1,14 @@
 include ../scripts/Makefile.include
 
+HOSTARCH=$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+                                -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/aarch64.*/arm64/ )
+
 ifndef ($(ARCH))
-ARCH ?= $(shell uname -m)
-ifeq ($(ARCH),x86_64)
-ARCH := x86
-endif
+ARCH ?= $(HOSTARCH)
 endif
 
 # always use the host compiler
@@ -26,7 +30,7 @@ OBJTOOL_IN := $(OBJTOOL)-in.o
 
 all: $(OBJTOOL)
 
-INCLUDES := -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi
+INCLUDES := -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi
 CFLAGS   += -Wall -Werror $(EXTRA_WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
 LDFLAGS  += -lelf $(LIBSUBCMD)