]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 14 May 2014 20:50:39 +0000 (22:50 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 14 May 2014 20:50:39 +0000 (22:50 +0200)
1  2  3 
Makefile

diff --cc Makefile
index 3dd4596cc710a3af5e629657709cc234ff02c39f,60ccbfe750a2641db2e43635885985b9e49318ed,f4702c10b2b8daba066f6e3c796db7c2ab1f3488..abc3bc2c6082af69e227380685da7a0ff5477688
+++ 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)