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

diff --cc arch/x86/Makefile
Simple merge

diff --cc tools/perf/Makefile
index e5e71e7d95a093fb4e3258b716671acf7237358b,d9776568e8cd6d5317920d89ccbb16eabaee514b..86258c2a2c23d94a8714e327a771b20f00a8461f
--- 1/tools/perf/Makefile
--- 2/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