meta-xilinx-standalone gcc: Fix microblaze crtend.o

Issue: CR-1065455

Microblaze does not support initfini_array in a baremetal configuration.
This has previously been disabled in binutils, but it was missed in GCC and
related libraries.

This patch slightly restructures the baremetal configurations to move the
common configuration elements into a single configure set.  This matches the
behavior from the Yocto Project gcc-configure-common.inc file.

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

6 files changed, 13 insertions, 10 deletions

diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc
new file mode 100644
index 00000000..b9bfe83d
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc
@@ -0,0 +1,7 @@
+# Mimic the file gcc-configure-common from the Yocto Project
+LINKER_HASH_STYLE_xilinx-standalone = ""
+SYMVERS_CONF_xilinx-standalone = ""
+
+EXTRA_OECONF_append_xilinx-standalone_microblaze = " --disable-initfini_array"
+
+EXTRA_OECONF_append_xilinx-standalone_microblaze = " --disable-__cxa_atexit"
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
index 6a3138a3..15234848 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
@@ -1,3 +1,4 @@
+require gcc-configure-xilinx-standalone.inc
 require gcc-xilinx-standalone.inc
 
 # We want to use the stock multilib configs, when available
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend
index dd810a12..22a3e3a9 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend
@@ -1,3 +1,4 @@
+require gcc-configure-xilinx-standalone.inc
 require gcc-xilinx-standalone.inc
 
 # We want to use the stock multilib configs, when available
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index 7d177efe..7057a057 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -1,8 +1,6 @@
-COMPATIBLE_HOST = "${HOST_SYS}"
+require gcc-configure-xilinx-standalone.inc
 
-# Copy of gcc-xilinx-standalone.inc, but with _class-target added
-LINKER_HASH_STYLE_xilinx-standalone_class-target = ""
-SYMVERS_CONF_xilinx-standalone_class-target = ""
+COMPATIBLE_HOST = "${HOST_SYS}"
 
 EXTRA_OECONF_append_xilinx-standalone_class-target = " \
         --disable-libstdcxx-pch \
@@ -33,7 +31,6 @@ EXTRA_OECONF_append_xilinx-standalone_armrm_class-target = " \
         "
 
 EXTRA_OECONF_append_xilinx-standalone_microblaze_class-target = " \
-        --disable-__cxa_atexit \
         --enable-target-optspace \
         --without-long-double-128 \
         "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
index 34b5083e..29f67aff 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
@@ -1,7 +1,3 @@
-# Any changes to this file should be synced with gcc-runtime_%.bbappend
-LINKER_HASH_STYLE_xilinx-standalone = ""
-SYMVERS_CONF_xilinx-standalone = ""
-
 EXTRA_OECONF_append_xilinx-standalone = " \
         --disable-libstdcxx-pch \
         --with-newlib \
@@ -30,7 +26,6 @@ EXTRA_OECONF_append_xilinx-standalone_armrm = " \
         "
 
 EXTRA_OECONF_append_xilinx-standalone_microblaze = " \
-        --disable-__cxa_atexit \
         --enable-target-optspace \
         --without-long-double-128 \
         "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
index e0f28915..e80b0b79 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
@@ -1,3 +1,5 @@
+require gcc-configure-xilinx-standalone.inc
+
 COMPATIBLE_HOST = "${HOST_SYS}"
 
 python do_multilib_install_xilinx-standalone_class-target () {