meta-microblaze: newlib/libgloss: Update for microblaze

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

17 files changed, 114 insertions, 173 deletions

diff --git a/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch
deleted file mode 100644
index 31076208..00000000
--- a/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d3b09cb319fb1af1bcb83aa50d559ccccdeac639 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 23 Jan 2017 15:27:25 +0530
-Subject: [PATCH 01/11] [Patch, microblaze]: Add config/microblaze.mt for
- target_makefile_frag Mirror MIPS method of creating copy of default.mt which
- drops the compilation of generic sbrk.c to instead continue using the
- microblaze provided version.
-
-[Libgloss]
-
-Changelog
-
-2013-07-15  David Holsgrove <david.holsgrove@xilinx.com>
-
-  * config/microblaze.mt: New file.
-  * microblaze/configure.in: Switch default.mt to microblaze.mt.
-  * microblaze/configure: Likewise.
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-
-Upstream-Status: Pending
-
----
- libgloss/config/microblaze.mt    | 30 ++++++++++++++++++++++++++++++
- libgloss/microblaze/configure    |  2 +-
- libgloss/microblaze/configure.ac |  2 +-
- 3 files changed, 32 insertions(+), 2 deletions(-)
- create mode 100644 libgloss/config/microblaze.mt
-
-Index: git/libgloss/config/microblaze.mt
-===================================================================
---- /dev/null
-+++ git/libgloss/config/microblaze.mt
-@@ -0,0 +1,30 @@
-+#
-+# Match default.mt to compile generic objects but continue building
-+# MicroBlaze specific sbrk.c
-+#
-+close.o: ${srcdir}/../close.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+fstat.o: ${srcdir}/../fstat.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+getpid.o: ${srcdir}/../getpid.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+isatty.o: ${srcdir}/../isatty.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+kill.o: ${srcdir}/../kill.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+lseek.o: ${srcdir}/../lseek.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+open.o: ${srcdir}/../open.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+print.o: ${srcdir}/../print.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+putnum.o: ${srcdir}/../putnum.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+read.o: ${srcdir}/../read.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+stat.o: ${srcdir}/../stat.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+unlink.o: ${srcdir}/../unlink.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-+write.o: ${srcdir}/../write.c
-+       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-Index: git/libgloss/configure
-===================================================================
---- git.orig/libgloss/configure
-+++ git/libgloss/configure
-@@ -2909,6 +2909,7 @@ case "${target}" in
-        ac_config_files="$ac_config_files microblaze/Makefile"
- 
-        subdirs="$subdirs microblaze"
-+       target_makefile_frag=${srcdir}/config/microblaze.mt
-        ;;
-   mt-*-*)
-        ac_config_files="$ac_config_files mt/Makefile"
-Index: git/libgloss/configure.ac
-===================================================================
---- git.orig/libgloss/configure.ac
-+++ git/libgloss/configure.ac
-@@ -172,6 +172,7 @@ case "${target}" in
-   microblaze*-*-*)
-        AC_CONFIG_FILES([microblaze/Makefile])
-        subdirs="$subdirs microblaze"
-+       target_makefile_frag=${srcdir}/config/microblaze.mt
-        ;;
-   mt-*-*)
-        AC_CONFIG_FILES([mt/Makefile])
diff --git a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Modified-_exceptional_handler.patch
index 3c940329..6e0e2377 100644
--- a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Modified-_exceptional_handler.patch
@@ -1,13 +1,12 @@
-From c96521b00af5259e1404c921cc6a22fbb16c1ace Mon Sep 17 00:00:00 2001
+From e2293e32df22089aa9a9fb3727aba4faa3774b7c Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 23 Jan 2017 15:30:02 +0530
-Subject: [PATCH 02/11] [Patch, microblaze]: Modified _exceptional_handler
+Subject: [PATCH 01/11] [Patch, microblaze]: Modified _exceptional_handler
  Modified the _exceptional_handler to support the changes made in GCC related
  to Superviosry call
 
 Signed-off-by:Nagaraju Mekala<nmekala@xilix.com>
