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

Pull kbuild updates from Michal Marek:

 - several cleanups in kbuild

 - serialize multiple *config targets so that 'make defconfig kvmconfig'
   works

 - The cc-ifversion macro got support for an else-branch

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild,gcov: simplify kernel/gcov/Makefile more
  kbuild: allow cc-ifversion to have the argument for false condition
  kbuild,gcov: simplify kernel/gcov/Makefile
  kbuild,gcov: remove unnecessary workaround
  kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion
  kbuild: fix cc-ifversion macro
  kbuild: drop $(version_h) from MRPROPER_FILES
  kbuild: use mixed-targets when two or more config targets are given
  kbuild: remove redundant line from bounds.h/asm-offsets.h
  kbuild: merge bounds.h and asm-offsets.h rules
  kbuild: Drop support for clean-rule

diff --combined Makefile
index dd8796caa23982428676d25ed78967d3b2d0e069,e71078b08b596a0fe8a68d725ce32918a0b5cf69..19e256ae26790212c75925912e73b1a0603c1192
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 19
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 +EXTRAVERSION =
  NAME = Diseased Newt
  
  # *DOCUMENTATION*
@@@ -391,7 -391,6 +391,7 @@@ USERINCLUDE    := 
  # Needed to be compatible with the O= option
  LINUXINCLUDE    := \
                -I$(srctree)/arch/$(hdr-arch)/include \
 +              -Iarch/$(hdr-arch)/include/generated/uapi \
                -Iarch/$(hdr-arch)/include/generated \
                $(if $(KBUILD_SRC), -I$(srctree)/include) \
                -Iinclude \
@@@ -423,7 -422,7 +423,7 @@@ export MAKE AWK GENKSYMS INSTALLKERNEL 
  export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
  
  export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
 -export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
 +export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV CFLAGS_KASAN
  export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
  export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
  export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
@@@ -502,7 -501,7 +502,7 @@@ endi
  ifeq ($(KBUILD_EXTMOD),)
          ifneq ($(filter config %config,$(MAKECMDGOALS)),)
                  config-targets := 1
-                 ifneq ($(filter-out config %config,$(MAKECMDGOALS)),)
+                 ifneq ($(words $(MAKECMDGOALS)),1)
                          mixed-targets := 1
                  endif
          endif
@@@ -726,14 -725,10 +726,14 @@@ KBUILD_CFLAGS   += $(call cc-option, -fe
  endif
  
  ifdef CONFIG_FUNCTION_TRACER
 +ifndef CC_FLAGS_FTRACE
 +CC_FLAGS_FTRACE := -pg
 +endif
 +export CC_FLAGS_FTRACE
  ifdef CONFIG_HAVE_FENTRY
  CC_USING_FENTRY       := $(call cc-option, -mfentry -DCC_USING_FENTRY)
  endif
 -KBUILD_CFLAGS += -pg $(CC_USING_FENTRY)
 +KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_USING_FENTRY)
  KBUILD_AFLAGS += $(CC_USING_FENTRY)
  ifdef CONFIG_DYNAMIC_FTRACE
        ifdef CONFIG_HAVE_C_RECORDMCOUNT
@@@ -781,7 -776,6 +781,7 @@@ ifeq ($(shell $(CONFIG_SHELL) $(srctree
        KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
  endif
  
 +include $(srctree)/scripts/Makefile.kasan
  include $(srctree)/scripts/Makefile.extrawarn
  
  # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
@@@ -926,9 -920,6 +926,9 @@@ ifdef CONFIG_SAMPLE
  endif
  ifdef CONFIG_BUILD_DOCSRC
        $(Q)$(MAKE) $(build)=Documentation
 +endif
 +ifdef CONFIG_GDB_SCRIPTS
 +      $(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmlinux-gdb.py
  endif
        +$(call if_changed,link-vmlinux)
  
@@@ -1180,11 -1171,11 +1180,11 @@@ CLEAN_DIRS  += $(MODVERDIR
  # Directories & files removed with 'make mrproper'
  MRPROPER_DIRS  += include/config usr/include include/generated          \
                  arch/*/include/generated .tmp_objdiff
- MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+ MRPROPER_FILES += .config .config.old .version .old_version \
                  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
                  signing_key.priv signing_key.x509 x509.genkey         \
                  extra_certificates signing_key.x509.keyid             \
 -                signing_key.x509.signer
 +                signing_key.x509.signer vmlinux-gdb.py
  
  # clean - Delete most, but leave enough to build external modules
  #

diff --combined arch/parisc/Makefile
index 91fbb6ee702cb7927e5879576a7926746f4000f8,fc1aca379fe2ad44782b37976308272c18882491..965a0999fc4c081228a34a61daec7f1ef032a107
--- 1/arch/parisc/Makefile
--- 2/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@@ -84,6 -84,7 +84,6 @@@ head-y                        := arch/parisc/kernel/head.
  KBUILD_CFLAGS += $(cflags-y)
  
  kernel-y                      := mm/ kernel/ math-emu/
 -kernel-$(CONFIG_HPUX)         += hpux/
  
  core-y        += $(addprefix arch/parisc/, $(kernel-y))
  libs-y        += arch/parisc/lib/ $(LIBGCC)
@@@ -148,7 -149,7 +148,7 @@@ ende
  # we require gcc 3.3 or above to compile the kernel
  archprepare: checkbin
  checkbin:
-       @if test "$(call cc-version)" -lt "0303"; then \
+       @if test "$(cc-version)" -lt "0303"; then \
                echo -n "Sorry, GCC v3.3 or above is required to build " ; \
                echo "the kernel." ; \
                false ; \

diff --combined scripts/Makefile.clean
index 627f8cbbedb88ca29667bbf1f88eb2004d5ee461,af03c57f69fa64289199c63fa4f8e066951893ba..55c96cb8070f1130352ab85f77440dfd497d5677
--- 1/scripts/Makefile.clean
--- 2/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@@ -42,19 -42,19 +42,19 @@@ __clean-files      := $(extra-y) $(extra-m) 
  
  __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
  
 -# as clean-files is given relative to the current directory, this adds
 -# a $(obj) prefix, except for absolute paths
 +# clean-files is given relative to the current directory, unless it
 +# starts with $(objtree)/ (which means "./", so do not add "./" unless
 +# you want to delete a file from the toplevel object directory).
  
  __clean-files   := $(wildcard                                               \
 -                   $(addprefix $(obj)/, $(filter-out /%, $(__clean-files))) \
 -                 $(filter /%, $(__clean-files)))
 +                 $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
 +                 $(filter $(objtree)/%, $(__clean-files)))
  
 -# as clean-dirs is given relative to the current directory, this adds
 -# a $(obj) prefix, except for absolute paths
 +# same as clean-files
  
  __clean-dirs    := $(wildcard                                               \
 -                   $(addprefix $(obj)/, $(filter-out /%, $(clean-dirs)))    \
 -                 $(filter /%, $(clean-dirs)))
 +                 $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(clean-dirs)))    \
 +                 $(filter $(objtree)/%, $(clean-dirs)))
  
  # ==========================================================================
  
@@@ -70,9 -70,6 +70,6 @@@ ifneq ($(strip $(__clean-files)),
  endif
  ifneq ($(strip $(__clean-dirs)),)
        +$(call cmd,cleandir)
- endif
- ifneq ($(strip $(clean-rule)),)
-       +$(clean-rule)
  endif
        @: