gcc: Separate binutils options

binutils options should not be tied to the gcc bbappends

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>

6 files changed, 97 insertions, 77 deletions

diff --git a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend
new file mode 100644
index 00000000..1e4d8b02
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend
@@ -0,0 +1,29 @@
+include binutils-xilinx-standalone.inc
+
+
+# The following is a copy of what is in OE-Core, without LDGOLD, because we have to do gold per machine instead
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone = " \
+        --program-prefix=${TARGET_PREFIX} \
+        --disable-werror \
+        --enable-deterministic-archives \ 
+        --enable-plugins \
+        ${BINUTILS_CONFIGURE_COMMON_XILINX_STANDALONE} \
+"
+
+
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
+        ${BINUTILS_CONFIGURE_A53} \
+"
+
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
+        ${BINUTILS_CONFIGURE_A72} \
+"
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
+        ${BINUTILS_CONFIGURE_R5} \
+"
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
+        ${BINUTILS_CONFIGURE_MB} \
+"
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
+        ${BINUTILS_CONFIGURE_A9} \
+"
diff --git a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
index 25b1090a..fd1702e4 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
@@ -1,7 +1,4 @@
-BINUTILS_CONFIGURE_COMMON_XILINX_STANDALONE = " \
-        --disable-gdb \
-        --disable-sim \
-"
+include binutils-xilinx-standalone.inc
 
 
 # The following is a copy of what is in OE-Core, without LDGOLD, because we have to do gold per machine instead
@@ -12,3 +9,23 @@ EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone = " \
         --enable-plugins \
         ${BINUTILS_CONFIGURE_COMMON_XILINX_STANDALONE} \
 "
+
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
+        ${BINUTILS_CONFIGURE_A53} \
+"
+
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
+        ${BINUTILS_CONFIGURE_A72} \
+"
+
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
+        ${BINUTILS_CONFIGURE_R5} \
+"
+
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
+        ${BINUTILS_CONFIGURE_MB} \
+"
+
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
+        ${BINUTILS_CONFIGURE_A9} \
+"
diff --git a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc
new file mode 100644
index 00000000..4170ee02
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc
@@ -0,0 +1,46 @@
+# This inc file contains common configuration used for Binutils for several
+# MACHINES when using xilinx-standalone a DISTRO.
+# This should be applicable to both cross and cross-canadian toolchain.
+
+BINUTILS_CONFIGURE_COMMON_XILINX_STANDALONE = " \
+        --disable-gdb \
+        --disable-sim \
+"
+
+BINUTILS_CONFIGURE_A53 ?= " \
+        --disable-gprof \
+        --disable-libdecnumber \
+        --disable-readline \
+        --disable-shared \
+        --enable-lto \
+        --enable-static \
+"
+
+BINUTILS_CONFIGURE_A72 ?= " \
+        --disable-gprof \
+        --disable-libdecnumber \
+        --disable-readline \
+        --disable-shared \
+        --enable-lto \
+        --enable-static \
+"
+
+BINUTILS_CONFIGURE_R5 ?= " \
+        --disable-docs \
+        --disable-nls \
+        --enable-interwork \
+"
+
+BINUTILS_CONFIGURE_MB ?= " \
+        --disable-initfini-array \
+        --disable-nls \
+        --enable-gold=no \
+        --enable-ld=yes \
+        --enable-multilib \
+"
+
+BINUTILS_CONFIGURE_A9 ?= " \
+        --disable-docs \
+        --disable-nls \
+        --enable-interwork \
+"
\ No newline at end of file
diff --git a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
index 6ad48347..66c1f557 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
@@ -13,38 +13,23 @@ EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone = " \
 EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
         ${GCC_CONFIGURE_A53} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
-        ${BINUTILS_CONFIGURE_A53} \
-"
 
 # Cortex-A72
 EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
         ${GCC_CONFIGURE_A72} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
-        ${BINUTILS_CONFIGURE_A72} \
-"
 
 # Cortex-R5
 EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
         ${GCC_CONFIGURE_R5} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
-        ${BINUTILS_CONFIGURE_R5} \
-"
 
 # MB
 EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
         ${GCC_CONFIGURE_MB} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
-        ${BINUTILS_CONFIGURE_MB} \
-"
 
 # Cortex-A9
 EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
         ${GCC_CONFIGURE_A9} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
-        ${BINUTILS_CONFIGURE_A9} \
-"
diff --git a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
index b25ea6f5..cad0cecc 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
@@ -1,6 +1,7 @@
 include gcc-xilinx-standalone.inc
 
 
+
 # This is still missing a way to remove infiniarray, if we really have to we could use _remove
 EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone = " \
     ${GCC_CONFIGURE_COMMON_XILINX_STANDALONE} \
@@ -17,38 +18,23 @@ EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone = " \
 EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
         ${GCC_CONFIGURE_A53} \
 "
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
-        ${BINUTILS_CONFIGURE_A53} \
-"
 
 # Cortex-A72
 EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
         ${GCC_CONFIGURE_A72} \
 "
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
-        ${BINUTILS_CONFIGURE_A72} \
-"
 
 # Cortex-R5
 EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
         ${GCC_CONFIGURE_R5} \
 "
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
-        ${BINUTILS_CONFIGURE_R5} \
-"
 
 # MB
 EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
         ${GCC_CONFIGURE_MB} \
 "
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
-        ${BINUTILS_CONFIGURE_MB} \
-"
 
 # Cortex-A9
 EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
         ${GCC_CONFIGURE_A9} \
 "
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
-        ${BINUTILS_CONFIGURE_A9} \
-"
diff --git a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
index c8946ad7..ddb32819 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
@@ -3,11 +3,6 @@
 # This should be applicable to both cross and cross-canadian toolchain.
 
 
-# By using tclibc-newlib we loose sysroot functionality due to some
-# append/override behavior We need to get that back , the following append
-# overrides everything on EXTRA_OECONF for gcc cross target it avoids
-# overlapping with crt0 because of --enable-linker-id from EXTRA_OECONF
-
 GCC_CONFIGURE_COMMON_XILINX_STANDALONE = " \
         --disable-libmudflap \
         --disable-libstdcxx-pch \
@@ -38,16 +33,6 @@ GCC_CONFIGURE_A53 ?= " \
         --with-ppl=no \
 "
 
-
-
-BINUTILS_CONFIGURE_A53 ?= " \
-        --disable-gprof \
-        --disable-libdecnumber \
-        --disable-readline \
-        --disable-shared \
-        --enable-lto \
-        --enable-static \
-"
 GCC_CONFIGURE_A72 ?= " \
         --disable-bootstrap \
         --disable-multiarch \
@@ -67,16 +52,6 @@ GCC_CONFIGURE_A72 ?= " \
         --with-isl=no \
         --with-ppl=no \
 "
-BINUTILS_CONFIGURE_A72 ?= " \
-        --disable-gprof \
-        --disable-libdecnumber \
-        --disable-readline \
-        --disable-shared \
-        --enable-lto \
-        --enable-static \
-"
-
-
 
 GCC_CONFIGURE_R5 ?= " \
         --disable-decimal-float \
@@ -94,12 +69,6 @@ GCC_CONFIGURE_R5 ?= " \
         --with-host-libstdcxx=-static-libgcc \
          --with-multilib-list=rmprofile \
 "
-BINUTILS_CONFIGURE_R5 ?= " \
-        --disable-docs \
-        --disable-nls \
-        --enable-interwork \
-"
-
 
 GCC_CONFIGURE_MB ?= " \
         --disable-__cxa_atexit \
@@ -113,13 +82,6 @@ GCC_CONFIGURE_MB ?= " \
         --without-long-double-128 \
         --disable-multilib \
 "
-BINUTILS_CONFIGURE_MB ?= " \
-        --disable-initfini-array \
-        --disable-nls \
-        --enable-gold=no \
-        --enable-ld=yes \
-        --enable-multilib \
-"
 
 GCC_CONFIGURE_A9 ?= " \
         --disable-bootstrap \
@@ -139,9 +101,4 @@ GCC_CONFIGURE_A9 ?= " \
         --with-gnu-ld \
         --with-isl=no \
         --with-ppl=no \
-"
-BINUTILS_CONFIGURE_A9 ?= " \
-        --disable-docs \
-        --disable-nls \
-        --enable-interwork \
 "
\ No newline at end of file