-
-Upstream-Status: Pending
+(cherry picked from commit c96521b00af5259e1404c921cc6a22fbb16c1ace)
 ---
  libgloss/microblaze/_exception_handler.S | 1 -
  1 file changed, 1 deletion(-)
@@ -23,5 +22,5 @@ index 59385ad9b..7a91a781e 100644
 -       addi r11,r11,8
         bra r11
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch b/meta-microblaze/recipes-core/newlib/files/0002-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
index 96b83269..74389b07 100644
--- a/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0002-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
@@ -1,24 +1,24 @@
-From 765f715f4077780395d381bf25870b61008f8013 Mon Sep 17 00:00:00 2001
+From b7b5423f937e63dcb09dbd2d14566e82ff7adc67 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 23 Jan 2017 15:39:45 +0530
-Subject: [PATCH 03/11] [LOCAL]: Add missing declarations for xil_printf to
+Subject: [PATCH 02/11] [LOCAL]: Add missing declarations for xil_printf to
  stdio.h for inclusion in toolchain and use in c++ apps
 
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 
-Upstream-Status: Pending
-
 Conflicts:
         newlib/libc/include/stdio.h
+
+(cherry picked from commit 765f715f4077780395d381bf25870b61008f8013)
 ---
  newlib/libc/include/stdio.h | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
-index 7748351f0..fd95f1344 100644
+index 77966578d..fda52fdba 100644
 --- a/newlib/libc/include/stdio.h
 +++ b/newlib/libc/include/stdio.h
-@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...)
+@@ -251,6 +251,9 @@ int sprintf (char *__restrict, const char *__restrict, ...)
                 _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
  int    remove (const char *);
  int    rename (const char *, const char *);
@@ -29,5 +29,5 @@ index 7748351f0..fd95f1344 100644
  int    _rename (const char *, const char *);
  #endif
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch b/meta-microblaze/recipes-core/newlib/files/0003-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
index 6d398bdc..d3775f4e 100644
--- a/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0003-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
@@ -1,11 +1,10 @@
-From edf132aae14fadd15630916781a14a29cafd37ef Mon Sep 17 00:00:00 2001
+From 471a4a4ee556af3274b6d3652cfd4f35801b9b57 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 23 Jan 2017 15:42:11 +0530
-Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part
+Subject: [PATCH 03/11] [Local]: deleting the xil_printf.c file as now it part
  of BSP
 
-Upstream-Status: Pending
-
+(cherry picked from commit edf132aae14fadd15630916781a14a29cafd37ef)
 ---
  libgloss/microblaze/xil_printf.c | 284 -------------------------------
  1 file changed, 284 deletions(-)
@@ -302,5 +301,5 @@ index f18ee8446..000000000
 -
 -/*---------------------------------------------------*/
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch b/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
index 1576e54d..b441c320 100644
--- a/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
@@ -1,19 +1,18 @@
-From 250aa479da0b688b87f1fa42f45ecd4536194a45 Mon Sep 17 00:00:00 2001
+From cff1abc10b20e8f9083ee7a5dc3ebfae431c430c Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 23 Jan 2017 15:44:17 +0530
-Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE
-
-Upstream-Status: Pending
+Subject: [PATCH 04/11] [Local]: deleting the xil_printf.o from MAKEFILE
 
+(cherry picked from commit 250aa479da0b688b87f1fa42f45ecd4536194a45)
 ---
  libgloss/microblaze/Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libgloss/microblaze/Makefile.in b/libgloss/microblaze/Makefile.in
-index fe04a08c9..32aafda37 100644
+index f1fa286bb..6d369242d 100644
 --- a/libgloss/microblaze/Makefile.in
 +++ b/libgloss/microblaze/Makefile.in
-@@ -81,7 +81,7 @@ GENOBJS = fstat.o getpid.o isatty.o kill.o lseek.o print.o putnum.o stat.o unlin
+@@ -83,7 +83,7 @@ GENOBJS = fstat.o getpid.o isatty.o kill.o lseek.o print.o putnum.o stat.o unlin
            open.o close.o read.o write.o
  OBJS = ${GENOBJS} sbrk.o timer.o _exception_handler.o _hw_exception_handler.o \
         _interrupt_handler.o _program_clean.o _program_init.o \
