From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 22:41:32 +0000 (+1100)
Subject: Merge remote-tracking branch 'kbuild-current/rc-fixes'
X-Git-Tag: next-20121008~85
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=351b05f4294cc4bc39da4543ffac9988e31552df;p=karo-tx-linux.git

Merge remote-tracking branch 'kbuild-current/rc-fixes'
---

351b05f4294cc4bc39da4543ffac9988e31552df
diff --cc tools/perf/Makefile
index e5e71e7d95a0,d9776568e8cd..86258c2a2c23
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@ -64,15 -56,13 +64,15 @@@ AR = $(CROSS_COMPILE)a
  
  # Additional ARCH settings for x86
  ifeq ($(ARCH),i386)
 -        ARCH := x86
 +	override ARCH := x86
 +	NO_PERF_REGS := 0
 +	LIBUNWIND_LIBS = -lunwind -lunwind-x86
  endif
  ifeq ($(ARCH),x86_64)
 -	ARCH := x86
 +	override ARCH := x86
  	IS_X86_64 := 0
  	ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
- 		IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
+ 		IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1)
  	endif
  	ifeq (${IS_X86_64}, 1)
  		RAW_ARCH := x86_64