distro/xilinx-standalone: Make LTO optional

Some builds may require LTO, while others do not want it.  The LTO components
are only enabled when using the esw.bbclass and the xilinx-standalone distro.

A second xilinx-standalone-nolto was added specifically to provide a default
where LTO was disabled.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

3 files changed, 31 insertions, 12 deletions

diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf
new file mode 100644
index 00000000..7ac93995
--- /dev/null
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf
@@ -0,0 +1,4 @@
+require conf/distro/xilinx-standalone.inc
+
+# By default we want to optimize for size.
+ESW_CFLAGS_append = " -Os"
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
index a31cae80..3acbffa3 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
@@ -1,16 +1,6 @@
-DISTRO = "xilinx-standalone"
-DISTRO_NAME = "Xilinx Standalone Distro"
-DISTRO_VERSION = "1.0"
-TARGET_VENDOR = "-xilinx"
+require conf/distro/xilinx-standalone.inc
 
-TCLIBC = "newlib"
-TCLIBCAPPEND =""
-
-# Change SDK name
-SDK_VERSION = "xilinx-standalone"
-
-require conf/distro/include/yocto-uninative.inc
-INHERIT += "uninative"
+DISTRO_NAME_append = " (lto)"
 
 # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
 LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
@@ -19,3 +9,8 @@ LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
 TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
 
 TOOLCHAIN_HOST_TASK_append = " nativesdk-qemu-xilinx"
+
+# We also need to use Link Time Optimization for many items, make this the
+# default.
+ESW_CFLAGS += " -flto -ffat-lto-objects"
+
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
new file mode 100644
index 00000000..9a06e8d0
--- /dev/null
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -0,0 +1,20 @@
+DISTRO_NAME = "Xilinx Standalone Distro"
+DISTRO_VERSION = "1.0"
+TARGET_VENDOR = "-xilinx"
+
+# Make sure any users get the xilinx-standalone distro override
+DISTROOVERRIDES_prepend = "${@'xilinx-standalone:' if d.getVar('DISTRO') != "xilinx-standalone" else ''}"
+
+TCLIBC = "newlib"
+TCLIBCAPPEND =""
+
+# Change SDK name
+SDK_VERSION = "xilinx-standalone"
+
+require conf/distro/include/yocto-uninative.inc
+INHERIT += "uninative"
+
+# Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
+LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
+
+ESW_CFLAGS ?= ""