@@ -23,5 +22,5 @@ index fe04a08c9..32aafda37 100644
  
  # Tiny Linux BSP.
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch b/meta-microblaze/recipes-core/newlib/files/0005-MB-X-intial-commit.patch
index 779580b6..3f113228 100644
--- a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0005-MB-X-intial-commit.patch
@@ -1,10 +1,9 @@
-From 97684eb81807189dbcdca560d086100ba8bfa906 Mon Sep 17 00:00:00 2001
+From 6c4a1e25108584fc472f42d58b14ee5f951080d9 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Fri, 27 Jul 2018 16:10:36 +0530
-Subject: [PATCH 06/11] MB-X intial commit
-
-Upstream-Status: Pending
+Subject: [PATCH 05/11] MB-X intial commit
 
+(cherry picked from commit 97684eb81807189dbcdca560d086100ba8bfa906)
 ---
  libgloss/microblaze/crt0.S              | 2 +-
  libgloss/microblaze/crt1.S              | 2 +-
@@ -192,5 +191,5 @@ index 434195e2c..3119d82c5 100644
          {
            /* To get here, *a1 == *a2, thus if we find a null in *a1,
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch b/meta-microblaze/recipes-core/newlib/files/0006-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
index f3e20253..52a4319b 100644
--- a/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0006-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
@@ -1,14 +1,14 @@
-From e7b0c93274c2f51adc7c20c24a28d3cd5974fddc Mon Sep 17 00:00:00 2001
+From 9fcd09b603d8deb2bbd3557aae6faba311dbdf12 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 11 Sep 2018 14:32:20 +0530
-Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64
+Subject: [PATCH 06/11] [Patch, Microblaze]: newlib port for microblaze m64
  flag...
 
-Upstream-Status: Pending
-
 Conflicts:
         libgloss/microblaze/_hw_exception_handler.S
         libgloss/microblaze/_interrupt_handler.S
+
+(cherry picked from commit e7b0c93274c2f51adc7c20c24a28d3cd5974fddc)
 ---
  libgloss/microblaze/_exception_handler.S    |   6 +-
  libgloss/microblaze/_hw_exception_handler.S |   7 +-
@@ -1135,5 +1135,5 @@ index cdd87c76f..971862bcb 100644
 +#endif
  .end setjmp    
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch b/meta-microblaze/recipes-core/newlib/files/0007-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
index b82d7b5c..6e7b2e48 100644
--- a/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0007-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
@@ -1,11 +1,10 @@
-From 924721fdb8eed60fe58c8a7976955bac02efc200 Mon Sep 17 00:00:00 2001
+From eb41f08c22949726576d001e27ec8be3531d947a Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Fri, 28 Sep 2018 12:07:43 +0530
-Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of
+Subject: [PATCH 07/11] fixing the bug in crt files, added addlik instead of
  lli insn
 
-Upstream-Status: Pending
-
+(cherry picked from commit 924721fdb8eed60fe58c8a7976955bac02efc200)
 ---
  libgloss/microblaze/crt0.S | 6 +++---
  libgloss/microblaze/crt1.S | 6 +++---
@@ -100,5 +99,5 @@ index 54ba473ea..a25c84734 100644
          brealid        r15, _crtinit               /* Initialize BSS and run program */
         nop
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch b/meta-microblaze/recipes-core/newlib/files/0008-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
index 1a89c31b..7eaf0a88 100644
--- a/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0008-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
@@ -1,11 +1,10 @@
-From e7a5086bc3e38cf5bc5c5943de6cf5135ed6a77b Mon Sep 17 00:00:00 2001
+From 82e5a92af613455cb7aed4eee7da3d723e5f5011 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 17 Nov 2020 13:06:41 +0530
-Subject: [PATCH 09/11] [Patch,MicroBlaze] : Added MB-64 support to
+Subject: [PATCH 08/11] [Patch,MicroBlaze] : Added MB-64 support to
  strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati<mbodapat@xilinx.com>
 
-Upstream-Status: Pending
-
+(cherry picked from commit e7a5086bc3e38cf5bc5c5943de6cf5135ed6a77b)
 ---
  newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++-
  newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++
@@ -228,5 +227,5 @@ index acb4464bc..b6f2d3c13 100644
  #endif  /* ! HAVE_HW_PCMP */
  }
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
index aaa2a009..2a3d8632 100644
--- a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
@@ -1,12 +1,12 @@
-From 6b8e5c7a773de4609f9c855aa714eca5a3f8b4ab Mon Sep 17 00:00:00 2001
+From 5a7955b68f5066b00413e751d1de967181c88b94 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 9 Nov 2021 22:53:44 +0530
-Subject: [PATCH 10/11] [Patch,MicroBlaze] : Removing the Assembly
+Subject: [PATCH 09/11] [Patch,MicroBlaze] : Removing the Assembly
  implementation of 64bit string function.
 
 Revisit in next release and fix it
 
