Revert "binutils/gcc: Refactor the oeconf"

This reverts commit a45b1acf46f01cc5eb3ae130ab61766ed635340e.

6 files changed, 167 insertions, 14 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
index 086aa195..1e4d8b02 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend
@@ -1,11 +1,29 @@
 include binutils-xilinx-standalone.inc
 
-EXTRA_OECONF_append_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
+
+# 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_append_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
+EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
         ${BINUTILS_CONFIGURE_MB} \
 "
-EXTRA_OECONF_append_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_zc702-zynq7 = " \
+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 32a50e3c..fd1702e4 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
@@ -1,13 +1,31 @@
 include binutils-xilinx-standalone.inc
 
-EXTRA_OECONF_append_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
+
+# 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-${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-${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_append_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
+EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
         ${BINUTILS_CONFIGURE_MB} \
 "
 
-EXTRA_OECONF_append_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_zc702-zynq7 = " \
+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
index 5883f07d..4170ee02 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc
@@ -2,6 +2,29 @@
 # 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 \
@@ -20,4 +43,4 @@ 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 85543b66..9143434a 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
@@ -1,17 +1,36 @@
 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-canadian-${TARGET_ARCH}_xilinx-standalone = " \
+    ${GCC_CONFIGURE_COMMON_XILINX_STANDALONE} \
+    --program-prefix=${TARGET_PREFIX} \
+    --without-local-prefix \
+    ${EXTRA_OECONF_PATHS} \
+"
+
+
+# Cortex-A53
+EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
+        ${GCC_CONFIGURE_A53} \
+"
+
+# Cortex-A72
+EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
+        ${GCC_CONFIGURE_A72} \
+"
+
 # Cortex-R5
-EXTRA_OECONF_append_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
+EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
         ${GCC_CONFIGURE_R5} \
 "
 
 # MB
-EXTRA_OECONF_append_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
+EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
         ${GCC_CONFIGURE_MB} \
 "
 
 # Cortex-A9
-EXTRA_OECONF_append_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_zc702-zynq7 = " \
+EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
         ${GCC_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 2f013442..cad0cecc 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
@@ -1,16 +1,40 @@
 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} \
+    --program-prefix=${TARGET_PREFIX} \
+    --without-local-prefix \
+    ${EXTRA_OECONF_PATHS} \
+"
+
+
+#   --with-multilib-list=aprofile doesnt exist in gcc 8
+
+
+# Cortex-A53
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa53 = " \
+        ${GCC_CONFIGURE_A53} \
+"
+
+# Cortex-A72
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexa72 = " \
+        ${GCC_CONFIGURE_A72} \
+"
+
 # Cortex-R5
-EXTRA_OECONF_append_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
         ${GCC_CONFIGURE_R5} \
 "
 
 # MB
-EXTRA_OECONF_append_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
         ${GCC_CONFIGURE_MB} \
 "
 
 # Cortex-A9
-EXTRA_OECONF_append_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_zc702-zynq7 = " \
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
         ${GCC_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 70b85eb0..007998ca 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
@@ -2,6 +2,57 @@
 # MACHINES when using xilinx-standalone a DISTRO.
 # This should be applicable to both cross and cross-canadian toolchain.
 
+
+GCC_CONFIGURE_COMMON_XILINX_STANDALONE = " \
+        --disable-libmudflap \
+        --disable-libstdcxx-pch \
+        --disable-nls \
+        --enable-languages=${LANGUAGES} \
+        --with-newlib \
+"
+
+
+GCC_CONFIGURE_A53 ?= " \
+        --disable-bootstrap \
+        --disable-multiarch \
+        --disable-threads \
+        --enable-c99 \
+        --enable-checking=yes \
+        --enable-fix-cortex-a53-835769 \
+        --enable-fix-cortex-a53-843419 \
+        --enable-linker-build-id \
+        --enable-long-long \
+        --enable-lto \
+        --enable-plugins \
+        --enable-shared \
+        --with-arch=armv8-a \
+        --with-cloog=no \
+        --with-gnu-as \
+        --with-gnu-ld \
+        --with-isl=no \
+        --with-ppl=no \
+"
+
+GCC_CONFIGURE_A72 ?= " \
+        --disable-bootstrap \
+        --disable-multiarch \
+        --disable-threads \
+        --enable-c99 \
+        --enable-checking=yes \
+        --enable-linker-build-id \
+        --enable-long-long \
+        --enable-lto \
+        --enable-multilib \
+        --enable-plugins \
+        --enable-shared \
+        --enable-threads=no \
+        --with-cloog=no \
+        --with-gnu-as \
+        --with-gnu-ld \
+        --with-isl=no \
+        --with-ppl=no \
+"
+
 GCC_CONFIGURE_R5 ?= " \
         --disable-decimal-float \
         --disable-libffi \
@@ -51,4 +102,4 @@ GCC_CONFIGURE_A9 ?= " \
         --with-isl=no \
         --with-ppl=no \
         --with-multilib-list=aprofile \
-"
+"
\ No newline at end of file