summaryrefslogtreecommitdiffstats
path: root/meta-microblaze/recipes-core
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-12-01 08:43:43 -0800
committerMark Hatle <mark.hatle@xilinx.com>2020-12-04 16:24:57 -0800
commitba66cc166d92b8a6b7b14012c25e28f9918d4f11 (patch)
tree02b76fcfe14df4899b61391381080b0a323ac799 /meta-microblaze/recipes-core
parentb0973557c0938c72bc0045ecacd5aad716c69874 (diff)
downloadmeta-xilinx-ba66cc166d92b8a6b7b14012c25e28f9918d4f11.tar.gz
newlib: update to early gatesgarth version
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-microblaze/recipes-core')
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch10
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch6
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch6
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch8
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch6
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch24
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch66
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch14
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch (renamed from meta-microblaze/recipes-core/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch)45
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch87
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0010-Removing-the-Assembly-implementation-of-64bit-string.patch (renamed from meta-microblaze/recipes-core/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch)74
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch25
-rw-r--r--meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch26
-rw-r--r--meta-microblaze/recipes-core/newlib/microblaze-newlib.inc25
14 files changed, 196 insertions, 226 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 950e0b30..0d984e4b 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 @@
1From 4926aec8897dc574d442e5a87b2576ab80046b10 Mon Sep 17 00:00:00 2001 1From 3be7340059deb6fd74873978ee4e435c84a15b8b Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Mon, 23 Jan 2017 15:27:25 +0530 3Date: Mon, 23 Jan 2017 15:27:25 +0530
4Subject: [PATCH 01/11] [Patch, microblaze]: Add config/microblaze.mt for 4Subject: [PATCH 01/11] [Patch, microblaze]: Add config/microblaze.mt for
@@ -26,7 +26,7 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
26 26
27diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt 27diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt
28new file mode 100644 28new file mode 100644
29index 0000000..e8fb922 29index 000000000..e8fb922dd
30--- /dev/null 30--- /dev/null
31+++ b/libgloss/config/microblaze.mt 31+++ b/libgloss/config/microblaze.mt
32@@ -0,0 +1,30 @@ 32@@ -0,0 +1,30 @@
@@ -61,7 +61,7 @@ index 0000000..e8fb922
61+write.o: ${srcdir}/../write.c 61+write.o: ${srcdir}/../write.c
62+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $? 62+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
63diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure 63diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure
64index 9b2bc7a..01f0fb2 100644 64index 9b2bc7ab4..01f0fb29d 100644
65--- a/libgloss/microblaze/configure 65--- a/libgloss/microblaze/configure
66+++ b/libgloss/microblaze/configure 66+++ b/libgloss/microblaze/configure
67@@ -2020,7 +2020,7 @@ LIB_AM_PROG_AS 67@@ -2020,7 +2020,7 @@ LIB_AM_PROG_AS
@@ -74,7 +74,7 @@ index 9b2bc7a..01f0fb2 100644
74 host_makefile_frag_path=$host_makefile_frag 74 host_makefile_frag_path=$host_makefile_frag
75 75
76diff --git a/libgloss/microblaze/configure.in b/libgloss/microblaze/configure.in 76diff --git a/libgloss/microblaze/configure.in b/libgloss/microblaze/configure.in
77index 77aa769..5d179fd 100644 77index 77aa769d4..5d179fdfc 100644
78--- a/libgloss/microblaze/configure.in 78--- a/libgloss/microblaze/configure.in
79+++ b/libgloss/microblaze/configure.in 79+++ b/libgloss/microblaze/configure.in
80@@ -35,7 +35,7 @@ LIB_AM_PROG_AS 80@@ -35,7 +35,7 @@ LIB_AM_PROG_AS
@@ -87,5 +87,5 @@ index 77aa769..5d179fd 100644
87 dnl We have to assign the same value to other variables because autoconf 87 dnl We have to assign the same value to other variables because autoconf
88 dnl doesn't provide a mechanism to substitute a replacement keyword with 88 dnl doesn't provide a mechanism to substitute a replacement keyword with
89-- 89--
902.7.4 902.17.1
91 91
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 51785d9a..27f8a60b 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 @@
1From ee559eb522edcb793e4df62f61849748445a056e Mon Sep 17 00:00:00 2001 1From f3ffd847282fa3bf676ccd05cbdcba33eea06416 Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Mon, 23 Jan 2017 15:30:02 +0530 3Date: Mon, 23 Jan 2017 15:30:02 +0530
4Subject: [PATCH 02/11] [Patch, microblaze]: Modified _exceptional_handler 4Subject: [PATCH 02/11] [Patch, microblaze]: Modified _exceptional_handler
@@ -11,7 +11,7 @@ Signed-off-by:Nagaraju Mekala<nmekala@xilix.com>
11 1 file changed, 1 deletion(-) 11 1 file changed, 1 deletion(-)
12 12
13diff --git a/libgloss/microblaze/_exception_handler.S b/libgloss/microblaze/_exception_handler.S 13diff --git a/libgloss/microblaze/_exception_handler.S b/libgloss/microblaze/_exception_handler.S
14index 59385ad..7a91a78 100644 14index 59385ad9b..7a91a781e 100644
15--- a/libgloss/microblaze/_exception_handler.S 15--- a/libgloss/microblaze/_exception_handler.S
16+++ b/libgloss/microblaze/_exception_handler.S 16+++ b/libgloss/microblaze/_exception_handler.S
17@@ -36,5 +36,4 @@ 17@@ -36,5 +36,4 @@
@@ -21,5 +21,5 @@ index 59385ad..7a91a78 100644
21- addi r11,r11,8 21- addi r11,r11,8
22 bra r11 22 bra r11
23-- 23--
242.7.4 242.17.1
25 25
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 21c55800..aa257a40 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,4 +1,4 @@
1From 829dcc7967bd2a99b583fba1129ae71dbe8335ff Mon Sep 17 00:00:00 2001 1From cf8c0c5d167386aa3f8bee6feb531b451461f99c Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Mon, 23 Jan 2017 15:39:45 +0530 3Date: Mon, 23 Jan 2017 15:39:45 +0530
4Subject: [PATCH 03/11] [LOCAL]: Add missing declarations for xil_printf to 4Subject: [PATCH 03/11] [LOCAL]: Add missing declarations for xil_printf to
@@ -10,7 +10,7 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
10 1 file changed, 3 insertions(+) 10 1 file changed, 3 insertions(+)
11 11
12diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h 12diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
13index 164d95b..7bb729c 100644 13index 164d95bca..7bb729c11 100644
14--- a/newlib/libc/include/stdio.h 14--- a/newlib/libc/include/stdio.h
15+++ b/newlib/libc/include/stdio.h 15+++ b/newlib/libc/include/stdio.h
16@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...) 16@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...)
@@ -24,5 +24,5 @@ index 164d95b..7bb729c 100644
24 int _rename (const char *, const char *); 24 int _rename (const char *, const char *);
25 #endif 25 #endif
26-- 26--
272.7.4 272.17.1
28 28
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 f56f6187..9c59e4f5 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,17 +1,17 @@
1From 379f231f0afb5e10cd82bc6346e4a6776df3e21e Mon Sep 17 00:00:00 2001 1From b2e081bd0c00dce23a6824db050bbfca991d79ab Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Mon, 23 Jan 2017 15:42:11 +0530 3Date: Mon, 23 Jan 2017 15:42:11 +0530
4Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part 4Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part
5 of BSP 5 of BSP
6 6
7--- 7---
8 libgloss/microblaze/xil_printf.c | 284 --------------------------------------- 8 libgloss/microblaze/xil_printf.c | 284 -------------------------------
9 1 file changed, 284 deletions(-) 9 1 file changed, 284 deletions(-)
10 delete mode 100644 libgloss/microblaze/xil_printf.c 10 delete mode 100644 libgloss/microblaze/xil_printf.c
11 11
12diff --git a/libgloss/microblaze/xil_printf.c b/libgloss/microblaze/xil_printf.c 12diff --git a/libgloss/microblaze/xil_printf.c b/libgloss/microblaze/xil_printf.c
13deleted file mode 100644 13deleted file mode 100644
14index f18ee84..0000000 14index f18ee8446..000000000
15--- a/libgloss/microblaze/xil_printf.c 15--- a/libgloss/microblaze/xil_printf.c
16+++ /dev/null 16+++ /dev/null
17@@ -1,284 +0,0 @@ 17@@ -1,284 +0,0 @@
@@ -300,5 +300,5 @@ index f18ee84..0000000
300- 300-
301-/*---------------------------------------------------*/ 301-/*---------------------------------------------------*/
302-- 302--
3032.7.4 3032.17.1
304 304
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 6e32e177..850a6142 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 @@
1From 96e6a596356fa605bbe00f7f69afb52f80329eb6 Mon Sep 17 00:00:00 2001 1From 5071ea41bb6a54b8205665d307876ab0130d8825 Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Mon, 23 Jan 2017 15:44:17 +0530 3Date: Mon, 23 Jan 2017 15:44:17 +0530
4Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE 4Subject: [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
8 1 file changed, 1 insertion(+), 1 deletion(-) 8 1 file changed, 1 insertion(+), 1 deletion(-)
9 9
10diff --git a/libgloss/microblaze/Makefile.in b/libgloss/microblaze/Makefile.in 10diff --git a/libgloss/microblaze/Makefile.in b/libgloss/microblaze/Makefile.in
11index fe04a08..32aafda 100644 11index fe04a08c9..32aafda37 100644
12--- a/libgloss/microblaze/Makefile.in 12--- a/libgloss/microblaze/Makefile.in
13+++ b/libgloss/microblaze/Makefile.in 13+++ b/libgloss/microblaze/Makefile.in
14@@ -81,7 +81,7 @@ GENOBJS = fstat.o getpid.o isatty.o kill.o lseek.o print.o putnum.o stat.o unlin 14@@ -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
21 21
22 # Tiny Linux BSP. 22 # Tiny Linux BSP.
23-- 23--
242.7.4 242.17.1
25 25
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 18b78f09..a3c1f0e0 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 @@
1From bb9e95aa1da6c1f8974702685db9b8486210ac5c Mon Sep 17 00:00:00 2001 1From f5f363cd879ea60cc8fb5507e8a01533fd0c55a9 Mon Sep 17 00:00:00 2001
2From: Nagaraju Mekala <nmekala@xilix.com> 2From: Nagaraju Mekala <nmekala@xilix.com>
3Date: Fri, 27 Jul 2018 16:10:36 +0530 3Date: Fri, 27 Jul 2018 16:10:36 +0530
4Subject: [PATCH 06/11] MB-X intial commit 4Subject: [PATCH 06/11] MB-X intial commit
@@ -17,7 +17,7 @@ Subject: [PATCH 06/11] MB-X intial commit
17 10 files changed, 17 insertions(+), 17 deletions(-) 17 10 files changed, 17 insertions(+), 17 deletions(-)
18 18
19diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S 19diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S
20index b39ea90..865a8c2 100644 20index b39ea90b3..865a8c269 100644
21--- a/libgloss/microblaze/crt0.S 21--- a/libgloss/microblaze/crt0.S
22+++ b/libgloss/microblaze/crt0.S 22+++ b/libgloss/microblaze/crt0.S
23@@ -84,7 +84,7 @@ _vector_hw_exception: 23@@ -84,7 +84,7 @@ _vector_hw_exception:
@@ -30,7 +30,7 @@ index b39ea90..865a8c2 100644
30 brlid r15, _crtinit /* Initialize BSS and run program */ 30 brlid r15, _crtinit /* Initialize BSS and run program */
31 nop 31 nop
32diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S 32diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S
33index 20323ff..a8bf749 100644 33index 20323ff6d..a8bf74937 100644
34--- a/libgloss/microblaze/crt1.S 34--- a/libgloss/microblaze/crt1.S
35+++ b/libgloss/microblaze/crt1.S 35+++ b/libgloss/microblaze/crt1.S
36@@ -75,7 +75,7 @@ _vector_hw_exception: 36@@ -75,7 +75,7 @@ _vector_hw_exception:
@@ -43,7 +43,7 @@ index 20323ff..a8bf749 100644
43 brlid r15, _crtinit /* Initialize BSS and run program */ 43 brlid r15, _crtinit /* Initialize BSS and run program */
44 nop 44 nop
45diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S 45diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S
46index e3fb15b..34d9f95 100644 46index e3fb15b26..34d9f951d 100644
47--- a/libgloss/microblaze/crt2.S 47--- a/libgloss/microblaze/crt2.S
48+++ b/libgloss/microblaze/crt2.S 48+++ b/libgloss/microblaze/crt2.S
49@@ -73,7 +73,7 @@ _vector_hw_exception: 49@@ -73,7 +73,7 @@ _vector_hw_exception:
@@ -56,7 +56,7 @@ index e3fb15b..34d9f95 100644
56 brlid r15, _crtinit /* Initialize BSS and run program */ 56 brlid r15, _crtinit /* Initialize BSS and run program */
57 nop 57 nop
58diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S 58diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S
59index 452ea52..ebcf207 100644 59index 452ea5265..ebcf207f5 100644
60--- a/libgloss/microblaze/crt3.S 60--- a/libgloss/microblaze/crt3.S
61+++ b/libgloss/microblaze/crt3.S 61+++ b/libgloss/microblaze/crt3.S
62@@ -59,7 +59,7 @@ 62@@ -59,7 +59,7 @@
@@ -69,7 +69,7 @@ index 452ea52..ebcf207 100644
69 brlid r15, _crtinit /* Initialize BSS and run program */ 69 brlid r15, _crtinit /* Initialize BSS and run program */
70 nop 70 nop
71diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S 71diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S
72index 475acec..4cf0b01 100644 72index 475acecfd..4cf0b01a4 100644
73--- a/libgloss/microblaze/crt4.S 73--- a/libgloss/microblaze/crt4.S
74+++ b/libgloss/microblaze/crt4.S 74+++ b/libgloss/microblaze/crt4.S
75@@ -59,7 +59,7 @@ 75@@ -59,7 +59,7 @@
@@ -82,7 +82,7 @@ index 475acec..4cf0b01 100644
82 brlid r15, _crtinit /* Initialize BSS and run program */ 82 brlid r15, _crtinit /* Initialize BSS and run program */
83 nop 83 nop
84diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S 84diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S
85index 78eb76d..86c6dfc 100644 85index 78eb76df6..86c6dfcb0 100644
86--- a/libgloss/microblaze/crtinit.S 86--- a/libgloss/microblaze/crtinit.S
87+++ b/libgloss/microblaze/crtinit.S 87+++ b/libgloss/microblaze/crtinit.S
88@@ -33,7 +33,7 @@ 88@@ -33,7 +33,7 @@
@@ -103,7 +103,7 @@ index 78eb76d..86c6dfc 100644
103 .end _crtinit 103 .end _crtinit
104 104
105diff --git a/libgloss/microblaze/pgcrtinit.S b/libgloss/microblaze/pgcrtinit.S 105diff --git a/libgloss/microblaze/pgcrtinit.S b/libgloss/microblaze/pgcrtinit.S
106index fca1bc4..2593082 100644 106index fca1bc45e..25930821c 100644
107--- a/libgloss/microblaze/pgcrtinit.S 107--- a/libgloss/microblaze/pgcrtinit.S
108+++ b/libgloss/microblaze/pgcrtinit.S 108+++ b/libgloss/microblaze/pgcrtinit.S
109@@ -33,7 +33,7 @@ 109@@ -33,7 +33,7 @@
@@ -124,7 +124,7 @@ index fca1bc4..2593082 100644
124 .end _crtinit 124 .end _crtinit
125 125
126diff --git a/libgloss/microblaze/sim-crtinit.S b/libgloss/microblaze/sim-crtinit.S 126diff --git a/libgloss/microblaze/sim-crtinit.S b/libgloss/microblaze/sim-crtinit.S
127index d2f59fe..74586d9 100644 127index d2f59fe6d..74586d9a7 100644
128--- a/libgloss/microblaze/sim-crtinit.S 128--- a/libgloss/microblaze/sim-crtinit.S
129+++ b/libgloss/microblaze/sim-crtinit.S 129+++ b/libgloss/microblaze/sim-crtinit.S
130@@ -39,7 +39,7 @@ 130@@ -39,7 +39,7 @@
@@ -145,7 +145,7 @@ index d2f59fe..74586d9 100644
145 .end _crtinit 145 .end _crtinit
146 146
147diff --git a/libgloss/microblaze/sim-pgcrtinit.S b/libgloss/microblaze/sim-pgcrtinit.S 147diff --git a/libgloss/microblaze/sim-pgcrtinit.S b/libgloss/microblaze/sim-pgcrtinit.S
148index 3c6ba83..82ebcca 100644 148index 3c6ba8371..82ebccad4 100644
149--- a/libgloss/microblaze/sim-pgcrtinit.S 149--- a/libgloss/microblaze/sim-pgcrtinit.S
150+++ b/libgloss/microblaze/sim-pgcrtinit.S 150+++ b/libgloss/microblaze/sim-pgcrtinit.S
151@@ -39,7 +39,7 @@ 151@@ -39,7 +39,7 @@
@@ -166,7 +166,7 @@ index 3c6ba83..82ebcca 100644
166 .end _crtinit 166 .end _crtinit
167 167
168diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c 168diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
169index 434195e..3119d82 100644 169index 434195e2c..3119d82c5 100644
170--- a/newlib/libc/machine/microblaze/strcmp.c 170--- a/newlib/libc/machine/microblaze/strcmp.c
171+++ b/newlib/libc/machine/microblaze/strcmp.c 171+++ b/newlib/libc/machine/microblaze/strcmp.c
172@@ -96,15 +96,15 @@ strcmp (const char *s1, 172@@ -96,15 +96,15 @@ strcmp (const char *s1,
@@ -190,5 +190,5 @@ index 434195e..3119d82 100644
190 { 190 {
191 /* To get here, *a1 == *a2, thus if we find a null in *a1, 191 /* To get here, *a1 == *a2, thus if we find a null in *a1,
192-- 192--
1932.7.4 1932.17.1
194 194
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 c62a9919..55dde803 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 @@
1From eab8d664224d134b2c4d638d9c6bebb84ae777ad Mon Sep 17 00:00:00 2001 1From 5040f7d8abb79bf4240d0b446e2d33d26680d9fc Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Tue, 11 Sep 2018 14:32:20 +0530 3Date: Tue, 11 Sep 2018 14:32:20 +0530
4Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64 4Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64
@@ -13,23 +13,23 @@ Conflicts:
13 libgloss/microblaze/_interrupt_handler.S | 7 +- 13 libgloss/microblaze/_interrupt_handler.S | 7 +-
14 libgloss/microblaze/_program_clean.S | 6 +- 14 libgloss/microblaze/_program_clean.S | 6 +-
15 libgloss/microblaze/_program_init.S | 6 +- 15 libgloss/microblaze/_program_init.S | 6 +-
16 libgloss/microblaze/crt0.S | 53 ++++++++++-- 16 libgloss/microblaze/crt0.S | 53 ++++++++-
17 libgloss/microblaze/crt1.S | 54 +++++++++++-- 17 libgloss/microblaze/crt1.S | 54 +++++++--
18 libgloss/microblaze/crt2.S | 52 ++++++++++-- 18 libgloss/microblaze/crt2.S | 52 +++++++--
19 libgloss/microblaze/crt3.S | 32 +++++++- 19 libgloss/microblaze/crt3.S | 32 +++++-
20 libgloss/microblaze/crt4.S | 37 +++++++-- 20 libgloss/microblaze/crt4.S | 37 +++++-
21 libgloss/microblaze/crtinit.S | 120 ++++++++++++++++++++-------- 21 libgloss/microblaze/crtinit.S | 120 ++++++++++++++------
22 libgloss/microblaze/linux-crt0.S | 60 +++++++++++--- 22 libgloss/microblaze/linux-crt0.S | 60 ++++++++--
23 libgloss/microblaze/linux-syscalls.S | 15 +++- 23 libgloss/microblaze/linux-syscalls.S | 15 ++-
24 libgloss/microblaze/pgcrtinit.S | 59 +++++++++++++- 24 libgloss/microblaze/pgcrtinit.S | 59 +++++++++-
25 libgloss/microblaze/sim-crtinit.S | 31 +++++++ 25 libgloss/microblaze/sim-crtinit.S | 31 +++++
26 libgloss/microblaze/sim-pgcrtinit.S | 31 +++++++ 26 libgloss/microblaze/sim-pgcrtinit.S | 31 +++++
27 newlib/libc/machine/microblaze/longjmp.S | 45 +++++++++-- 27 newlib/libc/machine/microblaze/longjmp.S | 45 ++++++--
28 newlib/libc/machine/microblaze/setjmp.S | 33 +++++++- 28 newlib/libc/machine/microblaze/setjmp.S | 33 +++++-
29 18 files changed, 563 insertions(+), 91 deletions(-) 29 18 files changed, 563 insertions(+), 91 deletions(-)
30 30
31diff --git a/libgloss/microblaze/_exception_handler.S b/libgloss/microblaze/_exception_handler.S 31diff --git a/libgloss/microblaze/_exception_handler.S b/libgloss/microblaze/_exception_handler.S
32index 7a91a78..0fdff3f 100644 32index 7a91a781e..0fdff3fec 100644
33--- a/libgloss/microblaze/_exception_handler.S 33--- a/libgloss/microblaze/_exception_handler.S
34+++ b/libgloss/microblaze/_exception_handler.S 34+++ b/libgloss/microblaze/_exception_handler.S
35@@ -30,7 +30,11 @@ 35@@ -30,7 +30,11 @@
@@ -46,7 +46,7 @@ index 7a91a78..0fdff3f 100644
46 .ent _exception_handler 46 .ent _exception_handler
47 .type _exception_handler, @function 47 .type _exception_handler, @function
48diff --git a/libgloss/microblaze/_hw_exception_handler.S b/libgloss/microblaze/_hw_exception_handler.S 48diff --git a/libgloss/microblaze/_hw_exception_handler.S b/libgloss/microblaze/_hw_exception_handler.S
49index 47df945..b951a63 100644 49index 47df945c4..b951a6325 100644
50--- a/libgloss/microblaze/_hw_exception_handler.S 50--- a/libgloss/microblaze/_hw_exception_handler.S
51+++ b/libgloss/microblaze/_hw_exception_handler.S 51+++ b/libgloss/microblaze/_hw_exception_handler.S
52@@ -32,8 +32,11 @@ 52@@ -32,8 +32,11 @@
@@ -64,7 +64,7 @@ index 47df945..b951a63 100644
64 rted r17, 0 64 rted r17, 0
65 nop 65 nop
66diff --git a/libgloss/microblaze/_interrupt_handler.S b/libgloss/microblaze/_interrupt_handler.S 66diff --git a/libgloss/microblaze/_interrupt_handler.S b/libgloss/microblaze/_interrupt_handler.S
67index 5bb7329..a0ef92d 100644 67index 5bb7329cc..a0ef92df0 100644
68--- a/libgloss/microblaze/_interrupt_handler.S 68--- a/libgloss/microblaze/_interrupt_handler.S
69+++ b/libgloss/microblaze/_interrupt_handler.S 69+++ b/libgloss/microblaze/_interrupt_handler.S
70@@ -32,8 +32,11 @@ 70@@ -32,8 +32,11 @@
@@ -82,7 +82,7 @@ index 5bb7329..a0ef92d 100644
82 rtid r14, 0 82 rtid r14, 0
83 nop 83 nop
84diff --git a/libgloss/microblaze/_program_clean.S b/libgloss/microblaze/_program_clean.S 84diff --git a/libgloss/microblaze/_program_clean.S b/libgloss/microblaze/_program_clean.S
85index c460594..0d55d8a 100644 85index c46059434..0d55d8ab8 100644
86--- a/libgloss/microblaze/_program_clean.S 86--- a/libgloss/microblaze/_program_clean.S
87+++ b/libgloss/microblaze/_program_clean.S 87+++ b/libgloss/microblaze/_program_clean.S
88@@ -33,7 +33,11 @@ 88@@ -33,7 +33,11 @@
@@ -99,7 +99,7 @@ index c460594..0d55d8a 100644
99 .ent _program_clean 99 .ent _program_clean
100 _program_clean: 100 _program_clean:
101diff --git a/libgloss/microblaze/_program_init.S b/libgloss/microblaze/_program_init.S 101diff --git a/libgloss/microblaze/_program_init.S b/libgloss/microblaze/_program_init.S
102index 0daa42e..862ef78 100644 102index 0daa42e14..862ef786b 100644
103--- a/libgloss/microblaze/_program_init.S 103--- a/libgloss/microblaze/_program_init.S
104+++ b/libgloss/microblaze/_program_init.S 104+++ b/libgloss/microblaze/_program_init.S
105@@ -32,7 +32,11 @@ 105@@ -32,7 +32,11 @@
@@ -116,7 +116,7 @@ index 0daa42e..862ef78 100644
116 .ent _program_init 116 .ent _program_init
117 _program_init: 117 _program_init:
118diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S 118diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S
119index 865a8c2..e4df73b 100644 119index 865a8c269..e4df73b66 100644
120--- a/libgloss/microblaze/crt0.S 120--- a/libgloss/microblaze/crt0.S
121+++ b/libgloss/microblaze/crt0.S 121+++ b/libgloss/microblaze/crt0.S
122@@ -54,7 +54,11 @@ 122@@ -54,7 +54,11 @@
@@ -222,7 +222,7 @@ index 865a8c2..e4df73b 100644
222+#endif 222+#endif
223 .end _exit 223 .end _exit
224diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S 224diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S
225index a8bf749..b24eeb5 100644 225index a8bf74937..b24eeb531 100644
226--- a/libgloss/microblaze/crt1.S 226--- a/libgloss/microblaze/crt1.S
227+++ b/libgloss/microblaze/crt1.S 227+++ b/libgloss/microblaze/crt1.S
228@@ -53,36 +53,67 @@ 228@@ -53,36 +53,67 @@
@@ -321,7 +321,7 @@ index a8bf749..b24eeb5 100644
321 .end _exit 321 .end _exit
322- 322-
323diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S 323diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S
324index 34d9f95..ae4c89e 100644 324index 34d9f951d..ae4c89ee0 100644
325--- a/libgloss/microblaze/crt2.S 325--- a/libgloss/microblaze/crt2.S
326+++ b/libgloss/microblaze/crt2.S 326+++ b/libgloss/microblaze/crt2.S
327@@ -51,26 +51,56 @@ 327@@ -51,26 +51,56 @@
@@ -415,7 +415,7 @@ index 34d9f95..ae4c89e 100644
415+#endif 415+#endif
416 .end _exit 416 .end _exit
417diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S 417diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S
418index ebcf207..a8bc783 100644 418index ebcf207f5..a8bc7839b 100644
419--- a/libgloss/microblaze/crt3.S 419--- a/libgloss/microblaze/crt3.S
420+++ b/libgloss/microblaze/crt3.S 420+++ b/libgloss/microblaze/crt3.S
421@@ -53,10 +53,26 @@ 421@@ -53,10 +53,26 @@
@@ -476,7 +476,7 @@ index ebcf207..a8bc783 100644
476+#endif 476+#endif
477 .end _exit 477 .end _exit
478diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S 478diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S
479index 4cf0b01..54ba473 100644 479index 4cf0b01a4..54ba473ea 100644
480--- a/libgloss/microblaze/crt4.S 480--- a/libgloss/microblaze/crt4.S
481+++ b/libgloss/microblaze/crt4.S 481+++ b/libgloss/microblaze/crt4.S
482@@ -53,10 +53,27 @@ 482@@ -53,10 +53,27 @@
@@ -542,7 +542,7 @@ index 4cf0b01..54ba473 100644
542+#endif 542+#endif
543 .end _exit 543 .end _exit
544diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S 544diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S
545index 86c6dfc..8541175 100644 545index 86c6dfcb0..854117536 100644
546--- a/libgloss/microblaze/crtinit.S 546--- a/libgloss/microblaze/crtinit.S
547+++ b/libgloss/microblaze/crtinit.S 547+++ b/libgloss/microblaze/crtinit.S
548@@ -29,59 +29,115 @@ 548@@ -29,59 +29,115 @@
@@ -694,7 +694,7 @@ index 86c6dfc..8541175 100644
694 .end _crtinit 694 .end _crtinit
695 695
696diff --git a/libgloss/microblaze/linux-crt0.S b/libgloss/microblaze/linux-crt0.S 696diff --git a/libgloss/microblaze/linux-crt0.S b/libgloss/microblaze/linux-crt0.S
697index 8650bb5..503439b 100644 697index 8650bb5d2..503439b2e 100644
698--- a/libgloss/microblaze/linux-crt0.S 698--- a/libgloss/microblaze/linux-crt0.S
699+++ b/libgloss/microblaze/linux-crt0.S 699+++ b/libgloss/microblaze/linux-crt0.S
700@@ -18,26 +18,50 @@ 700@@ -18,26 +18,50 @@
@@ -789,7 +789,7 @@ index 8650bb5..503439b 100644
789 sw r15, r0, r1 789 sw r15, r0, r1
790+#endif 790+#endif
791diff --git a/libgloss/microblaze/linux-syscalls.S b/libgloss/microblaze/linux-syscalls.S 791diff --git a/libgloss/microblaze/linux-syscalls.S b/libgloss/microblaze/linux-syscalls.S
792index 506de78..8594f13 100644 792index 506de78fd..8594f136e 100644
793--- a/libgloss/microblaze/linux-syscalls.S 793--- a/libgloss/microblaze/linux-syscalls.S
794+++ b/libgloss/microblaze/linux-syscalls.S 794+++ b/libgloss/microblaze/linux-syscalls.S
795@@ -20,8 +20,9 @@ 795@@ -20,8 +20,9 @@
@@ -823,7 +823,7 @@ index 506de78..8594f13 100644
823 SYSCALL(exit) 823 SYSCALL(exit)
824 SYSCALL(read) 824 SYSCALL(read)
825diff --git a/libgloss/microblaze/pgcrtinit.S b/libgloss/microblaze/pgcrtinit.S 825diff --git a/libgloss/microblaze/pgcrtinit.S b/libgloss/microblaze/pgcrtinit.S
826index 2593082..638dbd3 100644 826index 25930821c..638dbd383 100644
827--- a/libgloss/microblaze/pgcrtinit.S 827--- a/libgloss/microblaze/pgcrtinit.S
828+++ b/libgloss/microblaze/pgcrtinit.S 828+++ b/libgloss/microblaze/pgcrtinit.S
829@@ -29,10 +29,66 @@ 829@@ -29,10 +29,66 @@
@@ -904,7 +904,7 @@ index 2593082..638dbd3 100644
904 .end _crtinit 904 .end _crtinit
905 905
906diff --git a/libgloss/microblaze/sim-crtinit.S b/libgloss/microblaze/sim-crtinit.S 906diff --git a/libgloss/microblaze/sim-crtinit.S b/libgloss/microblaze/sim-crtinit.S
907index 74586d9..9892cb0 100644 907index 74586d9a7..9892cb0bd 100644
908--- a/libgloss/microblaze/sim-crtinit.S 908--- a/libgloss/microblaze/sim-crtinit.S
909+++ b/libgloss/microblaze/sim-crtinit.S 909+++ b/libgloss/microblaze/sim-crtinit.S
910@@ -35,10 +35,39 @@ 910@@ -35,10 +35,39 @@
@@ -958,7 +958,7 @@ index 74586d9..9892cb0 100644
958 .end _crtinit 958 .end _crtinit
959 959
960diff --git a/libgloss/microblaze/sim-pgcrtinit.S b/libgloss/microblaze/sim-pgcrtinit.S 960diff --git a/libgloss/microblaze/sim-pgcrtinit.S b/libgloss/microblaze/sim-pgcrtinit.S
961index 82ebcca..939f537 100644 961index 82ebccad4..939f5372f 100644
962--- a/libgloss/microblaze/sim-pgcrtinit.S 962--- a/libgloss/microblaze/sim-pgcrtinit.S
963+++ b/libgloss/microblaze/sim-pgcrtinit.S 963+++ b/libgloss/microblaze/sim-pgcrtinit.S
964@@ -35,10 +35,40 @@ 964@@ -35,10 +35,40 @@
@@ -1010,7 +1010,7 @@ index 82ebcca..939f537 100644
1010 .end _crtinit 1010 .end _crtinit
1011 1011
1012diff --git a/newlib/libc/machine/microblaze/longjmp.S b/newlib/libc/machine/microblaze/longjmp.S 1012diff --git a/newlib/libc/machine/microblaze/longjmp.S b/newlib/libc/machine/microblaze/longjmp.S
1013index f972bbd..5ed1c26 100644 1013index f972bbd88..5ed1c2626 100644
1014--- a/newlib/libc/machine/microblaze/longjmp.S 1014--- a/newlib/libc/machine/microblaze/longjmp.S
1015+++ b/newlib/libc/machine/microblaze/longjmp.S 1015+++ b/newlib/libc/machine/microblaze/longjmp.S
1016@@ -51,16 +51,46 @@ 1016@@ -51,16 +51,46 @@
@@ -1082,7 +1082,7 @@ index f972bbd..5ed1c26 100644
1082+#endif 1082+#endif
1083 .end longjmp 1083 .end longjmp
1084diff --git a/newlib/libc/machine/microblaze/setjmp.S b/newlib/libc/machine/microblaze/setjmp.S 1084diff --git a/newlib/libc/machine/microblaze/setjmp.S b/newlib/libc/machine/microblaze/setjmp.S
1085index cdd87c7..971862b 100644 1085index cdd87c76f..971862bcb 100644
1086--- a/newlib/libc/machine/microblaze/setjmp.S 1086--- a/newlib/libc/machine/microblaze/setjmp.S
1087+++ b/newlib/libc/machine/microblaze/setjmp.S 1087+++ b/newlib/libc/machine/microblaze/setjmp.S
1088@@ -50,9 +50,39 @@ 1088@@ -50,9 +50,39 @@
@@ -1133,5 +1133,5 @@ index cdd87c7..971862b 100644
1133+#endif 1133+#endif
1134 .end setjmp 1134 .end setjmp
1135-- 1135--
11362.7.4 11362.17.1
1137 1137
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 9f27cd60..437d29f3 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 @@
1From 1c7a9150b63089baf3f63c64bf3dbb4d73c814f5 Mon Sep 17 00:00:00 2001 1From 000cfdc6f16009e62c236267ce7123a9ef2380e9 Mon Sep 17 00:00:00 2001
2From: Nagaraju Mekala <nmekala@xilix.com> 2From: Nagaraju Mekala <nmekala@xilix.com>
3Date: Fri, 28 Sep 2018 12:07:43 +0530 3Date: Fri, 28 Sep 2018 12:07:43 +0530
4Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of 4Subject: [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
13 5 files changed, 15 insertions(+), 15 deletions(-) 13 5 files changed, 15 insertions(+), 15 deletions(-)
14 14
15diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S 15diff --git a/libgloss/microblaze/crt0.S b/libgloss/microblaze/crt0.S
16index e4df73b..25e7c4a 100644 16index e4df73b66..25e7c4af3 100644
17--- a/libgloss/microblaze/crt0.S 17--- a/libgloss/microblaze/crt0.S
18+++ b/libgloss/microblaze/crt0.S 18+++ b/libgloss/microblaze/crt0.S
19@@ -106,9 +106,9 @@ _vector_hw_exception: 19@@ -106,9 +106,9 @@ _vector_hw_exception:
@@ -30,7 +30,7 @@ index e4df73b..25e7c4a 100644
30 nop 30 nop
31 addlik r5, r3, 0 31 addlik r5, r3, 0
32diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S 32diff --git a/libgloss/microblaze/crt1.S b/libgloss/microblaze/crt1.S
33index b24eeb5..38440c9 100644 33index b24eeb531..38440c957 100644
34--- a/libgloss/microblaze/crt1.S 34--- a/libgloss/microblaze/crt1.S
35+++ b/libgloss/microblaze/crt1.S 35+++ b/libgloss/microblaze/crt1.S
36@@ -94,9 +94,9 @@ _vector_hw_exception: 36@@ -94,9 +94,9 @@ _vector_hw_exception:
@@ -47,7 +47,7 @@ index b24eeb5..38440c9 100644
47 brealid r15, _crtinit /* Initialize BSS and run program */ 47 brealid r15, _crtinit /* Initialize BSS and run program */
48 nop 48 nop
49diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S 49diff --git a/libgloss/microblaze/crt2.S b/libgloss/microblaze/crt2.S
50index ae4c89e..352927d 100644 50index ae4c89ee0..352927dab 100644
51--- a/libgloss/microblaze/crt2.S 51--- a/libgloss/microblaze/crt2.S
52+++ b/libgloss/microblaze/crt2.S 52+++ b/libgloss/microblaze/crt2.S
53@@ -92,9 +92,9 @@ _vector_hw_exception: 53@@ -92,9 +92,9 @@ _vector_hw_exception:
@@ -64,7 +64,7 @@ index ae4c89e..352927d 100644
64 nop 64 nop
65 addlik r5, r3, 0 65 addlik r5, r3, 0
66diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S 66diff --git a/libgloss/microblaze/crt3.S b/libgloss/microblaze/crt3.S
67index a8bc783..bc32cda 100644 67index a8bc7839b..bc32cda86 100644
68--- a/libgloss/microblaze/crt3.S 68--- a/libgloss/microblaze/crt3.S
69+++ b/libgloss/microblaze/crt3.S 69+++ b/libgloss/microblaze/crt3.S
70@@ -62,9 +62,9 @@ 70@@ -62,9 +62,9 @@
@@ -81,7 +81,7 @@ index a8bc783..bc32cda 100644
81 brealid r15, _crtinit /* Initialize BSS and run program */ 81 brealid r15, _crtinit /* Initialize BSS and run program */
82 nop 82 nop
83diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S 83diff --git a/libgloss/microblaze/crt4.S b/libgloss/microblaze/crt4.S
84index 54ba473..a25c847 100644 84index 54ba473ea..a25c84734 100644
85--- a/libgloss/microblaze/crt4.S 85--- a/libgloss/microblaze/crt4.S
86+++ b/libgloss/microblaze/crt4.S 86+++ b/libgloss/microblaze/crt4.S
87@@ -63,9 +63,9 @@ 87@@ -63,9 +63,9 @@
@@ -98,5 +98,5 @@ index 54ba473..a25c847 100644
98 brealid r15, _crtinit /* Initialize BSS and run program */ 98 brealid r15, _crtinit /* Initialize BSS and run program */
99 nop 99 nop
100-- 100--
1012.7.4 1012.17.1
102 102
diff --git a/meta-microblaze/recipes-core/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
index 38508b55..1d4394d3 100644
--- a/meta-microblaze/recipes-core/newlib/files/0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
@@ -1,25 +1,26 @@
1From 19d7b2a34f3c69d62f570ac9d0f6bc3cd584b496 Mon Sep 17 00:00:00 2001 1From 6587a1cae28468f5a49659a39040f60e425827a7 Mon Sep 17 00:00:00 2001
2From: Nagaraju <nmekala@xilinx.com> 2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Thu, 14 Mar 2019 18:16:32 +0530 3Date: Tue, 17 Nov 2020 13:06:41 +0530
4Subject: [PATCH 09/11] Added MB-64 support to strcmp/strcpy/strlen files 4Subject: [PATCH 09/11] [Patch,MicroBlaze] : Added MB-64 support to
5 strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati<mbodapat@xilinx.com>
5 6
6--- 7---
7 newlib/libc/machine/microblaze/strcmp.c | 61 ++++++++++++++++++++++++++++++++- 8 newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++-
8 newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++++++++++ 9 newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++
9 newlib/libc/machine/microblaze/strlen.c | 38 ++++++++++++++++++++ 10 newlib/libc/machine/microblaze/strlen.c | 38 +++++++++++++++
10 3 files changed, 155 insertions(+), 1 deletion(-) 11 3 files changed, 157 insertions(+), 1 deletion(-)
11 12
12diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c 13diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
13index 3119d82..dac64da 100644 14index 3119d82c5..2cfef7388 100644
14--- a/newlib/libc/machine/microblaze/strcmp.c 15--- a/newlib/libc/machine/microblaze/strcmp.c
15+++ b/newlib/libc/machine/microblaze/strcmp.c 16+++ b/newlib/libc/machine/microblaze/strcmp.c
16@@ -133,6 +133,65 @@ strcmp (const char *s1, 17@@ -133,6 +133,66 @@ strcmp (const char *s1,
17 18
18 #include "mb_endian.h" 19 #include "mb_endian.h"
19 20
20+#ifdef __arch64__ 21+#ifdef __arch64__
21+ asm volatile (" \n\ 22+ asm volatile (" \n\
22+ orl r9, r0, r0 /* Index register */\n\ 23+ orl r9, r0, r0 /* Index register */ \n\
23+check_alignment: \n\ 24+check_alignment: \n\
24+ andli r3, r5, 3 \n\ 25+ andli r3, r5, 3 \n\
25+ andli r4, r6, 3 \n\ 26+ andli r4, r6, 3 \n\
@@ -45,7 +46,7 @@ index 3119d82..dac64da 100644
45+ beaneid r3, end_cmp_loop /* If reached null on one string, terminate */ \n\ 46+ beaneid r3, end_cmp_loop /* If reached null on one string, terminate */ \n\
46+ nop \n\ 47+ nop \n\
47+end_cmp_early: \n\ 48+end_cmp_early: \n\
48+ or r3, r0, r7 /* delay slot */ \n\ 49+ orl r3, r0, r7 /* delay slot */ \n\
49+ rtsd r15, 8 \n\ 50+ rtsd r15, 8 \n\
50+ nop \n\ 51+ nop \n\
51+try_align_args: \n\ 52+try_align_args: \n\
@@ -55,7 +56,7 @@ index 3119d82..dac64da 100644
55+align_loop: \n\ 56+align_loop: \n\
56+ lbu r3, r5, r9 \n\ 57+ lbu r3, r5, r9 \n\
57+ lbu r4, r6, r9 \n\ 58+ lbu r4, r6, r9 \n\
58+ cmpu r7, r4, r3 \n\ 59+ cmplu r7, r4, r3 \n\
59+ beanei r7, end_cmp \n\ 60+ beanei r7, end_cmp \n\
60+ beaeqi r3, end_cmp \n\ 61+ beaeqi r3, end_cmp \n\
61+ addlik r10, r10, -1 \n\ 62+ addlik r10, r10, -1 \n\
@@ -69,21 +70,23 @@ index 3119d82..dac64da 100644
69+ cmplu r7, r4, r3 \n\ 70+ cmplu r7, r4, r3 \n\
70+ beanei r7, end_cmp \n\ 71+ beanei r7, end_cmp \n\
71+ beaeqi r3, end_cmp \n\ 72+ beaeqi r3, end_cmp \n\
72+ breaid regular_strcmp \n\
73+ addlik r9, r9, 1 \n\ 73+ addlik r9, r9, 1 \n\
74+ breaid regular_strcmp \n\
75+ nop \n\
74+end_cmp: \n\ 76+end_cmp: \n\
75+ or r3, r0, r7 \n\ 77+ orl r3, r0, r7 \n\
76+ rtsd r15, 8 \n\ 78+ rtsd r15, 8 \n\
77+ nop /* Return strcmp result */"); 79+ nop /* Return strcmp result */");
78+#else 80+#else
79 asm volatile (" \n\ 81 asm volatile (" \n\
80 or r9, r0, r0 /* Index register */\n\ 82 or r9, r0, r0 /* Index register */\n\
81 check_alignment: \n\ 83 check_alignment: \n\
82@@ -181,11 +240,11 @@ regular_strcmp: 84@@ -181,11 +241,12 @@ regular_strcmp:
83 bnei r7, end_cmp \n\ 85 bnei r7, end_cmp \n\
84 beqi r3, end_cmp \n\ 86 beqi r3, end_cmp \n\
85 brid regular_strcmp \n\ 87 brid regular_strcmp \n\
86- addik r9, r9, 1 \n\ 88- addik r9, r9, 1 \n\
89+ addik r9, r9, 1
87 end_cmp: \n\ 90 end_cmp: \n\
88 rtsd r15, 8 \n\ 91 rtsd r15, 8 \n\
89 or r3, r0, r7 /* Return strcmp result */"); 92 or r3, r0, r7 /* Return strcmp result */");
@@ -93,7 +96,7 @@ index 3119d82..dac64da 100644
93 } 96 }
94 97
95diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c 98diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
96index 62072fa..6dbc60d 100644 99index 62072fa28..6dbc60d77 100644
97--- a/newlib/libc/machine/microblaze/strcpy.c 100--- a/newlib/libc/machine/microblaze/strcpy.c
98+++ b/newlib/libc/machine/microblaze/strcpy.c 101+++ b/newlib/libc/machine/microblaze/strcpy.c
99@@ -125,6 +125,62 @@ strcpy (char *__restrict dst0, 102@@ -125,6 +125,62 @@ strcpy (char *__restrict dst0,
@@ -168,7 +171,7 @@ index 62072fa..6dbc60d 100644
168 } 171 }
169 172
170diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c 173diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
171index acb4464..c04fa4f 100644 174index acb4464bc..b6f2d3c13 100644
172--- a/newlib/libc/machine/microblaze/strlen.c 175--- a/newlib/libc/machine/microblaze/strlen.c
173+++ b/newlib/libc/machine/microblaze/strlen.c 176+++ b/newlib/libc/machine/microblaze/strlen.c
174@@ -116,6 +116,43 @@ strlen (const char *str) 177@@ -116,6 +116,43 @@ strlen (const char *str)
@@ -186,13 +189,13 @@ index acb4464..c04fa4f 100644
186+" \n\ 189+" \n\
187+ pcmplbf r4, r3, r0 \n\ 190+ pcmplbf r4, r3, r0 \n\
188+ beanei r4, end_len \n\ 191+ beanei r4, end_len \n\
189+ addik r9, r9, 4 \n\ 192+ addlik r9, r9, 4 \n\
190+ breaid len_loop \n\ 193+ breaid len_loop \n\
191+ nop \n\ 194+ nop \n\
192+end_len: \n\ 195+end_len: \n\
193+ lbu r3, r5, r9 \n\ 196+ lbu r3, r5, r9 \n\
194+ beaeqi r3, done_len \n\ 197+ beaeqi r3, done_len \n\
195+ addik r9, r9, 1 \n\ 198+ addlik r9, r9, 1 \n\
196+ breaid end_len \n\ 199+ breaid end_len \n\
197+ nop \n\ 200+ nop \n\
198+done_len: \n\ 201+done_len: \n\
@@ -223,5 +226,5 @@ index acb4464..c04fa4f 100644
223 #endif /* ! HAVE_HW_PCMP */ 226 #endif /* ! HAVE_HW_PCMP */
224 } 227 }
225-- 228--
2262.7.4 2292.17.1
227 230
diff --git a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch b/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch
deleted file mode 100644
index d1f19a74..00000000
--- a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1From 70281e45fa433ec854f60b43fef019ebc8ca0649 Mon Sep 17 00:00:00 2001
2From: Mahesh Bodapati <mbodapat@xilinx.com>
3Date: Wed, 3 Apr 2019 11:52:50 +0530
4Subject: [PATCH 10/11] [Patch,MicroBlaze] : typos in string functions
5 microblaze 64 bit port.fixed the issues.
6
7---
8 newlib/libc/machine/microblaze/strcmp.c | 12 +++++++-----
9 newlib/libc/machine/microblaze/strlen.c | 4 ++--
10 2 files changed, 9 insertions(+), 7 deletions(-)
11
12diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
13index dac64da..acfe4cd 100644
14--- a/newlib/libc/machine/microblaze/strcmp.c
15+++ b/newlib/libc/machine/microblaze/strcmp.c
16@@ -135,7 +135,7 @@ strcmp (const char *s1,
17
18 #ifdef __arch64__
19 asm volatile (" \n\
20- orl r9, r0, r0 /* Index register */\n\
21+ orl r9, r0, r0 /* Index register */ \n\
22 check_alignment: \n\
23 andli r3, r5, 3 \n\
24 andli r4, r6, 3 \n\
25@@ -161,7 +161,7 @@ end_cmp_loop:
26 beaneid r3, end_cmp_loop /* If reached null on one string, terminate */ \n\
27 nop \n\
28 end_cmp_early: \n\
29- or r3, r0, r7 /* delay slot */ \n\
30+ orl r3, r0, r7 /* delay slot */ \n\
31 rtsd r15, 8 \n\
32 nop \n\
33 try_align_args: \n\
34@@ -171,7 +171,7 @@ try_align_args:
35 align_loop: \n\
36 lbu r3, r5, r9 \n\
37 lbu r4, r6, r9 \n\
38- cmpu r7, r4, r3 \n\
39+ cmplu r7, r4, r3 \n\
40 beanei r7, end_cmp \n\
41 beaeqi r3, end_cmp \n\
42 addlik r10, r10, -1 \n\
43@@ -185,10 +185,11 @@ regular_strcmp:
44 cmplu r7, r4, r3 \n\
45 beanei r7, end_cmp \n\
46 beaeqi r3, end_cmp \n\
47- breaid regular_strcmp \n\
48 addlik r9, r9, 1 \n\
49+ breaid regular_strcmp \n\
50+ nop \n\
51 end_cmp: \n\
52- or r3, r0, r7 \n\
53+ orl r3, r0, r7 \n\
54 rtsd r15, 8 \n\
55 nop /* Return strcmp result */");
56 #else
57@@ -240,6 +241,7 @@ regular_strcmp:
58 bnei r7, end_cmp \n\
59 beqi r3, end_cmp \n\
60 brid regular_strcmp \n\
61+ addik r9, r9, 1 \n\
62 end_cmp: \n\
63 rtsd r15, 8 \n\
64 or r3, r0, r7 /* Return strcmp result */");
65diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
66index c04fa4f..b6f2d3c 100644
67--- a/newlib/libc/machine/microblaze/strlen.c
68+++ b/newlib/libc/machine/microblaze/strlen.c
69@@ -127,13 +127,13 @@ len_loop: \n"
70 " \n\
71 pcmplbf r4, r3, r0 \n\
72 beanei r4, end_len \n\
73- addik r9, r9, 4 \n\
74+ addlik r9, r9, 4 \n\
75 breaid len_loop \n\
76 nop \n\
77 end_len: \n\
78 lbu r3, r5, r9 \n\
79 beaeqi r3, done_len \n\
80- addik r9, r9, 1 \n\
81+ addlik r9, r9, 1 \n\
82 breaid end_len \n\
83 nop \n\
84 done_len: \n\
85--
862.7.4
87
diff --git a/meta-microblaze/recipes-core/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch b/meta-microblaze/recipes-core/newlib/files/0010-Removing-the-Assembly-implementation-of-64bit-string.patch
index c8d13af0..a63b9dfd 100644
--- a/meta-microblaze/recipes-core/newlib/files/0011-Removing-the-Assembly-implementation-of-64bit-string.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0010-Removing-the-Assembly-implementation-of-64bit-string.patch
@@ -1,18 +1,20 @@
1From b35b582ef3f6575447097585174302fde1761078 Mon Sep 17 00:00:00 2001 1From fd624fc28cbca8863f4dd75f0bc08aba58f8455e Mon Sep 17 00:00:00 2001
2From: Nagaraju <nmekala@xilinx.com> 2From: Nagaraju <nmekala@xilinx.com>
3Date: Wed, 24 Apr 2019 23:29:21 +0530 3Date: Wed, 24 Apr 2019 23:29:21 +0530
4Subject: [PATCH 11/11] Removing the Assembly implementation of 64bit string 4Subject: [PATCH 10/11] Removing the Assembly implementation of 64bit string
5 function. Revisit in next release and fix it 5 function. Revisit in next release and fix it
6 6
7Conflicts:
8 newlib/libc/machine/microblaze/strcmp.c
7--- 9---
8 newlib/libc/machine/microblaze/mb_endian.h | 4 ++ 10 newlib/libc/machine/microblaze/mb_endian.h | 4 +
9 newlib/libc/machine/microblaze/strcmp.c | 93 ++++++++++-------------------- 11 newlib/libc/machine/microblaze/strcmp.c | 94 ++++++++--------------
10 newlib/libc/machine/microblaze/strcpy.c | 82 ++++++++------------------ 12 newlib/libc/machine/microblaze/strcpy.c | 82 ++++++-------------
11 newlib/libc/machine/microblaze/strlen.c | 59 +++++++------------ 13 newlib/libc/machine/microblaze/strlen.c | 59 +++++---------
12 4 files changed, 81 insertions(+), 157 deletions(-) 14 4 files changed, 81 insertions(+), 158 deletions(-)
13 15
14diff --git a/newlib/libc/machine/microblaze/mb_endian.h b/newlib/libc/machine/microblaze/mb_endian.h 16diff --git a/newlib/libc/machine/microblaze/mb_endian.h b/newlib/libc/machine/microblaze/mb_endian.h
15index fb217ec..17772c8 100644 17index fb217ec85..17772c88f 100644
16--- a/newlib/libc/machine/microblaze/mb_endian.h 18--- a/newlib/libc/machine/microblaze/mb_endian.h
17+++ b/newlib/libc/machine/microblaze/mb_endian.h 19+++ b/newlib/libc/machine/microblaze/mb_endian.h
18@@ -8,8 +8,12 @@ 20@@ -8,8 +8,12 @@
@@ -29,17 +31,19 @@ index fb217ec..17772c8 100644
29 #endif 31 #endif
30 #endif 32 #endif
31diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c 33diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
32index acfe4cd..e34c64a 100644 34index 2cfef7388..007d9e1eb 100644
33--- a/newlib/libc/machine/microblaze/strcmp.c 35--- a/newlib/libc/machine/microblaze/strcmp.c
34+++ b/newlib/libc/machine/microblaze/strcmp.c 36+++ b/newlib/libc/machine/microblaze/strcmp.c
35@@ -129,70 +129,42 @@ strcmp (const char *s1, 37@@ -129,70 +129,41 @@ strcmp (const char *s1,
36 return (*(unsigned char *) s1) - (*(unsigned char *) s2); 38 return (*(unsigned char *) s1) - (*(unsigned char *) s2);
37 #endif /* not PREFER_SIZE_OVER_SPEED */ 39 #endif /* not PREFER_SIZE_OVER_SPEED */
38 40
41-#else
39+#elif __arch64__ 42+#elif __arch64__
40+ unsigned int *a1; 43+ unsigned int *a1;
41+ unsigned int *a2; 44+ unsigned int *a2;
42+ 45
46-#include "mb_endian.h"
43+ /* If s1 or s2 are unaligned, then compare bytes. */ 47+ /* If s1 or s2 are unaligned, then compare bytes. */
44+ if (!UNALIGNED (s1, s2)) 48+ if (!UNALIGNED (s1, s2))
45+ { 49+ {
@@ -52,25 +56,6 @@ index acfe4cd..e34c64a 100644
52+ then the strings must be equal, so return zero. */ 56+ then the strings must be equal, so return zero. */
53+ if (DETECTNULL (*a1)) 57+ if (DETECTNULL (*a1))
54+ return 0; 58+ return 0;
55+
56+ a1++;
57+ a2++;
58+ }
59+
60+ /* A difference was detected in last few bytes of s1, so search bytewise */
61+ s1 = (char*)a1;
62+ s2 = (char*)a2;
63+ }
64+
65+ while (*s1 != '\0' && *s1 == *s2)
66+ {
67+ s1++;
68+ s2++;
69+ }
70+ return (*(unsigned char *) s1) - (*(unsigned char *) s2);
71 #else
72
73 #include "mb_endian.h"
74 59
75-#ifdef __arch64__ 60-#ifdef __arch64__
76- asm volatile (" \n\ 61- asm volatile (" \n\
@@ -126,16 +111,33 @@ index acfe4cd..e34c64a 100644
126- beaeqi r3, end_cmp \n\ 111- beaeqi r3, end_cmp \n\
127- addlik r9, r9, 1 \n\ 112- addlik r9, r9, 1 \n\
128- breaid regular_strcmp \n\ 113- breaid regular_strcmp \n\
129- nop \n\ 114- nop \n\
130-end_cmp: \n\ 115-end_cmp: \n\
131- orl r3, r0, r7 \n\ 116- orl r3, r0, r7 \n\
132- rtsd r15, 8 \n\ 117- rtsd r15, 8 \n\
133- nop /* Return strcmp result */"); 118- nop /* Return strcmp result */");
134-#else 119+ a1++;
120+ a2++;
121+ }
122+
123+ /* A difference was detected in last few bytes of s1, so search bytewise */
124+ s1 = (char*)a1;
125+ s2 = (char*)a2;
126+ }
127+
128+ while (*s1 != '\0' && *s1 == *s2)
129+ {
130+ s1++;
131+ s2++;
132+ }
133+ return (*(unsigned char *) s1) - (*(unsigned char *) s2);
134 #else
135+
136+#include "mb_endian.h"
135 asm volatile (" \n\ 137 asm volatile (" \n\
136 or r9, r0, r0 /* Index register */\n\ 138 or r9, r0, r0 /* Index register */\n\
137 check_alignment: \n\ 139 check_alignment: \n\
138@@ -246,7 +218,6 @@ end_cmp: 140@@ -246,7 +217,6 @@ end_cmp:
139 rtsd r15, 8 \n\ 141 rtsd r15, 8 \n\
140 or r3, r0, r7 /* Return strcmp result */"); 142 or r3, r0, r7 /* Return strcmp result */");
141 143
@@ -144,7 +146,7 @@ index acfe4cd..e34c64a 100644
144 } 146 }
145 147
146diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c 148diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
147index 6dbc60d..ddb6922 100644 149index 6dbc60d77..ddb69227e 100644
148--- a/newlib/libc/machine/microblaze/strcpy.c 150--- a/newlib/libc/machine/microblaze/strcpy.c
149+++ b/newlib/libc/machine/microblaze/strcpy.c 151+++ b/newlib/libc/machine/microblaze/strcpy.c
150@@ -121,67 +121,36 @@ strcpy (char *__restrict dst0, 152@@ -121,67 +121,36 @@ strcpy (char *__restrict dst0,
@@ -249,7 +251,7 @@ index 6dbc60d..ddb6922 100644
249 } 251 }
250 252
251diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c 253diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
252index b6f2d3c..9407539 100644 254index b6f2d3c13..940753996 100644
253--- a/newlib/libc/machine/microblaze/strlen.c 255--- a/newlib/libc/machine/microblaze/strlen.c
254+++ b/newlib/libc/machine/microblaze/strlen.c 256+++ b/newlib/libc/machine/microblaze/strlen.c
255@@ -112,47 +112,29 @@ strlen (const char *str) 257@@ -112,47 +112,29 @@ strlen (const char *str)
@@ -328,5 +330,5 @@ index b6f2d3c..9407539 100644
328 #endif /* ! HAVE_HW_PCMP */ 330 #endif /* ! HAVE_HW_PCMP */
329 } 331 }
330-- 332--
3312.7.4 3332.17.1
332 334
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
new file mode 100644
index 00000000..b6e03d42
--- /dev/null
+++ b/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
@@ -0,0 +1,25 @@
1From e0e6f5367eede4292d31c3dd901425bcd251595a Mon Sep 17 00:00:00 2001
2From: Nagaraju <nmekala@xilinx.com>
3Date: Tue, 14 Jan 2020 22:32:30 +0530
4Subject: [PATCH 11/11] Fixed the bug in crtinit.s for MB-64
5
6---
7 libgloss/microblaze/crtinit.S | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/libgloss/microblaze/crtinit.S b/libgloss/microblaze/crtinit.S
11index 854117536..f79140734 100644
12--- a/libgloss/microblaze/crtinit.S
13+++ b/libgloss/microblaze/crtinit.S
14@@ -48,7 +48,7 @@ _crtinit:
15
16 .Lloopsbss:
17 sli r0, r6, 0
18- addli r6, r6, 4
19+ addli r6, r6, 8
20 rsubl r18, r6, r7
21 beagti r18, .Lloopsbss
22 .Lendsbss:
23--
242.17.1
25
diff --git a/meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch b/meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch
new file mode 100644
index 00000000..c92942fc
--- /dev/null
+++ b/meta-microblaze/recipes-core/newlib/files/0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch
@@ -0,0 +1,26 @@
1From c2a8d7e6326a309221e4a287517a4920d33aa674 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@xilinx.com>
3Date: Mon, 30 Nov 2020 18:26:47 -0800
4Subject: [PATCH] libc/machine/microblaze/strcmp.c: Fix missing end of line
5
6Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
7---
8 newlib/libc/machine/microblaze/strcmp.c | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
12index 007d9e1eb..5d13d64ab 100644
13--- a/newlib/libc/machine/microblaze/strcmp.c
14+++ b/newlib/libc/machine/microblaze/strcmp.c
15@@ -212,7 +212,7 @@ regular_strcmp:
16 bnei r7, end_cmp \n\
17 beqi r3, end_cmp \n\
18 brid regular_strcmp \n\
19- addik r9, r9, 1
20+ addik r9, r9, 1 \n\
21 end_cmp: \n\
22 rtsd r15, 8 \n\
23 or r3, r0, r7 /* Return strcmp result */");
24--
252.17.1
26
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index c3b6acdc..1a4a90ad 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -1,15 +1,16 @@
1# Add MicroBlaze Patches 1# Add MicroBlaze Patches
2FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/files" 2FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/files"
3SRC_URI_append_microblaze = " \ 3SRC_URI_append_microblaze = " \
4 file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \ 4 file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \
5 file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \ 5 file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \
6 file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \ 6 file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \
7 file://0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \ 7 file://0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch \
8 file://0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \ 8 file://0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch \
9 file://0006-MB-X-intial-commit.patch \ 9 file://0006-MB-X-intial-commit.patch \
10 file://0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \ 10 file://0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch \
11 file://0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \ 11 file://0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch \
12 file://0009-Added-MB-64-support-to-strcmp-strcpy-strlen-files.patch \ 12 file://0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch \
13 file://0010-Patch-MicroBlaze-typos-in-string-functions-microblaz.patch \ 13 file://0010-Removing-the-Assembly-implementation-of-64bit-string.patch \
14 file://0011-Removing-the-Assembly-implementation-of-64bit-string.patch \ 14 file://0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch \
15 " 15 file://0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch \
16 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-26 08:21:02 +0000