newlib-microblaze: Update to new version of the port

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

11 files changed, 48 insertions, 38 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
index ad2f0270..584aab11 100644
--- 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
@@ -1,4 +1,4 @@
-From 6ab9f7d24447a18a30c18c914be082fe520f0ded Mon Sep 17 00:00:00 2001
+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
@@ -20,14 +20,15 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
  libgloss/config/microblaze.mt    | 30 ++++++++++++++++++++++++++++++
  libgloss/microblaze/configure    |  2 +-
- libgloss/microblaze/configure.in |  2 +-
+ libgloss/microblaze/configure.ac |  2 +-
  3 files changed, 32 insertions(+), 2 deletions(-)
  create mode 100644 libgloss/config/microblaze.mt
 
-Index: newlib-4.2.0.20211231/libgloss/config/microblaze.mt
-===================================================================
+diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt
+new file mode 100644
+index 000000000..e8fb922dd
 --- /dev/null
-+++ newlib-4.2.0.20211231/libgloss/config/microblaze.mt
++++ b/libgloss/config/microblaze.mt
 @@ -0,0 +1,30 @@
 +#
 +# Match default.mt to compile generic objects but continue building
@@ -59,11 +60,11 @@ Index: newlib-4.2.0.20211231/libgloss/config/microblaze.mt
 +       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
 +write.o: ${srcdir}/../write.c
 +       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-Index: newlib-4.2.0.20211231/libgloss/microblaze/configure
-===================================================================
---- newlib-4.2.0.20211231.orig/libgloss/microblaze/configure
-+++ newlib-4.2.0.20211231/libgloss/microblaze/configure
-@@ -2550,7 +2550,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
+diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure
+index 05f68682c..faa23c584 100755
+--- a/libgloss/microblaze/configure
++++ b/libgloss/microblaze/configure
+@@ -2550,7 +2550,7 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
  
  
  host_makefile_frag=${srcdir}/../config/default.mh
@@ -72,10 +73,10 @@ Index: newlib-4.2.0.20211231/libgloss/microblaze/configure
  
  host_makefile_frag_path=$host_makefile_frag
  
-Index: newlib-4.2.0.20211231/libgloss/microblaze/configure.ac
-===================================================================
---- newlib-4.2.0.20211231.orig/libgloss/microblaze/configure.ac
-+++ newlib-4.2.0.20211231/libgloss/microblaze/configure.ac
+diff --git a/libgloss/microblaze/configure.ac b/libgloss/microblaze/configure.ac
+index 5eda42e73..d5c789d40 100644
+--- a/libgloss/microblaze/configure.ac
++++ b/libgloss/microblaze/configure.ac
 @@ -35,7 +35,7 @@ LIB_AM_PROG_AS
  AC_SUBST(bsp_prefix)
  
@@ -85,3 +86,6 @@ Index: newlib-4.2.0.20211231/libgloss/microblaze/configure.ac
  
  dnl We have to assign the same value to other variables because autoconf
  dnl doesn't provide a mechanism to substitute a replacement keyword with
+-- 
+2.37.1 (Apple Git-137.1)
+
diff --git a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch b/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
index d53f4b5c..e39ee5b7 100644
--- a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
@@ -1,4 +1,4 @@
-From 4308ef295b12159ae381cbe5e35981ee0d424967 Mon Sep 17 00:00:00 2001
+From c96521b00af5259e1404c921cc6a22fbb16c1ace 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
@@ -21,5 +21,5 @@ index 59385ad9b..7a91a781e 100644
 -       addi r11,r11,8
         bra r11
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
index 06f797cb..e6404369 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/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
@@ -1,19 +1,22 @@
-From 9ec0650b1eef0bb5de18cd3cb1a179b28fbd43d3 Mon Sep 17 00:00:00 2001
+From 765f715f4077780395d381bf25870b61008f8013 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
  stdio.h for inclusion in toolchain and use in c++ apps
 
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
+
+Conflicts:
+        newlib/libc/include/stdio.h
 ---
  newlib/libc/include/stdio.h | 3 +++
  1 file changed, 3 insertions(+)
 
