From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 27 Jan 2018 09:26:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'arne_f/gcc-7-retpol' into kernel-4.14
X-Git-Tag: v2.21-core122~178^2~64
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=09cdb999daaad3488b749abc50dada43adaf9e12;hp=-c

Merge remote-tracking branch 'arne_f/gcc-7-retpol' into kernel-4.14
---

09cdb999daaad3488b749abc50dada43adaf9e12
diff --combined make.sh
index 831faa728b,6c0822d96d..e7b385ce90
--- a/make.sh
+++ b/make.sh
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  GIT_TAG=$(git tag | tail -1)					# Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
  
- TOOLCHAINVER=20171121
+ TOOLCHAINVER=20180126
  
  ###############################################################################
  #
@@@ -144,14 -144,14 +144,14 @@@ configure_build() 
  			BUILDTARGET="${build_arch}-unknown-linux-gnu"
  			CROSSTARGET="${build_arch}-cross-linux-gnu"
  			BUILD_PLATFORM="x86"
- 			CFLAGS_ARCH="-m64 -mtune=generic"
+ 			CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
  			;;
  
  		i586)
  			BUILDTARGET="${build_arch}-pc-linux-gnu"
  			CROSSTARGET="${build_arch}-cross-linux-gnu"
  			BUILD_PLATFORM="x86"
- 			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
+ 			CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
  			;;
  
  		aarch64)
@@@ -952,6 -952,7 +952,7 @@@ buildtoolchain() 
  	lfsmake1 tar
  	lfsmake1 texinfo
  	lfsmake1 xz
+ 	lfsmake1 flex
  	lfsmake1 fake-environ
  	lfsmake1 strip
  	lfsmake1 cleanup-toolchain
@@@ -982,7 -983,6 +983,6 @@@ buildbase() 
  	lfsmake2 iana-etc
  	lfsmake2 m4
  	lfsmake2 bison
- 	lfsmake2 ncurses-compat
  	lfsmake2 ncurses
  	lfsmake2 procps
  	lfsmake2 libtool
@@@ -1042,10 -1042,11 +1042,9 @@@ buildipfire() 
    lfsmake2 unzip
    lfsmake2 which
    lfsmake2 linux-firmware
 -  lfsmake2 ath10k-firmware
    lfsmake2 dvb-firmwares
 -  lfsmake2 mt7601u-firmware
    lfsmake2 zd1211-firmware
    lfsmake2 rpi-firmware
-   lfsmake2 intel-microcode
    lfsmake2 bc
    lfsmake2 u-boot
    lfsmake2 cpio
@@@ -1062,34 -1063,33 +1061,34 @@@
    lfsmake2 libnetfilter_cthelper
    lfsmake2 libnetfilter_cttimeout
    lfsmake2 iptables
 +  lfsmake2 elfutils
  
    case "${BUILD_ARCH}" in
  	x86_64)
  		lfsmake2 linux			KCFG=""
 -		lfsmake2 backports			KCFG=""
 -		lfsmake2 e1000e			KCFG=""
 -		lfsmake2 igb				KCFG=""
 -		lfsmake2 ixgbe			KCFG=""
 +#		lfsmake2 backports			KCFG=""
 +#		lfsmake2 e1000e			KCFG=""
 +#		lfsmake2 igb				KCFG=""
 +#		lfsmake2 ixgbe			KCFG=""
  		lfsmake2 xtables-addons		KCFG=""
  		lfsmake2 linux-initrd			KCFG=""
  		;;
  	i586)
  		# x86-pae (Native and new XEN) kernel build
  		lfsmake2 linux			KCFG="-pae"
 -		lfsmake2 backports			KCFG="-pae"
 -		lfsmake2 e1000e			KCFG="-pae"
 -		lfsmake2 igb				KCFG="-pae"
 -		lfsmake2 ixgbe			KCFG="-pae"
 +#		lfsmake2 backports			KCFG="-pae"
 +#		lfsmake2 e1000e			KCFG="-pae"
 +#		lfsmake2 igb				KCFG="-pae"
 +#		lfsmake2 ixgbe			KCFG="-pae"
  		lfsmake2 xtables-addons		KCFG="-pae"
  		lfsmake2 linux-initrd			KCFG="-pae"
  
  		# x86 kernel build
  		lfsmake2 linux			KCFG=""
 -		lfsmake2 backports			KCFG=""
 -		lfsmake2 e1000e			KCFG=""
 -		lfsmake2 igb				KCFG=""
 -		lfsmake2 ixgbe			KCFG=""
 +#		lfsmake2 backports			KCFG=""
 +#		lfsmake2 e1000e			KCFG=""
 +#		lfsmake2 igb				KCFG=""
 +#		lfsmake2 ixgbe			KCFG=""
  		lfsmake2 xtables-addons		KCFG=""
  		lfsmake2 linux-initrd			KCFG=""
  		;;
@@@ -1120,7 -1120,6 +1119,6 @@@
  		lfsmake2 linux-initrd			KCFG="-kirkwood"
  		;;
    esac
-   lfsmake2 intel-microcode
    lfsmake2 xtables-addons			USPACE="1"
    lfsmake2 openssl
    [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
@@@ -1282,6 -1281,7 +1280,7 @@@
    lfsmake2 wireless
    lfsmake2 pakfire
    lfsmake2 spandsp
+   lfsmake2 lz4
    lfsmake2 lzo
    lfsmake2 openvpn
    lfsmake2 pammysql
@@@ -1468,6 -1468,7 +1467,6 @@@
    lfsmake2 sendEmail
    lfsmake2 sysbench
    lfsmake2 strace
 -  lfsmake2 elfutils
    lfsmake2 ltrace
    lfsmake2 ipfire-netboot
    lfsmake2 lcdproc
@@@ -1509,7 -1510,6 +1508,6 @@@
    lfsmake2 libpciaccess
    lfsmake2 libyajl
    lfsmake2 libvirt
-   lfsmake2 python3-libvirt
    lfsmake2 freeradius
    lfsmake2 perl-common-sense
    lfsmake2 perl-inotify2