From 4f4d9169a838927f30f8c620cb3d87cfb28f1f99 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@xilinx.com>
Date: Mon, 24 Feb 2020 13:06:56 -0800
Subject: newlib: Cleanup and merge the two newlib bbappends into a single
 append

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
---
 .../recipes-bsp/newlib/libgloss_3.1.%.bbappend               |  7 -------
 .../recipes-bsp/newlib/newlib_3.1.%.bbappend                 | 12 ------------
 .../recipes-core/newlib/libgloss_3.1.0.bbappend              |  3 +++
 .../recipes-core/newlib/newlib_3.1.0.bbappend                | 12 ++++++++++++
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend
 delete mode 100644 meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend

diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend b/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend
deleted file mode 100644
index ce6773ca..00000000
--- a/meta-xilinx-standalone/recipes-bsp/newlib/libgloss_3.1.%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-DEPENDS += "${MLPREFIX}newlib"
-
-# The following isnt necessary on decoupling, since libxil is actually built
-# We use libgloss as if it was libxil, to avoid linking issues
-# do_install_append_microblaze-pmu(){
-#   cp ${D}/${libdir}/libgloss.a ${D}/${libdir}/libxil.a
-# }
diff --git a/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend b/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend
deleted file mode 100644
index d44c8bdc..00000000
--- a/meta-xilinx-standalone/recipes-bsp/newlib/newlib_3.1.%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-# Some of the currently required multilibs require specific workarounds.
-# The override values below are linked specifically to the baremetal toolchain BSPs
-
-do_configure_prepend(){
-    export CC_FOR_TARGET="${CC}"
-}
-
-# Fix for multilib newlib installations
-do_install_prepend() {
-	mkdir -p $(dirname ${D}${libdir})
-	mkdir -p $(dirname ${D}${includedir})
-}
diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
index 9a5bd2e2..3b19944b 100644
--- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
+++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
@@ -1,3 +1,6 @@
+# When building multiple, we need to depend on the multilib newlib
+DEPENDS += "${MLPREFIX}newlib"
+
 EXTRA_OECONF_append_xilinx-standalone = " \
 	--enable-newlib-io-c99-formats \
 	--enable-newlib-io-long-long \
diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
index 9a5bd2e2..fe0f5d57 100644
--- a/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
+++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
@@ -1,3 +1,4 @@
+
 EXTRA_OECONF_append_xilinx-standalone = " \
 	--enable-newlib-io-c99-formats \
 	--enable-newlib-io-long-long \
@@ -5,3 +6,14 @@ EXTRA_OECONF_append_xilinx-standalone = " \
 	--enable-newlib-io-long-double \
 	--disable-newlib-supplied-syscalls \
 "
+
+# Avoid trimmping CCARGS from CC by newlib configure
+do_configure_prepend(){
+    export CC_FOR_TARGET="${CC}"
+}
+
+# Fix for multilib newlib installations
+do_install_prepend() {
+        mkdir -p $(dirname ${D}${libdir})
+        mkdir -p $(dirname ${D}${includedir})
+}
-- 
cgit v1.2.3-54-g00ecf