-Index: newlib-4.2.0.20211231/newlib/libc/include/stdio.h
-===================================================================
---- newlib-4.2.0.20211231.orig/newlib/libc/include/stdio.h
-+++ newlib-4.2.0.20211231/newlib/libc/include/stdio.h
-@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const cha
+diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
+index 7748351f0..fd95f1344 100644
+--- a/newlib/libc/include/stdio.h
++++ b/newlib/libc/include/stdio.h
+@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...)
                 _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
  int    remove (const char *);
  int    rename (const char *, const char *);
@@ -23,3 +26,6 @@ Index: newlib-4.2.0.20211231/newlib/libc/include/stdio.h
  #ifdef _LIBC
  int    _rename (const char *, const char *);
  #endif
+-- 
+2.37.1 (Apple Git-137.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/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
index 969b233c..4fa3da7f 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/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
@@ -1,4 +1,4 @@
-From 5698db8ac7c7fffe4e521d059fb67de58a4d3403 Mon Sep 17 00:00:00 2001
+From edf132aae14fadd15630916781a14a29cafd37ef 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
@@ -300,5 +300,5 @@ index f18ee8446..000000000
 -
 -/*---------------------------------------------------*/
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
index c7569a34..025f7192 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/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
@@ -1,4 +1,4 @@
-From 10bac9ca72e6648d4b7f11099aa59db11351f068 Mon Sep 17 00:00:00 2001
+From 250aa479da0b688b87f1fa42f45ecd4536194a45 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
@@ -21,5 +21,5 @@ index fe04a08c9..32aafda37 100644
  
  # Tiny Linux BSP.
 -- 
-2.17.1
+2.37.1 (Apple Git-137.1)
 
diff --git a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch b/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
index 07fe6d03..805e755e 100644
--- a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
@@ -1,4 +1,4 @@
-From 2681743c977fb03a897994ffe7d7bdde959737d9 Mon Sep 17 00:00:00 2001
+From 97684eb81807189dbcdca560d086100ba8bfa906 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
@@ -190,5 +190,5 @@ index 434195e2c..3119d82c5 100644
          {
            /* To get here, *a1 == *a2, thus if we find a null in *a1,
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
index c2a53086..ee7037a7 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/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
@@ -1,4 +1,4 @@
-From 151b3a67b345eebb6e3e57ce4069da823f102958 Mon Sep 17 00:00:00 2001
+From e7b0c93274c2f51adc7c20c24a28d3cd5974fddc 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
@@ -1133,5 +1133,5 @@ index cdd87c76f..971862bcb 100644
 +#endif
  .end setjmp    
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
index 157ffa3a..915a26ef 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/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
@@ -1,4 +1,4 @@
-From b60672b856128abc38cbc4d7ea408c17227d62da Mon Sep 17 00:00:00 2001
+From 924721fdb8eed60fe58c8a7976955bac02efc200 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
@@ -98,5 +98,5 @@ index 54ba473ea..a25c84734 100644
          brealid        r15, _crtinit               /* Initialize BSS and run program */
         nop
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
index 649b6153..40d69465 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/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
@@ -1,4 +1,4 @@
-From 1080d076ac42c0173711fb3b77bc363dd89b7d35 Mon Sep 17 00:00:00 2001
+From e7a5086bc3e38cf5bc5c5943de6cf5135ed6a77b 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
@@ -226,5 +226,5 @@ index acb4464bc..b6f2d3c13 100644
  #endif  /* ! HAVE_HW_PCMP */
  }
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
index 4c3d7435..cd98dfa1 100644
--- a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
@@ -1,4 +1,4 @@
-From 13e583a48d752283dc9b5dd7e2eb67f23ba61e43 Mon Sep 17 00:00:00 2001
+From 6b8e5c7a773de4609f9c855aa714eca5a3f8b4ab 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
@@ -335,5 +335,5 @@ index b6f2d3c13..940753996 100644
  #endif  /* ! HAVE_HW_PCMP */
  }
 -- 
-2.17.1
+2.37.1 (Apple Git-137.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/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
index b917a7de..ba5fcb8c 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/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
@@ -1,4 +1,4 @@
-From 8c312a38bae2a32ebad15e258e71e82781638f19 Mon Sep 17 00:00:00 2001
+From bab2eafd2d4ca1f2caacd50120e8ac94aca1b7c4 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
@@ -21,5 +21,5 @@ index 854117536..f79140734 100644
         beagti  r18, .Lloopsbss
  .Lendsbss:
 -- 
-2.17.1
+2.37.1 (Apple Git-137.1)