From: Michal Marek <mmarek@suse.cz>
Date: Wed, 14 May 2014 20:50:39 +0000 (+0200)
Subject: Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next
X-Git-Tag: next-20140516~73^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5366c855e0d8646bcdb5a6e5286cbf300688859f;p=karo-tx-linux.git

Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next
---

5366c855e0d8646bcdb5a6e5286cbf300688859f
diff --cc Makefile
index 3dd4596cc710,60ccbfe750a2,f4702c10b2b8..abc3bc2c6082
--- a/Makefile
+++ b/Makefile
@@@@ -342,16 -346,12 -352,11 +352,16 @@@@ $(srctree)/scripts/Kbuild.include: 
   include $(srctree)/scripts/Kbuild.include
   
   # Make variables (CC, etc...)
 - 
   AS		= $(CROSS_COMPILE)as
   LD		= $(CROSS_COMPILE)ld
 ++LDFINAL	= $(LD)
   CC		= $(CROSS_COMPILE)gcc
   CPP		= $(CC) -E
 ++ifdef CONFIG_LTO
 ++AR		= $(CROSS_COMPILE)gcc-ar
 ++else
   AR		= $(CROSS_COMPILE)ar
 ++endif
   NM		= $(CROSS_COMPILE)nm
   STRIP		= $(CROSS_COMPILE)strip
   OBJCOPY		= $(CROSS_COMPILE)objcopy
@@@@ -750,9 -731,6 -744,8 +760,9 @@@@ ifeq ($(shell $(CONFIG_SHELL) $(srctree
   	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
   endif
   
 + include $(srctree)/scripts/Makefile.extrawarn
 ++include ${srctree}/scripts/Makefile.lto
 + 
   # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
   KBUILD_CPPFLAGS += $(KCPPFLAGS)
   KBUILD_AFLAGS += $(KAFLAGS)