-Upstream-Status: Pending
+(cherry picked from commit 6b8e5c7a773de4609f9c855aa714eca5a3f8b4ab)
 ---
  newlib/libc/machine/microblaze/mb_endian.h |  4 +
  newlib/libc/machine/microblaze/strcmp.c    | 95 ++++++++--------------
@@ -337,5 +337,5 @@ index b6f2d3c13..940753996 100644
  #endif  /* ! HAVE_HW_PCMP */
  }
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch b/meta-microblaze/recipes-core/newlib/files/0010-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
index 5e89db18..76b83372 100644
--- a/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0010-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
@@ -1,10 +1,9 @@
-From bab2eafd2d4ca1f2caacd50120e8ac94aca1b7c4 Mon Sep 17 00:00:00 2001
+From 3790e623bec70441d7d34f9390760b611a968e9d Mon Sep 17 00:00:00 2001
 From: Nagaraju <nmekala@xilinx.com>
 Date: Tue, 14 Jan 2020 22:32:30 +0530
-Subject: [PATCH 11/11] Fixed the bug in crtinit.s for MB-64
-
-Upstream-Status: Pending
+Subject: [PATCH 10/11] Fixed the bug in crtinit.s for MB-64
 
+(cherry picked from commit bab2eafd2d4ca1f2caacd50120e8ac94aca1b7c4)
 ---
  libgloss/microblaze/crtinit.S | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -23,5 +22,5 @@ index 854117536..f79140734 100644
         beagti  r18, .Lloopsbss
  .Lendsbss:
 -- 
