1 files changed, 23 insertions, 21 deletions
diff --git a/meta/conf/distro/include/lto.inc b/meta/conf/distro/include/lto.inc
index 20895ad40d..b8193725a1 100644
--- a/meta/conf/distro/include/lto.inc
+++ b/meta/conf/distro/include/lto.inc
@@ -1,32 +1,34 @@
 # To enable LTO, add following in local.conf
 # require conf/distro/include/lto.inc
-# DISTRO_FEATURES_append = " lto"
+# DISTRO_FEATURES:append = " lto"
 #
 # Disable LTO for following packages
-LTO_pn-glibc = ""
+LTO:pn-glibc = ""
-LTO_pn-gcc-runtime = ""
+LTO:pn-gcc-runtime = ""
-LTO_pn-libgcc-initial = ""
+LTO:pn-libgcc-initial = ""
-LTO_pn-libgcc = ""
+LTO:pn-libgcc = ""
-LTO_pn-libaio = ""
+LTO:pn-libaio = ""
-LTO_pn-libpam = ""
+LTO:pn-libpam = ""
-LTO_pn-elfutils = ""
+LTO:pn-elfutils = ""
-LTO_pn-perl = ""
+LTO:pn-perl = ""
-LTO_pn-busybox = ""
+LTO:pn-busybox = ""
-LTO_pn-libxcrypt = ""
+LTO:pn-libxcrypt = ""
-LTO_pn-curl = ""
+LTO:pn-curl = ""
-LTO_pn-libcap = ""
+LTO:pn-libcap = ""
-LTO_pn-libproxy = ""
+LTO:pn-libproxy = ""
-LTO_pn-libbsd = ""
+LTO:pn-libbsd = ""
-LTO_pn-perf = ""
+LTO:pn-perf = ""
 # webkit is not linking properly with LTO, disable until next time
-LTO_pn-webkitgtk = ""
+LTO:pn-webkitgtk = ""
-LTO_pn-xserver-xorg = ""
+LTO:pn-xserver-xorg = ""
+LTO:pn-grub = ""
+LTO:pn-grub-efi = ""
 # Custom LTO flags
 # disable partitioning/streaming algorithm since its uses ASM
 # constructs not compatible with lto
-LTOEXTRA_pn-alsa-lib = "-flto-partition=none"
+LTOEXTRA:pn-alsa-lib = "-flto-partition=none"
 LTOEXTRA ?= ""
@@ -43,7 +45,7 @@ LTOEXTRA ?= ""
 # code from .a files to linker
 LTO ?= "-flto -ffat-lto-objects -fuse-linker-plugin ${LTOEXTRA}"
-SELECTED_OPTIMIZATION_append = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"
+SELECTED_OPTIMIZATION:append = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"
-TARGET_LDFLAGS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"
+TARGET_LDFLAGS:append:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"
 SELECTED_OPTIMIZATION[vardeps] += "LTO LTOEXTRA"

diff --git a/meta/conf/distro/include/lto.inc b/meta/conf/distro/include/lto.inc index 20895ad40d..b8193725a1 100644 --- a/meta/conf/distro/include/lto.inc +++ b/meta/conf/distro/include/lto.inc
@@ -1,32 +1,34 @@
1	# To enable LTO, add following in local.conf	1	# To enable LTO, add following in local.conf
2	# require conf/distro/include/lto.inc	2	# require conf/distro/include/lto.inc
3	# DISTRO_FEATURES_append = " lto"	3	# DISTRO_FEATURES:append = " lto"
4	#	4	#
5		5
6	# Disable LTO for following packages	6	# Disable LTO for following packages
7	LTO_pn-glibc = ""	7	LTO:pn-glibc = ""
8	LTO_pn-gcc-runtime = ""	8	LTO:pn-gcc-runtime = ""
9	LTO_pn-libgcc-initial = ""	9	LTO:pn-libgcc-initial = ""
10	LTO_pn-libgcc = ""	10	LTO:pn-libgcc = ""
11	LTO_pn-libaio = ""	11	LTO:pn-libaio = ""
12	LTO_pn-libpam = ""	12	LTO:pn-libpam = ""
13	LTO_pn-elfutils = ""	13	LTO:pn-elfutils = ""
14	LTO_pn-perl = ""	14	LTO:pn-perl = ""
15	LTO_pn-busybox = ""	15	LTO:pn-busybox = ""
16	LTO_pn-libxcrypt = ""	16	LTO:pn-libxcrypt = ""
17	LTO_pn-curl = ""	17	LTO:pn-curl = ""
18	LTO_pn-libcap = ""	18	LTO:pn-libcap = ""
19	LTO_pn-libproxy = ""	19	LTO:pn-libproxy = ""
20	LTO_pn-libbsd = ""	20	LTO:pn-libbsd = ""
21	LTO_pn-perf = ""	21	LTO:pn-perf = ""
22	# webkit is not linking properly with LTO, disable until next time	22	# webkit is not linking properly with LTO, disable until next time
23	LTO_pn-webkitgtk = ""	23	LTO:pn-webkitgtk = ""
24	LTO_pn-xserver-xorg = ""	24	LTO:pn-xserver-xorg = ""
		25	LTO:pn-grub = ""
		26	LTO:pn-grub-efi = ""
25		27
26	# Custom LTO flags	28	# Custom LTO flags
27	# disable partitioning/streaming algorithm since its uses ASM	29	# disable partitioning/streaming algorithm since its uses ASM
28	# constructs not compatible with lto	30	# constructs not compatible with lto
29	LTOEXTRA_pn-alsa-lib = "-flto-partition=none"	31	LTOEXTRA:pn-alsa-lib = "-flto-partition=none"
30		32
31	LTOEXTRA ?= ""	33	LTOEXTRA ?= ""
32		34
@@ -43,7 +45,7 @@ LTOEXTRA ?= ""
43	# code from .a files to linker	45	# code from .a files to linker
44	LTO ?= "-flto -ffat-lto-objects -fuse-linker-plugin ${LTOEXTRA}"	46	LTO ?= "-flto -ffat-lto-objects -fuse-linker-plugin ${LTOEXTRA}"
45		47
46	SELECTED_OPTIMIZATION_append = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"	48	SELECTED_OPTIMIZATION:append = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"
47	TARGET_LDFLAGS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"	49	TARGET_LDFLAGS:append:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'lto', ' ${LTO}', '', d)}"
48		50
49	SELECTED_OPTIMIZATION[vardeps] += "LTO LTOEXTRA"	51	SELECTED_OPTIMIZATION[vardeps] += "LTO LTOEXTRA"