Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild fixes from Michal Marek:
 "Here are two fixes I intended to send after v3.6-rc7, but failed to do
  so.  So please pull them for v3.7-rc1 and they will be picked up by
  stable.

  The first one fixes gcc -x <language> syntax in various build-time
  tests, which icecream and possible other gcc wrappers did not
  understand (and yes, icecream is going to be fixed as well).

  The second one fixes make tar-pkg so that unpacking the tarball does
  not replace the /lib -> /usr/lib symlink on recent Fedora releases."

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Fix gcc -x syntax
  kbuild: Do not package /boot and /lib in make tar-pkg

diff --cc arch/x86/Makefile
Simple merge

diff --cc scripts/Kbuild.include
Simple merge

diff --cc tools/perf/Makefile
index e5e71e7,d977656..86258c2
--- 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