-2.37.1 (Apple Git-137.1)
+2.34.1
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0011-Use-port-specific-sbrk.patch b/meta-microblaze/recipes-core/newlib/files/0011-Use-port-specific-sbrk.patch
new file mode 100644
index 00000000..52df9e34
--- /dev/null
+++ b/meta-microblaze/recipes-core/newlib/files/0011-Use-port-specific-sbrk.patch
@@ -0,0 +1,24 @@
+From c7e7aea9c60f87096a38604a9d4738cf762669dd Mon Sep 17 00:00:00 2001
+From: Aayush Misra <aayushm@amd.com>
+Date: Fri, 26 Jul 2024 19:08:17 +0530
+Subject: [PATCH 11/11] Use port-specific sbrk
+
+---
+ libgloss/microblaze/Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgloss/microblaze/Makefile.in b/libgloss/microblaze/Makefile.in
+index 6d369242d..d5206a849 100644
+--- a/libgloss/microblaze/Makefile.in
++++ b/libgloss/microblaze/Makefile.in
+@@ -122,6 +122,7 @@ linux-crt0.o: linux-crt0.S
+ crtinit.o: crtinit.S
+ sim-crtinit.o: sim-crtinit.S
+ sim-pgcrtinit.o: sim-pgcrtinit.S
++sbrk.o: sbrk.c
+ 
+ # target specific makefile fragment comes in here.
+ @target_makefile_frag@
+-- 
+2.34.1
+
diff --git a/meta-microblaze/recipes-core/newlib/libgloss-microblaze.inc b/meta-microblaze/recipes-core/newlib/libgloss-microblaze.inc
new file mode 100644
index 00000000..5410286b
--- /dev/null
+++ b/meta-microblaze/recipes-core/newlib/libgloss-microblaze.inc
@@ -0,0 +1,13 @@
+require microblaze-newlib.inc
+
+do_configure:prepend() {
+    # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
+    export CC="${CC} -L${S}/libgloss/microblaze"
+}
+
+# Libgloss provides various .o files in libdir
+# These must NOT be stripped, but for some reason they are installed +x
+# which triggers them to be stripped.
+do_install:append() {
+    chmod 0644 ${D}${libdir}/*.o
+}
diff --git a/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend
index 15be1732..0ebe2e13 100644
--- a/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend
@@ -1,13 +1,4 @@
-require microblaze-newlib.inc
+MICROBLAZEPATCHES = ""
+MICROBLAZEPATCHES:microblaze = "libgloss-microblaze.inc"
 
-do_configure:prepend:microblaze() {
-    # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
-    export CC="${CC} -L${S}/libgloss/microblaze"
-}
-
-# Libgloss provides various .o files in libdir
-# These must NOT be stripped, but for some reason they are installed +x
-# which triggers them to be stripped.
-do_install:append:microblaze() {
-    chmod 0644 ${D}${libdir}/*.o
-}
+require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index a1e3b92f..99d3d02e 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -1,19 +1,23 @@
 # Add MicroBlaze Patches
-FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/files"
-SRC_URI:append:microblaze = " \
-    file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \
-    file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \
-    file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \
-    file://0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \
-    file://0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \
-    file://0006-MB-X-intial-commit.patch \
-    file://0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \
-    file://0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \
-    file://0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch \
-    file://0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch \
-    file://0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch \
+FILESEXTRAPATHS:append := ":${THISDIR}/files"
+
+# Our changes are all local, no real patch-status
+ERROR_QA:remove = "patch-status"
+
+SRC_URI += " \
+    file://0001-Patch-microblaze-Modified-_exceptional_handler.patch \
+    file://0002-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \
+    file://0003-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \
+    file://0004-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \
+    file://0005-MB-X-intial-commit.patch \
+    file://0006-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \
+    file://0007-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \
+    file://0008-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch \
+    file://0009-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch \
+    file://0010-Fixed-the-bug-in-crtinit.s-for-MB-64.patch \
+    file://0011-Use-port-specific-sbrk.patch \
     "
 
-EXTRA_OECONF:append:xilinx-standalone:microblaze = " \
+EXTRA_OECONF:append:xilinx-standalone = " \
     --disable-newlib-reent-check-verify \
 "
diff --git a/meta-microblaze/recipes-core/newlib/newlib-microblaze.inc b/meta-microblaze/recipes-core/newlib/newlib-microblaze.inc
new file mode 100644
index 00000000..116bfbf3
--- /dev/null
+++ b/meta-microblaze/recipes-core/newlib/newlib-microblaze.inc
@@ -0,0 +1,7 @@
+require microblaze-newlib.inc
+
+do_configure:prepend() {
+    # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
+    export CC="${CC} -L${S}/libgloss/microblaze"
+}
+
diff --git a/meta-microblaze/recipes-core/newlib/newlib_%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_%.bbappend
index d30e61ec..27bdee48 100644
--- a/meta-microblaze/recipes-core/newlib/newlib_%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/newlib_%.bbappend
@@ -1,7 +1,4 @@
-require microblaze-newlib.inc
-
-do_configure:prepend:microblaze() {
-    # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
-    export CC="${CC} -L${S}/libgloss/microblaze"
-}
+MICROBLAZEPATCHES = ""
+MICROBLAZEPATCHES:microblaze = "newlib-microblaze.inc"
 
+require ${MICROBLAZEPATCHES}