newlib/libgloss: Rebase patch for current version

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

2 files changed, 18 insertions, 25 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 14e162a5..ad2f0270 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
@@ -24,11 +24,10 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
  3 files changed, 32 insertions(+), 2 deletions(-)
  create mode 100644 libgloss/config/microblaze.mt
 
-diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt
-new file mode 100644
-index 000000000..e8fb922dd
+Index: newlib-4.2.0.20211231/libgloss/config/microblaze.mt
+===================================================================
 --- /dev/null
-+++ b/libgloss/config/microblaze.mt
++++ newlib-4.2.0.20211231/libgloss/config/microblaze.mt
 @@ -0,0 +1,30 @@
 +#
 +# Match default.mt to compile generic objects but continue building
@@ -60,11 +59,11 @@ index 000000000..e8fb922dd
 +       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
 +write.o: ${srcdir}/../write.c
 +       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure
-index 9b2bc7ab4..01f0fb29d 100644
---- a/libgloss/microblaze/configure
-+++ b/libgloss/microblaze/configure
-@@ -2020,7 +2020,7 @@ LIB_AM_PROG_AS
+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
  
  
  host_makefile_frag=${srcdir}/../config/default.mh
@@ -73,10 +72,10 @@ index 9b2bc7ab4..01f0fb29d 100644
  
  host_makefile_frag_path=$host_makefile_frag
  
-diff --git a/libgloss/microblaze/configure.in b/libgloss/microblaze/configure.in
-index 77aa769d4..5d179fdfc 100644
---- a/libgloss/microblaze/configure.in
-+++ b/libgloss/microblaze/configure.in
+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
 @@ -35,7 +35,7 @@ LIB_AM_PROG_AS
  AC_SUBST(bsp_prefix)
  
@@ -86,6 +85,3 @@ index 77aa769d4..5d179fdfc 100644
  
  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.17.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 3ecad637..06f797cb 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
@@ -9,20 +9,17 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
  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 ab18806e3..8240dd8ab 100644
---- a/newlib/libc/include/stdio.h
-+++ b/newlib/libc/include/stdio.h
-@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...)
+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
                 _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
  int    remove (const char *);
  int    rename (const char *, const char *);
 +void   xil_printf (const char*, ...);
 +void   putnum (unsigned int );
 +void   print (const char* );
- #ifdef _COMPILING_NEWLIB
+ #ifdef _LIBC
  int    _rename (const char *, const char *);
  #endif
--- 
-2.17.1
-