diff options
Diffstat (limited to 'meta-xilinx/meta-microblaze/recipes-core/newlib/files')
13 files changed, 183 insertions, 214 deletions
diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch index 950e0b30d..0d984e4bb 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch @@ -1,4 +1,4 @@ -From 4926aec8897dc574d442e5a87b2576ab80046b10 Mon Sep 17 00:00:00 2001 +From 3be7340059deb6fd74873978ee4e435c84a15b8b 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 @@ -26,7 +26,7 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt new file mode 100644 -index 0000000..e8fb922 +index 000000000..e8fb922dd --- /dev/null +++ b/libgloss/config/microblaze.mt @@ -0,0 +1,30 @@ @@ -61,7 +61,7 @@ index 0000000..e8fb922 +write.o: ${srcdir}/../write.c + $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $? diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure -index 9b2bc7a..01f0fb2 100644 +index 9b2bc7ab4..01f0fb29d 100644 --- a/libgloss/microblaze/configure +++ b/libgloss/microblaze/configure @@ -2020,7 +2020,7 @@ LIB_AM_PROG_AS @@ -74,7 +74,7 @@ index 9b2bc7a..01f0fb2 100644 host_makefile_frag_path=$host_makefile_frag diff --git a/libgloss/microblaze/configure.in b/libgloss/microblaze/configure.in -index 77aa769..5d179fd 100644 +index 77aa769d4..5d179fdfc 100644 --- a/libgloss/microblaze/configure.in +++ b/libgloss/microblaze/configure.in @@ -35,7 +35,7 @@ LIB_AM_PROG_AS @@ -87,5 +87,5 @@ index 77aa769..5d179fd 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.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch index 51785d9a0..27f8a60bd 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch @@ -1,4 +1,4 @@ -From ee559eb522edcb793e4df62f61849748445a056e Mon Sep 17 00:00:00 2001 +From f3ffd847282fa3bf676ccd05cbdcba33eea06416 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 @@ -11,7 +11,7 @@ Signed-off-by:Nagaraju Mekala<nmekala@xilix.com> 1 file changed, 1 deletion(-) diff --git a/libgloss/microblaze/_exception_handler.S b/libgloss/microblaze/_exception_handler.S -index 59385ad..7a91a78 100644 +index 59385ad9b..7a91a781e 100644 --- a/libgloss/microblaze/_exception_handler.S +++ b/libgloss/microblaze/_exception_handler.S @@ -36,5 +36,4 @@ @@ -21,5 +21,5 @@ index 59385ad..7a91a78 100644 - addi r11,r11,8 bra r11 -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch index 21c558009..aa257a40f 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch @@ -1,4 +1,4 @@ -From 829dcc7967bd2a99b583fba1129ae71dbe8335ff Mon Sep 17 00:00:00 2001 +From cf8c0c5d167386aa3f8bee6feb531b451461f99c 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 @@ -10,7 +10,7 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> 1 file changed, 3 insertions(+) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h -index 164d95b..7bb729c 100644 +index 164d95bca..7bb729c11 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...) @@ -24,5 +24,5 @@ index 164d95b..7bb729c 100644 int _rename (const char *, const char *); #endif -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch index f56f61876..9c59e4f55 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch @@ -1,17 +1,17 @@ -From 379f231f0afb5e10cd82bc6346e4a6776df3e21e Mon Sep 17 00:00:00 2001 +From b2e081bd0c00dce23a6824db050bbfca991d79ab 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 of BSP --- - libgloss/microblaze/xil_printf.c | 284 --------------------------------------- + libgloss/microblaze/xil_printf.c | 284 ------------------------------- 1 file changed, 284 deletions(-) delete mode 100644 libgloss/microblaze/xil_printf.c diff --git a/libgloss/microblaze/xil_printf.c b/libgloss/microblaze/xil_printf.c deleted file mode 100644 -index f18ee84..0000000 +index f18ee8446..000000000 --- a/libgloss/microblaze/xil_printf.c +++ /dev/null @@ -1,284 +0,0 @@ @@ -300,5 +300,5 @@ index f18ee84..0000000 - -/*---------------------------------------------------*/ -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch index 6e32e1775..850a61425 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch @@ -1,4 +1,4 @@ -From 96e6a596356fa605bbe00f7f69afb52f80329eb6 Mon Sep 17 00:00:00 2001 +From 5071ea41bb6a54b8205665d307876ab0130d8825 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 @@ -8,7 +8,7 @@ Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgloss/microblaze/Makefile.in b/libgloss/microblaze/Makefile.in -index fe04a08..32aafda 100644 +index fe04a08c9..32aafda37 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 @@ -21,5 +21,5 @@ index fe04a08..32aafda 100644 # Tiny Linux BSP. -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch index 18b78f090..a3c1f0e08 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch @@ -1,4 +1,4 @@ -From bb9e95aa1da6c1f8974702685db9b8486210ac5c Mon Sep 17 00:00:00 2001 +From f5f363cd879ea60cc8fb5507e8a01533fd0c55a9 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 @@ -17,7 +17,7 @@ Subject: [PATCH 06/11] MB-X intial commit 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S -index b39ea90..865a8c2 100644 +index b39ea90b3..865a8c269 100644 --- a/libgloss/microblaze/crt0.S +++ b/libgloss/microblaze/crt0.S @@ -84,7 +84,7 @@ _vector_hw_exception: @@ -30,7 +30,7 @@ index b39ea90..865a8c2 100644 brlid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S -index 20323ff..a8bf749 100644 +index 20323ff6d..a8bf74937 100644 --- a/libgloss/microblaze/crt1.S +++ b/libgloss/microblaze/crt1.S @@ -75,7 +75,7 @@ _vector_hw_exception: @@ -43,7 +43,7 @@ index 20323ff..a8bf749 100644 brlid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S -index e3fb15b..34d9f95 100644 +index e3fb15b26..34d9f951d 100644 --- a/libgloss/microblaze/crt2.S +++ b/libgloss/microblaze/crt2.S @@ -73,7 +73,7 @@ _vector_hw_exception: @@ -56,7 +56,7 @@ index e3fb15b..34d9f95 100644 brlid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S -index 452ea52..ebcf207 100644 +index 452ea5265..ebcf207f5 100644 --- a/libgloss/microblaze/crt3.S +++ b/libgloss/microblaze/crt3.S @@ -59,7 +59,7 @@ @@ -69,7 +69,7 @@ index 452ea52..ebcf207 100644 brlid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S -index 475acec..4cf0b01 100644 +index 475acecfd..4cf0b01a4 100644 --- a/libgloss/microblaze/crt4.S +++ b/libgloss/microblaze/crt4.S @@ -59,7 +59,7 @@ @@ -82,7 +82,7 @@ index 475acec..4cf0b01 100644 brlid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S -index 78eb76d..86c6dfc 100644 +index 78eb76df6..86c6dfcb0 100644 --- a/libgloss/microblaze/crtinit.S +++ b/libgloss/microblaze/crtinit.S @@ -33,7 +33,7 @@ @@ -103,7 +103,7 @@ index 78eb76d..86c6dfc 100644 .end _crtinit diff --git a/libgloss/microblaze/pgcrtinit.S b/libgloss/microblaze/pgcrtinit.S -index fca1bc4..2593082 100644 +index fca1bc45e..25930821c 100644 --- a/libgloss/microblaze/pgcrtinit.S +++ b/libgloss/microblaze/pgcrtinit.S @@ -33,7 +33,7 @@ @@ -124,7 +124,7 @@ index fca1bc4..2593082 100644 .end _crtinit diff --git a/libgloss/microblaze/sim-crtinit.S b/libgloss/microblaze/sim-crtinit.S -index d2f59fe..74586d9 100644 +index d2f59fe6d..74586d9a7 100644 --- a/libgloss/microblaze/sim-crtinit.S +++ b/libgloss/microblaze/sim-crtinit.S @@ -39,7 +39,7 @@ @@ -145,7 +145,7 @@ index d2f59fe..74586d9 100644 .end _crtinit diff --git a/libgloss/microblaze/sim-pgcrtinit.S b/libgloss/microblaze/sim-pgcrtinit.S -index 3c6ba83..82ebcca 100644 +index 3c6ba8371..82ebccad4 100644 --- a/libgloss/microblaze/sim-pgcrtinit.S +++ b/libgloss/microblaze/sim-pgcrtinit.S @@ -39,7 +39,7 @@ @@ -166,7 +166,7 @@ index 3c6ba83..82ebcca 100644 .end _crtinit diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c -index 434195e..3119d82 100644 +index 434195e2c..3119d82c5 100644 --- a/newlib/libc/machine/microblaze/strcmp.c +++ b/newlib/libc/machine/microblaze/strcmp.c @@ -96,15 +96,15 @@ strcmp (const char *s1, @@ -190,5 +190,5 @@ index 434195e..3119d82 100644 { /* To get here, *a1 == *a2, thus if we find a null in *a1, -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch index c62a9919a..55dde8033 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch @@ -1,4 +1,4 @@ -From eab8d664224d134b2c4d638d9c6bebb84ae777ad Mon Sep 17 00:00:00 2001 +From 5040f7d8abb79bf4240d0b446e2d33d26680d9fc 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 @@ -13,23 +13,23 @@ Conflicts: libgloss/microblaze/_interrupt_handler.S | 7 +- libgloss/microblaze/_program_clean.S | 6 +- libgloss/microblaze/_program_init.S | 6 +- - libgloss/microblaze/crt0.S | 53 ++++++++++-- - libgloss/microblaze/crt1.S | 54 +++++++++++-- - libgloss/microblaze/crt2.S | 52 ++++++++++-- - libgloss/microblaze/crt3.S | 32 +++++++- - libgloss/microblaze/crt4.S | 37 +++++++-- - libgloss/microblaze/crtinit.S | 120 ++++++++++++++++++++-------- - libgloss/microblaze/linux-crt0.S | 60 +++++++++++--- - libgloss/microblaze/linux-syscalls.S | 15 +++- - libgloss/microblaze/pgcrtinit.S | 59 +++++++++++++- - libgloss/microblaze/sim-crtinit.S | 31 +++++++ - libgloss/microblaze/sim-pgcrtinit.S | 31 +++++++ - newlib/libc/machine/microblaze/longjmp.S | 45 +++++++++-- - newlib/libc/machine/microblaze/setjmp.S | 33 +++++++- + libgloss/microblaze/crt0.S | 53 ++++++++- + libgloss/microblaze/crt1.S | 54 +++++++-- + libgloss/microblaze/crt2.S | 52 +++++++-- + libgloss/microblaze/crt3.S | 32 +++++- + libgloss/microblaze/crt4.S | 37 +++++- + libgloss/microblaze/crtinit.S | 120 ++++++++++++++------ + libgloss/microblaze/linux-crt0.S | 60 ++++++++-- + libgloss/microblaze/linux-syscalls.S | 15 ++- + libgloss/microblaze/pgcrtinit.S | 59 +++++++++- + libgloss/microblaze/sim-crtinit.S | 31 +++++ + libgloss/microblaze/sim-pgcrtinit.S | 31 +++++ + newlib/libc/machine/microblaze/longjmp.S | 45 ++++++-- + newlib/libc/machine/microblaze/setjmp.S | 33 +++++- 18 files changed, 563 insertions(+), 91 deletions(-) diff --git a/libgloss/microblaze/_exception_handler.S b/libgloss/microblaze/_exception_handler.S -index 7a91a78..0fdff3f 100644 +index 7a91a781e..0fdff3fec 100644 --- a/libgloss/microblaze/_exception_handler.S +++ b/libgloss/microblaze/_exception_handler.S @@ -30,7 +30,11 @@ @@ -46,7 +46,7 @@ index 7a91a78..0fdff3f 100644 .ent _exception_handler .type _exception_handler, @function diff --git a/libgloss/microblaze/_hw_exception_handler.S b/libgloss/microblaze/_hw_exception_handler.S -index 47df945..b951a63 100644 +index 47df945c4..b951a6325 100644 --- a/libgloss/microblaze/_hw_exception_handler.S +++ b/libgloss/microblaze/_hw_exception_handler.S @@ -32,8 +32,11 @@ @@ -64,7 +64,7 @@ index 47df945..b951a63 100644 rted r17, 0 nop diff --git a/libgloss/microblaze/_interrupt_handler.S b/libgloss/microblaze/_interrupt_handler.S -index 5bb7329..a0ef92d 100644 +index 5bb7329cc..a0ef92df0 100644 --- a/libgloss/microblaze/_interrupt_handler.S +++ b/libgloss/microblaze/_interrupt_handler.S @@ -32,8 +32,11 @@ @@ -82,7 +82,7 @@ index 5bb7329..a0ef92d 100644 rtid r14, 0 nop diff --git a/libgloss/microblaze/_program_clean.S b/libgloss/microblaze/_program_clean.S -index c460594..0d55d8a 100644 +index c46059434..0d55d8ab8 100644 --- a/libgloss/microblaze/_program_clean.S +++ b/libgloss/microblaze/_program_clean.S @@ -33,7 +33,11 @@ @@ -99,7 +99,7 @@ index c460594..0d55d8a 100644 .ent _program_clean _program_clean: diff --git a/libgloss/microblaze/_program_init.S b/libgloss/microblaze/_program_init.S -index 0daa42e..862ef78 100644 +index 0daa42e14..862ef786b 100644 --- a/libgloss/microblaze/_program_init.S +++ b/libgloss/microblaze/_program_init.S @@ -32,7 +32,11 @@ @@ -116,7 +116,7 @@ index 0daa42e..862ef78 100644 .ent _program_init _program_init: diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S -index 865a8c2..e4df73b 100644 +index 865a8c269..e4df73b66 100644 --- a/libgloss/microblaze/crt0.S +++ b/libgloss/microblaze/crt0.S @@ -54,7 +54,11 @@ @@ -222,7 +222,7 @@ index 865a8c2..e4df73b 100644 +#endif .end _exit diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S -index a8bf749..b24eeb5 100644 +index a8bf74937..b24eeb531 100644 --- a/libgloss/microblaze/crt1.S +++ b/libgloss/microblaze/crt1.S @@ -53,36 +53,67 @@ @@ -321,7 +321,7 @@ index a8bf749..b24eeb5 100644 .end _exit - diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S -index 34d9f95..ae4c89e 100644 +index 34d9f951d..ae4c89ee0 100644 --- a/libgloss/microblaze/crt2.S +++ b/libgloss/microblaze/crt2.S @@ -51,26 +51,56 @@ @@ -415,7 +415,7 @@ index 34d9f95..ae4c89e 100644 +#endif .end _exit diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S -index ebcf207..a8bc783 100644 +index ebcf207f5..a8bc7839b 100644 --- a/libgloss/microblaze/crt3.S +++ b/libgloss/microblaze/crt3.S @@ -53,10 +53,26 @@ @@ -476,7 +476,7 @@ index ebcf207..a8bc783 100644 +#endif .end _exit diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S -index 4cf0b01..54ba473 100644 +index 4cf0b01a4..54ba473ea 100644 --- a/libgloss/microblaze/crt4.S +++ b/libgloss/microblaze/crt4.S @@ -53,10 +53,27 @@ @@ -542,7 +542,7 @@ index 4cf0b01..54ba473 100644 +#endif .end _exit diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S -index 86c6dfc..8541175 100644 +index 86c6dfcb0..854117536 100644 --- a/libgloss/microblaze/crtinit.S +++ b/libgloss/microblaze/crtinit.S @@ -29,59 +29,115 @@ @@ -694,7 +694,7 @@ index 86c6dfc..8541175 100644 .end _crtinit diff --git a/libgloss/microblaze/linux-crt0.S b/libgloss/microblaze/linux-crt0.S -index 8650bb5..503439b 100644 +index 8650bb5d2..503439b2e 100644 --- a/libgloss/microblaze/linux-crt0.S +++ b/libgloss/microblaze/linux-crt0.S @@ -18,26 +18,50 @@ @@ -789,7 +789,7 @@ index 8650bb5..503439b 100644 sw r15, r0, r1 +#endif diff --git a/libgloss/microblaze/linux-syscalls.S b/libgloss/microblaze/linux-syscalls.S -index 506de78..8594f13 100644 +index 506de78fd..8594f136e 100644 --- a/libgloss/microblaze/linux-syscalls.S +++ b/libgloss/microblaze/linux-syscalls.S @@ -20,8 +20,9 @@ @@ -823,7 +823,7 @@ index 506de78..8594f13 100644 SYSCALL(exit) SYSCALL(read) diff --git a/libgloss/microblaze/pgcrtinit.S b/libgloss/microblaze/pgcrtinit.S -index 2593082..638dbd3 100644 +index 25930821c..638dbd383 100644 --- a/libgloss/microblaze/pgcrtinit.S +++ b/libgloss/microblaze/pgcrtinit.S @@ -29,10 +29,66 @@ @@ -904,7 +904,7 @@ index 2593082..638dbd3 100644 .end _crtinit diff --git a/libgloss/microblaze/sim-crtinit.S b/libgloss/microblaze/sim-crtinit.S -index 74586d9..9892cb0 100644 +index 74586d9a7..9892cb0bd 100644 --- a/libgloss/microblaze/sim-crtinit.S +++ b/libgloss/microblaze/sim-crtinit.S @@ -35,10 +35,39 @@ @@ -958,7 +958,7 @@ index 74586d9..9892cb0 100644 .end _crtinit diff --git a/libgloss/microblaze/sim-pgcrtinit.S b/libgloss/microblaze/sim-pgcrtinit.S -index 82ebcca..939f537 100644 +index 82ebccad4..939f5372f 100644 --- a/libgloss/microblaze/sim-pgcrtinit.S +++ b/libgloss/microblaze/sim-pgcrtinit.S @@ -35,10 +35,40 @@ @@ -1010,7 +1010,7 @@ index 82ebcca..939f537 100644 .end _crtinit diff --git a/newlib/libc/machine/microblaze/longjmp.S b/newlib/libc/machine/microblaze/longjmp.S -index f972bbd..5ed1c26 100644 +index f972bbd88..5ed1c2626 100644 --- a/newlib/libc/machine/microblaze/longjmp.S +++ b/newlib/libc/machine/microblaze/longjmp.S @@ -51,16 +51,46 @@ @@ -1082,7 +1082,7 @@ index f972bbd..5ed1c26 100644 +#endif .end longjmp diff --git a/newlib/libc/machine/microblaze/setjmp.S b/newlib/libc/machine/microblaze/setjmp.S -index cdd87c7..971862b 100644 +index cdd87c76f..971862bcb 100644 --- a/newlib/libc/machine/microblaze/setjmp.S +++ b/newlib/libc/machine/microblaze/setjmp.S @@ -50,9 +50,39 @@ @@ -1133,5 +1133,5 @@ index cdd87c7..971862b 100644 +#endif .end setjmp -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch index 9f27cd60c..437d29f32 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch @@ -1,4 +1,4 @@ -From 1c7a9150b63089baf3f63c64bf3dbb4d73c814f5 Mon Sep 17 00:00:00 2001 +From 000cfdc6f16009e62c236267ce7123a9ef2380e9 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 @@ -13,7 +13,7 @@ Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S -index e4df73b..25e7c4a 100644 +index e4df73b66..25e7c4af3 100644 --- a/libgloss/microblaze/crt0.S +++ b/libgloss/microblaze/crt0.S @@ -106,9 +106,9 @@ _vector_hw_exception: @@ -30,7 +30,7 @@ index e4df73b..25e7c4a 100644 nop addlik r5, r3, 0 diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S -index b24eeb5..38440c9 100644 +index b24eeb531..38440c957 100644 --- a/libgloss/microblaze/crt1.S +++ b/libgloss/microblaze/crt1.S @@ -94,9 +94,9 @@ _vector_hw_exception: @@ -47,7 +47,7 @@ index b24eeb5..38440c9 100644 brealid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S -index ae4c89e..352927d 100644 +index ae4c89ee0..352927dab 100644 --- a/libgloss/microblaze/crt2.S +++ b/libgloss/microblaze/crt2.S @@ -92,9 +92,9 @@ _vector_hw_exception: @@ -64,7 +64,7 @@ index ae4c89e..352927d 100644 nop addlik r5, r3, 0 diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S -index a8bc783..bc32cda 100644 +index a8bc7839b..bc32cda86 100644 --- a/libgloss/microblaze/crt3.S +++ b/libgloss/microblaze/crt3.S @@ -62,9 +62,9 @@ @@ -81,7 +81,7 @@ index a8bc783..bc32cda 100644 brealid r15, _crtinit /* Initialize BSS and run program */ nop diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S -index 54ba473..a25c847 100644 +index 54ba473ea..a25c84734 100644 --- a/libgloss/microblaze/crt4.S +++ b/libgloss/microblaze/crt4.S @@ -63,9 +63,9 @@ @@ -98,5 +98,5 @@ index 54ba473..a25c847 100644 brealid r15, _crtinit /* Initialize BSS and run program */ nop -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch index 38508b550..1d4394d36 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch @@ -1,25 +1,26 @@ -From 19d7b2a34f3c69d62f570ac9d0f6bc3cd584b496 Mon Sep 17 00:00:00 2001 -From: Nagaraju <nmekala@xilinx.com> -Date: Thu, 14 Mar 2019 18:16:32 +0530 -Subject: [PATCH 09/11] Added MB-64 support to strcmp/strcpy/strlen files +From 6587a1cae28468f5a49659a39040f60e425827a7 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 + strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati<mbodapat@xilinx.com> --- - newlib/libc/machine/microblaze/strcmp.c | 61 ++++++++++++++++++++++++++++++++- - newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++++++++++ - newlib/libc/machine/microblaze/strlen.c | 38 ++++++++++++++++++++ - 3 files changed, 155 insertions(+), 1 deletion(-) + newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++- + newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++ + newlib/libc/machine/microblaze/strlen.c | 38 +++++++++++++++ + 3 files changed, 157 insertions(+), 1 deletion(-) diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c -index 3119d82..dac64da 100644 +index 3119d82c5..2cfef7388 100644 --- a/newlib/libc/machine/microblaze/strcmp.c +++ b/newlib/libc/machine/microblaze/strcmp.c -@@ -133,6 +133,65 @@ strcmp (const char *s1, +@@ -133,6 +133,66 @@ strcmp (const char *s1, #include "mb_endian.h" +#ifdef __arch64__ + asm volatile (" \n\ -+ orl r9, r0, r0 /* Index register */\n\ ++ orl r9, r0, r0 /* Index register */ \n\ +check_alignment: \n\ + andli r3, r5, 3 \n\ + andli r4, r6, 3 \n\ @@ -45,7 +46,7 @@ index 3119d82..dac64da 100644 + beaneid r3, end_cmp_loop /* If reached null on one string, terminate */ \n\ + nop \n\ +end_cmp_early: \n\ -+ or r3, r0, r7 /* delay slot */ \n\ ++ orl r3, r0, r7 /* delay slot */ \n\ + rtsd r15, 8 \n\ + nop \n\ +try_align_args: \n\ @@ -55,7 +56,7 @@ index 3119d82..dac64da 100644 +align_loop: \n\ + lbu r3, r5, r9 \n\ + lbu r4, r6, r9 \n\ -+ cmpu r7, r4, r3 \n\ ++ cmplu r7, r4, r3 \n\ + beanei r7, end_cmp \n\ + beaeqi r3, end_cmp \n\ + addlik r10, r10, -1 \n\ @@ -69,21 +70,23 @@ index 3119d82..dac64da 100644 + cmplu r7, r4, r3 \n\ + beanei r7, end_cmp \n\ + beaeqi r3, end_cmp \n\ -+ breaid regular_strcmp \n\ + addlik r9, r9, 1 \n\ ++ breaid regular_strcmp \n\ ++ nop \n\ +end_cmp: \n\ -+ or r3, r0, r7 \n\ ++ orl r3, r0, r7 \n\ + rtsd r15, 8 \n\ + nop /* Return strcmp result */"); +#else asm volatile (" \n\ or r9, r0, r0 /* Index register */\n\ check_alignment: \n\ -@@ -181,11 +240,11 @@ regular_strcmp: +@@ -181,11 +241,12 @@ regular_strcmp: bnei r7, end_cmp \n\ beqi r3, end_cmp \n\ brid regular_strcmp \n\ - addik r9, r9, 1 \n\ ++ addik r9, r9, 1 end_cmp: \n\ rtsd r15, 8 \n\ or r3, r0, r7 /* Return strcmp result */"); @@ -93,7 +96,7 @@ index 3119d82..dac64da 100644 } diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c -index 62072fa..6dbc60d 100644 +index 62072fa28..6dbc60d77 100644 --- a/newlib/libc/machine/microblaze/strcpy.c +++ b/newlib/libc/machine/microblaze/strcpy.c @@ -125,6 +125,62 @@ strcpy (char *__restrict dst0, @@ -168,7 +171,7 @@ index 62072fa..6dbc60d 100644 } diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c -index acb4464..c04fa4f 100644 +index acb4464bc..b6f2d3c13 100644 --- a/newlib/libc/machine/microblaze/strlen.c +++ b/newlib/libc/machine/microblaze/strlen.c @@ -116,6 +116,43 @@ strlen (const char *str) @@ -186,13 +189,13 @@ index acb4464..c04fa4f 100644 +" \n\ + pcmplbf r4, r3, r0 \n\ + beanei r4, end_len \n\ -+ addik r9, r9, 4 \n\ ++ addlik r9, r9, 4 \n\ + breaid len_loop \n\ + nop \n\ +end_len: \n\ + lbu r3, r5, r9 \n\ + beaeqi r3, done_len \n\ -+ addik r9, r9, 1 \n\ ++ addlik r9, r9, 1 \n\ + breaid end_len \n\ + nop \n\ +done_len: \n\ @@ -223,5 +226,5 @@ index acb4464..c04fa4f 100644 #endif /* ! HAVE_HW_PCMP */ } -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch deleted file mode 100644 index d1f19a74f..000000000 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 70281e45fa433ec854f60b43fef019ebc8ca0649 Mon Sep 17 00:00:00 2001 -From: Mahesh Bodapati <mbodapat@xilinx.com> -Date: Wed, 3 Apr 2019 11:52:50 +0530 -Subject: [PATCH 10/11] [Patch,MicroBlaze] : typos in string functions - microblaze 64 bit port.fixed the issues. - ---- - newlib/libc/machine/microblaze/strcmp.c | 12 +++++++----- - newlib/libc/machine/microblaze/strlen.c | 4 ++-- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c -index dac64da..acfe4cd 100644 ---- a/newlib/libc/machine/microblaze/strcmp.c -+++ b/newlib/libc/machine/microblaze/strcmp.c -@@ -135,7 +135,7 @@ strcmp (const char *s1, - - #ifdef __arch64__ - asm volatile (" \n\ -- orl r9, r0, r0 /* Index register */\n\ -+ orl r9, r0, r0 /* Index register */ \n\ - check_alignment: \n\ - andli r3, r5, 3 \n\ - andli r4, r6, 3 \n\ -@@ -161,7 +161,7 @@ end_cmp_loop: - beaneid r3, end_cmp_loop /* If reached null on one string, terminate */ \n\ - nop \n\ - end_cmp_early: \n\ -- or r3, r0, r7 /* delay slot */ \n\ -+ orl r3, r0, r7 /* delay slot */ \n\ - rtsd r15, 8 \n\ - nop \n\ - try_align_args: \n\ -@@ -171,7 +171,7 @@ try_align_args: - align_loop: \n\ - lbu r3, r5, r9 \n\ - lbu r4, r6, r9 \n\ -- cmpu r7, r4, r3 \n\ -+ cmplu r7, r4, r3 \n\ - beanei r7, end_cmp \n\ - beaeqi r3, end_cmp \n\ - addlik r10, r10, -1 \n\ -@@ -185,10 +185,11 @@ regular_strcmp: - cmplu r7, r4, r3 \n\ - beanei r7, end_cmp \n\ - beaeqi r3, end_cmp \n\ -- breaid regular_strcmp \n\ - addlik r9, r9, 1 \n\ -+ breaid regular_strcmp \n\ -+ nop \n\ - end_cmp: \n\ -- or r3, r0, r7 \n\ -+ orl r3, r0, r7 \n\ - rtsd r15, 8 \n\ - nop /* Return strcmp result */"); - #else -@@ -240,6 +241,7 @@ regular_strcmp: - bnei r7, end_cmp \n\ - beqi r3, end_cmp \n\ - brid regular_strcmp \n\ -+ addik r9, r9, 1 \n\ - end_cmp: \n\ - rtsd r15, 8 \n\ - or r3, r0, r7 /* Return strcmp result */"); -diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c -index c04fa4f..b6f2d3c 100644 ---- a/newlib/libc/machine/microblaze/strlen.c -+++ b/newlib/libc/machine/microblaze/strlen.c -@@ -127,13 +127,13 @@ len_loop: \n" - " \n\ - pcmplbf r4, r3, r0 \n\ - beanei r4, end_len \n\ -- addik r9, r9, 4 \n\ -+ addlik r9, r9, 4 \n\ - breaid len_loop \n\ - nop \n\ - end_len: \n\ - lbu r3, r5, r9 \n\ - beaeqi r3, done_len \n\ -- addik r9, r9, 1 \n\ -+ addlik r9, r9, 1 \n\ - breaid end_len \n\ - nop \n\ - done_len: \n\ --- -2.7.4 - diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0010-Removing-the-Assembly-implementation-of-64bit-string.patch index c8d13af00..a63b9dfd1 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0010-Removing-the-Assembly-implementation-of-64bit-string.patch @@ -1,18 +1,20 @@ -From b35b582ef3f6575447097585174302fde1761078 Mon Sep 17 00:00:00 2001 +From fd624fc28cbca8863f4dd75f0bc08aba58f8455e Mon Sep 17 00:00:00 2001 From: Nagaraju <nmekala@xilinx.com> Date: Wed, 24 Apr 2019 23:29:21 +0530 -Subject: [PATCH 11/11] Removing the Assembly implementation of 64bit string +Subject: [PATCH 10/11] Removing the Assembly implementation of 64bit string function. Revisit in next release and fix it +Conflicts: + newlib/libc/machine/microblaze/strcmp.c --- - newlib/libc/machine/microblaze/mb_endian.h | 4 ++ - newlib/libc/machine/microblaze/strcmp.c | 93 ++++++++++-------------------- - newlib/libc/machine/microblaze/strcpy.c | 82 ++++++++------------------ - newlib/libc/machine/microblaze/strlen.c | 59 +++++++------------ - 4 files changed, 81 insertions(+), 157 deletions(-) + newlib/libc/machine/microblaze/mb_endian.h | 4 + + newlib/libc/machine/microblaze/strcmp.c | 94 ++++++++-------------- + newlib/libc/machine/microblaze/strcpy.c | 82 ++++++------------- + newlib/libc/machine/microblaze/strlen.c | 59 +++++--------- + 4 files changed, 81 insertions(+), 158 deletions(-) diff --git a/newlib/libc/machine/microblaze/mb_endian.h b/newlib/libc/machine/microblaze/mb_endian.h -index fb217ec..17772c8 100644 +index fb217ec85..17772c88f 100644 --- a/newlib/libc/machine/microblaze/mb_endian.h +++ b/newlib/libc/machine/microblaze/mb_endian.h @@ -8,8 +8,12 @@ @@ -29,17 +31,19 @@ index fb217ec..17772c8 100644 #endif #endif diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c -index acfe4cd..e34c64a 100644 +index 2cfef7388..007d9e1eb 100644 --- a/newlib/libc/machine/microblaze/strcmp.c +++ b/newlib/libc/machine/microblaze/strcmp.c -@@ -129,70 +129,42 @@ strcmp (const char *s1, +@@ -129,70 +129,41 @@ strcmp (const char *s1, return (*(unsigned char *) s1) - (*(unsigned char *) s2); #endif /* not PREFER_SIZE_OVER_SPEED */ +-#else +#elif __arch64__ + unsigned int *a1; + unsigned int *a2; -+ + +-#include "mb_endian.h" + /* If s1 or s2 are unaligned, then compare bytes. */ + if (!UNALIGNED (s1, s2)) + { @@ -52,25 +56,6 @@ index acfe4cd..e34c64a 100644 + then the strings must be equal, so return zero. */ + if (DETECTNULL (*a1)) + return 0; -+ -+ a1++; -+ a2++; -+ } -+ -+ /* A difference was detected in last few bytes of s1, so search bytewise */ -+ s1 = (char*)a1; -+ s2 = (char*)a2; -+ } -+ -+ while (*s1 != '\0' && *s1 == *s2) -+ { -+ s1++; -+ s2++; -+ } -+ return (*(unsigned char *) s1) - (*(unsigned char *) s2); - #else - - #include "mb_endian.h" -#ifdef __arch64__ - asm volatile (" \n\ @@ -126,16 +111,33 @@ index acfe4cd..e34c64a 100644 - beaeqi r3, end_cmp \n\ - addlik r9, r9, 1 \n\ - breaid regular_strcmp \n\ -- nop \n\ +- nop \n\ -end_cmp: \n\ - orl r3, r0, r7 \n\ - rtsd r15, 8 \n\ - nop /* Return strcmp result */"); --#else ++ a1++; ++ a2++; ++ } ++ ++ /* A difference was detected in last few bytes of s1, so search bytewise */ ++ s1 = (char*)a1; ++ s2 = (char*)a2; ++ } ++ ++ while (*s1 != '\0' && *s1 == *s2) ++ { ++ s1++; ++ s2++; ++ } ++ return (*(unsigned char *) s1) - (*(unsigned char *) s2); + #else ++ ++#include "mb_endian.h" asm volatile (" \n\ or r9, r0, r0 /* Index register */\n\ check_alignment: \n\ -@@ -246,7 +218,6 @@ end_cmp: +@@ -246,7 +217,6 @@ end_cmp: rtsd r15, 8 \n\ or r3, r0, r7 /* Return strcmp result */"); @@ -144,7 +146,7 @@ index acfe4cd..e34c64a 100644 } diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c -index 6dbc60d..ddb6922 100644 +index 6dbc60d77..ddb69227e 100644 --- a/newlib/libc/machine/microblaze/strcpy.c +++ b/newlib/libc/machine/microblaze/strcpy.c @@ -121,67 +121,36 @@ strcpy (char *__restrict dst0, @@ -249,7 +251,7 @@ index 6dbc60d..ddb6922 100644 } diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c -index b6f2d3c..9407539 100644 +index b6f2d3c13..940753996 100644 --- a/newlib/libc/machine/microblaze/strlen.c +++ b/newlib/libc/machine/microblaze/strlen.c @@ -112,47 +112,29 @@ strlen (const char *str) @@ -328,5 +330,5 @@ index b6f2d3c..9407539 100644 #endif /* ! HAVE_HW_PCMP */ } -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch new file mode 100644 index 000000000..b6e03d42b --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch @@ -0,0 +1,25 @@ +From e0e6f5367eede4292d31c3dd901425bcd251595a 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 + +--- + libgloss/microblaze/crtinit.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S +index 854117536..f79140734 100644 +--- a/libgloss/microblaze/crtinit.S ++++ b/libgloss/microblaze/crtinit.S +@@ -48,7 +48,7 @@ _crtinit: + + .Lloopsbss: + sli r0, r6, 0 +- addli r6, r6, 4 ++ addli r6, r6, 8 + rsubl r18, r6, r7 + beagti r18, .Lloopsbss + .Lendsbss: +-- +2.17.1 + diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch new file mode 100644 index 000000000..c92942fc2 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch @@ -0,0 +1,26 @@ +From c2a8d7e6326a309221e4a287517a4920d33aa674 Mon Sep 17 00:00:00 2001 +From: Mark Hatle <mark.hatle@xilinx.com> +Date: Mon, 30 Nov 2020 18:26:47 -0800 +Subject: [PATCH] libc/machine/microblaze/strcmp.c: Fix missing end of line + +Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> +--- + newlib/libc/machine/microblaze/strcmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c +index 007d9e1eb..5d13d64ab 100644 +--- a/newlib/libc/machine/microblaze/strcmp.c ++++ b/newlib/libc/machine/microblaze/strcmp.c +@@ -212,7 +212,7 @@ regular_strcmp: + bnei r7, end_cmp \n\ + beqi r3, end_cmp \n\ + brid regular_strcmp \n\ +- addik r9, r9, 1 ++ addik r9, r9, 1 \n\ + end_cmp: \n\ + rtsd r15, 8 \n\ + or r3, r0, r7 /* Return strcmp result */"); +-- +2.17.1 + |