On Mon, Mar 02, 2015 at 01:31:03PM +0900, Namhyung Kim wrote: > He Kuang reported that current perf tools failed to build when ARCH > variable was given like above. It was because the name is different > that internal directory name. I can see that David's sparc64 build > has same problem. So fix it by applying the sed conversion script to > the command line ARCH variable also, and fixing the converted name > there (i.e. i386/x86_64 -> x86, sparc64 -> sparc). > > Reported-and-tested-by: He Kuang <[email protected]> > Cc: David Ahern <[email protected]> > Signed-off-by: Namhyung Kim <[email protected]>
Acked-by: Jiri Olsa <[email protected]> thanks, jirka > --- > tools/perf/config/Makefile.arch | 23 +++++------------------ > 1 file changed, 5 insertions(+), 18 deletions(-) > > diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch > index ff95a68741d1..e9720571341d 100644 > --- a/tools/perf/config/Makefile.arch > +++ b/tools/perf/config/Makefile.arch > @@ -1,28 +1,15 @@ > +ifndef ARCH > +ARCH := $(shell uname -m 2>/dev/null || echo not) > +endif > > -uname_M := $(shell uname -m 2>/dev/null || echo not) > - > -RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e > s/sun4u/sparc64/ \ > +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ > + -e s/sun4u/sparc/ -e s/sparc64/sparc/ \ > -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/ \ > -e s/tile.*/tile/ ) > > -# Additional ARCH settings for x86 > -ifeq ($(RAW_ARCH),i386) > - ARCH ?= x86 > -endif > - > -ifeq ($(RAW_ARCH),x86_64) > - ARCH ?= x86 > - > - ifneq (, $(findstring m32,$(CFLAGS))) > - RAW_ARCH := x86_32 > - endif > -endif > - > -ARCH ?= $(RAW_ARCH) > - > LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > ifeq ($(LP64), 1) > IS_64_BIT := 1 > -- > 2.2.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
