gcc-runtime: Set correct overrides now that the build has been fixed in oe-core

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

1 files changed, 13 insertions, 9 deletions

diff --git a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend
index 5400aa0c..90a867ff 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend
@@ -4,21 +4,25 @@ EXTRA_OECONF_append = " --cache-file="
 # Dont build libitm, etc.
 RUNTIMETARGET_xilinx-standalone = "libstdc++-v3"
 
-# These overrides can potentially be cleaned (e.g. use just one) if it doesnt affect nativesdk class
-EXTRA_OECONF_remove_xilinx-standalone_aarch64 = "--enable-symvers=gnu"
-EXTRA_OECONF_remove_xilinx-standalone_arm = "--enable-symvers=gnu"
+SYMVERS_CONF_xilinx-standalone =""
 
-EXTRA_OECONF_append_xilinx-standalone_aarch64 = " --enable-multilib  --with-newlib"
-EXTRA_OECONF_append_xilinx-standalone_cortexr5 = " --enable-multilib --with-newlib --with-multilib-list=rmprofile"
 
-# Does cortexa9 needs multilib?
+EXTRA_OECONF_append_xilinx-standalone = " --enable-multilib  --with-newlib"
+EXTRA_OECONF_append_xilinx-standalone_cortexr5 = " --with-multilib-list=rmprofile"
+EXTRA_OECONF_append_xilinx-standalone_zc702-zynq7 = " --with-multilib-list=aprofile"
 
-# Are the py files necessary?
+# Recursve 5 levels due to the several combinations of multilibs built
 FILES_libstdc++-staticdev += " \
+    ${libdir}/libsupc++.a* \
     ${libdir}/libstdc++*.a* \
     ${libdir}/**/libsupc++.a* \
     ${libdir}/**/libstdc++*.a* \
-    ${libdir}/**/libsupc++.a* \
-    ${libdir}/**/**/**/libstdc++*.a* \
+    ${libdir}/**/**/libsupc++.a* \
+    ${libdir}/**/**/libstdc++*.a* \
     ${libdir}/**/**/**/libsupc++.a* \
+    ${libdir}/**/**/**/libstdc++*.a* \
+    ${libdir}/**/**/**/**/libsupc++.a* \
+    ${libdir}/**/**/**/**/libstdc++*.a* \
+    ${libdir}/**/**/**/**/**/libsupc++.a* \
+    ${libdir}/**/**/**/**/**/libstdc++*.a* \
 "