From 13e2e08f028da93469d6a0ee18a153e9b5ae303d Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 20 Mar 2024 14:39:12 -0600 Subject: meta-microblaze: newlib: Update patches Rebase 0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch to newer version of newlib. All patches, add Upstream-Status as now required by the build system. Signed-off-by: Mark Hatle --- ...blaze-Add-config-microblaze.mt-for-target.patch | 61 ++++++++++------------ ...-microblaze-Modified-_exceptional_handler.patch | 2 + ...issing-declarations-for-xil_printf-to-std.patch | 2 + ...ing-the-xil_printf.c-file-as-now-it-part-.patch | 2 + ...l-deleting-the-xil_printf.o-from-MAKEFILE.patch | 2 + .../newlib/files/0006-MB-X-intial-commit.patch | 2 + ...blaze-newlib-port-for-microblaze-m64-flag.patch | 2 + ...bug-in-crt-files-added-addlik-instead-of-.patch | 2 + ...Blaze-Added-MB-64-support-to-strcmp-strcp.patch | 2 + ...Blaze-Removing-the-Assembly-implementatio.patch | 2 + ...0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch | 2 + 11 files changed, 49 insertions(+), 32 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 584aab11..31076208 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 @@ -17,6 +17,9 @@ Changelog * microblaze/configure: Likewise. Signed-off-by: David Holsgrove + +Upstream-Status: Pending + --- libgloss/config/microblaze.mt | 30 ++++++++++++++++++++++++++++++ libgloss/microblaze/configure | 2 +- @@ -24,11 +27,10 @@ Signed-off-by: David Holsgrove 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: git/libgloss/config/microblaze.mt +=================================================================== --- /dev/null -+++ b/libgloss/config/microblaze.mt ++++ git/libgloss/config/microblaze.mt @@ -0,0 +1,30 @@ +# +# Match default.mt to compile generic objects but continue building @@ -60,32 +62,27 @@ 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 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 --target_makefile_frag=${srcdir}/../config/default.mt -+target_makefile_frag=${srcdir}/../config/microblaze.mt +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" - host_makefile_frag_path=$host_makefile_frag - -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) - - host_makefile_frag=${srcdir}/../config/default.mh --target_makefile_frag=${srcdir}/../config/default.mt -+target_makefile_frag=${srcdir}/../config/microblaze.mt - - 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) - + 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/0002-Patch-microblaze-Modified-_exceptional_handler.patch index e39ee5b7..3c940329 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 @@ -6,6 +6,8 @@ Subject: [PATCH 02/11] [Patch, microblaze]: Modified _exceptional_handler to Superviosry call Signed-off-by:Nagaraju Mekala + +Upstream-Status: Pending --- libgloss/microblaze/_exception_handler.S | 1 - 1 file changed, 1 deletion(-) 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 e6404369..96b83269 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 @@ -6,6 +6,8 @@ Subject: [PATCH 03/11] [LOCAL]: Add missing declarations for xil_printf to Signed-off-by: David Holsgrove +Upstream-Status: Pending + Conflicts: newlib/libc/include/stdio.h --- 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 4fa3da7f..6d398bdc 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 @@ -4,6 +4,8 @@ Date: Mon, 23 Jan 2017 15:42:11 +0530 Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part of BSP +Upstream-Status: Pending + --- libgloss/microblaze/xil_printf.c | 284 ------------------------------- 1 file changed, 284 deletions(-) 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 025f7192..1576e54d 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 @@ -3,6 +3,8 @@ From: Mahesh Bodapati Date: Mon, 23 Jan 2017 15:44:17 +0530 Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE +Upstream-Status: Pending + --- libgloss/microblaze/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 805e755e..779580b6 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 @@ -3,6 +3,8 @@ From: Nagaraju Mekala Date: Fri, 27 Jul 2018 16:10:36 +0530 Subject: [PATCH 06/11] MB-X intial commit +Upstream-Status: Pending + --- libgloss/microblaze/crt0.S | 2 +- libgloss/microblaze/crt1.S | 2 +- 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 ee7037a7..f3e20253 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 @@ -4,6 +4,8 @@ Date: Tue, 11 Sep 2018 14:32:20 +0530 Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64 flag... +Upstream-Status: Pending + Conflicts: libgloss/microblaze/_hw_exception_handler.S libgloss/microblaze/_interrupt_handler.S 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 915a26ef..b82d7b5c 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 @@ -4,6 +4,8 @@ Date: Fri, 28 Sep 2018 12:07:43 +0530 Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of lli insn +Upstream-Status: Pending + --- libgloss/microblaze/crt0.S | 6 +++--- libgloss/microblaze/crt1.S | 6 +++--- 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 40d69465..1a89c31b 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 @@ -4,6 +4,8 @@ Date: Tue, 17 Nov 2020 13:06:41 +0530 Subject: [PATCH 09/11] [Patch,MicroBlaze] : Added MB-64 support to strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati +Upstream-Status: Pending + --- newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++- newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++ 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 cd98dfa1..aaa2a009 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 @@ -5,6 +5,8 @@ Subject: [PATCH 10/11] [Patch,MicroBlaze] : Removing the Assembly implementation of 64bit string function. Revisit in next release and fix it + +Upstream-Status: Pending --- newlib/libc/machine/microblaze/mb_endian.h | 4 + newlib/libc/machine/microblaze/strcmp.c | 95 ++++++++-------------- 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 ba5fcb8c..5e89db18 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 @@ -3,6 +3,8 @@ From: Nagaraju 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 + --- libgloss/microblaze/crtinit.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- cgit v1.2.3-54-g00ecf