binutils/gcc: Refactor the oeconf

The special arguments do not appear to be needed, and using the standard
configuration arguments will more easily enable other components as well.

Note, additional refactoring will be needed, only aarch64 has been verified.

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

6 files changed, 14 insertions, 167 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 1e4d8b02..086aa195 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross-canadian_%.bbappend
@@ -1,29 +1,11 @@
 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 = " \
+EXTRA_OECONF_append_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
         ${BINUTILS_CONFIGURE_R5} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
+EXTRA_OECONF_append_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
         ${BINUTILS_CONFIGURE_MB} \
 "
-EXTRA_OECONF_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
+EXTRA_OECONF_append_pn-binutils-cross-canadian-${TARGET_ARCH}_xilinx-standalone_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 fd1702e4..32a50e3c 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-cross_%.bbappend
@@ -1,31 +1,13 @@
 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-${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 = " \
+EXTRA_OECONF_append_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
         ${BINUTILS_CONFIGURE_R5} \
 "
 
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
+EXTRA_OECONF_append_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
         ${BINUTILS_CONFIGURE_MB} \
 "
 
-EXTRA_OECONF_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
+EXTRA_OECONF_append_pn-binutils-cross-${TARGET_ARCH}_xilinx-standalone_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 4170ee02..5883f07d 100644
--- a/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-standalone/binutils/binutils-xilinx-standalone.inc
@@ -2,29 +2,6 @@
 # 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 \
@@ -43,4 +20,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 9143434a..85543b66 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross-canadian_%.bbappend
@@ -1,36 +1,17 @@
 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_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
+EXTRA_OECONF_append_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
         ${GCC_CONFIGURE_R5} \
 "
 
 # MB
-EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
+EXTRA_OECONF_append_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
         ${GCC_CONFIGURE_MB} \
 "
 
 # Cortex-A9
-EXTRA_OECONF_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
+EXTRA_OECONF_append_pn-gcc-cross-canadian-${TARGET_ARCH}_xilinx-standalone_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 cad0cecc..2f013442 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-cross_%.bbappend
@@ -1,40 +1,16 @@
 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_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_cortexr5 = " \
+EXTRA_OECONF_append_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_cortexr5 = " \
         ${GCC_CONFIGURE_R5} \
 "
 
 # MB
-EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_zynqmp-pmu = " \
+EXTRA_OECONF_append_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_zynqmp-pmu = " \
         ${GCC_CONFIGURE_MB} \
 "
 
 # Cortex-A9
-EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_append_zc702-zynq7 = " \
+EXTRA_OECONF_append_pn-gcc-cross-${TARGET_ARCH}_xilinx-standalone_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 007998ca..70b85eb0 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-xilinx-standalone.inc
@@ -2,57 +2,6 @@
 # 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 \
@@ -102,4 +51,4 @@ GCC_CONFIGURE_A9 ?= " \
         --with-isl=no \
         --with-ppl=no \
         --with-multilib-list=aprofile \
-"
\ No newline at end of file
+"