diff options
author | Mark Hatle <mark.hatle@amd.com> | 2024-03-20 14:39:12 -0600 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2024-03-21 17:49:51 -0600 |
commit | 13e2e08f028da93469d6a0ee18a153e9b5ae303d (patch) | |
tree | bc797374862b4b96de895a825c120d5dd02fa005 | |
parent | 013826a649491a3845b3a580d45cfec920040c2b (diff) | |
download | meta-xilinx-13e2e08f028da93469d6a0ee18a153e9b5ae303d.tar.gz |
meta-microblaze: newlib: Update patches
Rebase 0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch to
newer version of newlib.
All patches, add Upstream-Status as now required by the build system.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
11 files changed, 49 insertions, 32 deletions
diff --git a/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch index 584aab11..31076208 100644 --- a/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch +++ b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch | |||
@@ -17,6 +17,9 @@ Changelog | |||
17 | * microblaze/configure: Likewise. | 17 | * microblaze/configure: Likewise. |
18 | 18 | ||
19 | Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> | 19 | Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> |
20 | |||
21 | Upstream-Status: Pending | ||
22 | |||
20 | --- | 23 | --- |
21 | libgloss/config/microblaze.mt | 30 ++++++++++++++++++++++++++++++ | 24 | libgloss/config/microblaze.mt | 30 ++++++++++++++++++++++++++++++ |
22 | libgloss/microblaze/configure | 2 +- | 25 | libgloss/microblaze/configure | 2 +- |
@@ -24,11 +27,10 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> | |||
24 | 3 files changed, 32 insertions(+), 2 deletions(-) | 27 | 3 files changed, 32 insertions(+), 2 deletions(-) |
25 | create mode 100644 libgloss/config/microblaze.mt | 28 | create mode 100644 libgloss/config/microblaze.mt |
26 | 29 | ||
27 | diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt | 30 | Index: git/libgloss/config/microblaze.mt |
28 | new file mode 100644 | 31 | =================================================================== |
29 | index 000000000..e8fb922dd | ||
30 | --- /dev/null | 32 | --- /dev/null |
31 | +++ b/libgloss/config/microblaze.mt | 33 | +++ git/libgloss/config/microblaze.mt |
32 | @@ -0,0 +1,30 @@ | 34 | @@ -0,0 +1,30 @@ |
33 | +# | 35 | +# |
34 | +# Match default.mt to compile generic objects but continue building | 36 | +# Match default.mt to compile generic objects but continue building |
@@ -60,32 +62,27 @@ index 000000000..e8fb922dd | |||
60 | + $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $? | 62 | + $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $? |
61 | +write.o: ${srcdir}/../write.c | 63 | +write.o: ${srcdir}/../write.c |
62 | + $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $? | 64 | + $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $? |
63 | diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure | 65 | Index: git/libgloss/configure |
64 | index 05f68682c..faa23c584 100755 | 66 | =================================================================== |
65 | --- a/libgloss/microblaze/configure | 67 | --- git.orig/libgloss/configure |
66 | +++ b/libgloss/microblaze/configure | 68 | +++ git/libgloss/configure |
67 | @@ -2550,7 +2550,7 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS | 69 | @@ -2909,6 +2909,7 @@ case "${target}" in |
68 | 70 | ac_config_files="$ac_config_files microblaze/Makefile" | |
69 | |||
70 | host_makefile_frag=${srcdir}/../config/default.mh | ||
71 | -target_makefile_frag=${srcdir}/../config/default.mt | ||
72 | +target_makefile_frag=${srcdir}/../config/microblaze.mt | ||
73 | 71 | ||
74 | host_makefile_frag_path=$host_makefile_frag | 72 | subdirs="$subdirs microblaze" |
75 | 73 | + target_makefile_frag=${srcdir}/config/microblaze.mt | |
76 | diff --git a/libgloss/microblaze/configure.ac b/libgloss/microblaze/configure.ac | 74 | ;; |
77 | index 5eda42e73..d5c789d40 100644 | 75 | mt-*-*) |
78 | --- a/libgloss/microblaze/configure.ac | 76 | ac_config_files="$ac_config_files mt/Makefile" |
79 | +++ b/libgloss/microblaze/configure.ac | 77 | Index: git/libgloss/configure.ac |
80 | @@ -35,7 +35,7 @@ LIB_AM_PROG_AS | 78 | =================================================================== |
81 | AC_SUBST(bsp_prefix) | 79 | --- git.orig/libgloss/configure.ac |
82 | 80 | +++ git/libgloss/configure.ac | |
83 | host_makefile_frag=${srcdir}/../config/default.mh | 81 | @@ -172,6 +172,7 @@ case "${target}" in |
84 | -target_makefile_frag=${srcdir}/../config/default.mt | 82 | microblaze*-*-*) |
85 | +target_makefile_frag=${srcdir}/../config/microblaze.mt | 83 | AC_CONFIG_FILES([microblaze/Makefile]) |
86 | 84 | subdirs="$subdirs microblaze" | |
87 | dnl We have to assign the same value to other variables because autoconf | 85 | + target_makefile_frag=${srcdir}/config/microblaze.mt |
88 | dnl doesn't provide a mechanism to substitute a replacement keyword with | 86 | ;; |
89 | -- | 87 | mt-*-*) |
90 | 2.37.1 (Apple Git-137.1) | 88 | AC_CONFIG_FILES([mt/Makefile]) |
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 e39ee5b7..3c940329 100644 --- a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch +++ b/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch | |||
@@ -6,6 +6,8 @@ Subject: [PATCH 02/11] [Patch, microblaze]: Modified _exceptional_handler | |||
6 | to Superviosry call | 6 | to Superviosry call |
7 | 7 | ||
8 | Signed-off-by:Nagaraju Mekala<nmekala@xilix.com> | 8 | Signed-off-by:Nagaraju Mekala<nmekala@xilix.com> |
9 | |||
10 | Upstream-Status: Pending | ||
9 | --- | 11 | --- |
10 | libgloss/microblaze/_exception_handler.S | 1 - | 12 | libgloss/microblaze/_exception_handler.S | 1 - |
11 | 1 file changed, 1 deletion(-) | 13 | 1 file changed, 1 deletion(-) |
diff --git a/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch b/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch index e6404369..96b83269 100644 --- a/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch +++ b/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch | |||
@@ -6,6 +6,8 @@ Subject: [PATCH 03/11] [LOCAL]: Add missing declarations for xil_printf to | |||
6 | 6 | ||
7 | Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> | 7 | Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> |
8 | 8 | ||
9 | Upstream-Status: Pending | ||
10 | |||
9 | Conflicts: | 11 | Conflicts: |
10 | newlib/libc/include/stdio.h | 12 | newlib/libc/include/stdio.h |
11 | --- | 13 | --- |
diff --git a/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch b/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch index 4fa3da7f..6d398bdc 100644 --- a/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch +++ b/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch | |||
@@ -4,6 +4,8 @@ Date: Mon, 23 Jan 2017 15:42:11 +0530 | |||
4 | Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part | 4 | Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part |
5 | of BSP | 5 | of BSP |
6 | 6 | ||
7 | Upstream-Status: Pending | ||
8 | |||
7 | --- | 9 | --- |
8 | libgloss/microblaze/xil_printf.c | 284 ------------------------------- | 10 | libgloss/microblaze/xil_printf.c | 284 ------------------------------- |
9 | 1 file changed, 284 deletions(-) | 11 | 1 file changed, 284 deletions(-) |
diff --git a/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch b/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch index 025f7192..1576e54d 100644 --- a/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch +++ b/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch | |||
@@ -3,6 +3,8 @@ From: Mahesh Bodapati <mbodapat@xilinx.com> | |||
3 | Date: Mon, 23 Jan 2017 15:44:17 +0530 | 3 | Date: Mon, 23 Jan 2017 15:44:17 +0530 |
4 | Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE | 4 | Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE |
5 | 5 | ||
6 | Upstream-Status: Pending | ||
7 | |||
6 | --- | 8 | --- |
7 | libgloss/microblaze/Makefile.in | 2 +- | 9 | libgloss/microblaze/Makefile.in | 2 +- |
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
diff --git a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch b/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch index 805e755e..779580b6 100644 --- a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch +++ b/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch | |||
@@ -3,6 +3,8 @@ From: Nagaraju Mekala <nmekala@xilix.com> | |||
3 | Date: Fri, 27 Jul 2018 16:10:36 +0530 | 3 | Date: Fri, 27 Jul 2018 16:10:36 +0530 |
4 | Subject: [PATCH 06/11] MB-X intial commit | 4 | Subject: [PATCH 06/11] MB-X intial commit |
5 | 5 | ||
6 | Upstream-Status: Pending | ||
7 | |||
6 | --- | 8 | --- |
7 | libgloss/microblaze/crt0.S | 2 +- | 9 | libgloss/microblaze/crt0.S | 2 +- |
8 | libgloss/microblaze/crt1.S | 2 +- | 10 | libgloss/microblaze/crt1.S | 2 +- |
diff --git a/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch b/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch index ee7037a7..f3e20253 100644 --- a/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch +++ b/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch | |||
@@ -4,6 +4,8 @@ Date: Tue, 11 Sep 2018 14:32:20 +0530 | |||
4 | Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64 | 4 | Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64 |
5 | flag... | 5 | flag... |
6 | 6 | ||
7 | Upstream-Status: Pending | ||
8 | |||
7 | Conflicts: | 9 | Conflicts: |
8 | libgloss/microblaze/_hw_exception_handler.S | 10 | libgloss/microblaze/_hw_exception_handler.S |
9 | libgloss/microblaze/_interrupt_handler.S | 11 | libgloss/microblaze/_interrupt_handler.S |
diff --git a/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch b/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch index 915a26ef..b82d7b5c 100644 --- a/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch +++ b/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch | |||
@@ -4,6 +4,8 @@ Date: Fri, 28 Sep 2018 12:07:43 +0530 | |||
4 | Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of | 4 | Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of |
5 | lli insn | 5 | lli insn |
6 | 6 | ||
7 | Upstream-Status: Pending | ||
8 | |||
7 | --- | 9 | --- |
8 | libgloss/microblaze/crt0.S | 6 +++--- | 10 | libgloss/microblaze/crt0.S | 6 +++--- |
9 | libgloss/microblaze/crt1.S | 6 +++--- | 11 | libgloss/microblaze/crt1.S | 6 +++--- |
diff --git a/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch index 40d69465..1a89c31b 100644 --- a/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch +++ b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch | |||
@@ -4,6 +4,8 @@ Date: Tue, 17 Nov 2020 13:06:41 +0530 | |||
4 | Subject: [PATCH 09/11] [Patch,MicroBlaze] : Added MB-64 support to | 4 | Subject: [PATCH 09/11] [Patch,MicroBlaze] : Added MB-64 support to |
5 | strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati<mbodapat@xilinx.com> | 5 | strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati<mbodapat@xilinx.com> |
6 | 6 | ||
7 | Upstream-Status: Pending | ||
8 | |||
7 | --- | 9 | --- |
8 | newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++- | 10 | newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++- |
9 | newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++ | 11 | newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++ |
diff --git a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch b/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch index cd98dfa1..aaa2a009 100644 --- a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch +++ b/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch | |||
@@ -5,6 +5,8 @@ Subject: [PATCH 10/11] [Patch,MicroBlaze] : Removing the Assembly | |||
5 | implementation of 64bit string function. | 5 | implementation of 64bit string function. |
6 | 6 | ||
7 | Revisit in next release and fix it | 7 | Revisit in next release and fix it |
8 | |||
9 | Upstream-Status: Pending | ||
8 | --- | 10 | --- |
9 | newlib/libc/machine/microblaze/mb_endian.h | 4 + | 11 | newlib/libc/machine/microblaze/mb_endian.h | 4 + |
10 | newlib/libc/machine/microblaze/strcmp.c | 95 ++++++++-------------- | 12 | newlib/libc/machine/microblaze/strcmp.c | 95 ++++++++-------------- |
diff --git a/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch b/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch index ba5fcb8c..5e89db18 100644 --- a/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch +++ b/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch | |||
@@ -3,6 +3,8 @@ From: Nagaraju <nmekala@xilinx.com> | |||
3 | Date: Tue, 14 Jan 2020 22:32:30 +0530 | 3 | Date: Tue, 14 Jan 2020 22:32:30 +0530 |
4 | Subject: [PATCH 11/11] Fixed the bug in crtinit.s for MB-64 | 4 | Subject: [PATCH 11/11] Fixed the bug in crtinit.s for MB-64 |
5 | 5 | ||
6 | Upstream-Status: Pending | ||
7 | |||
6 | --- | 8 | --- |
7 | libgloss/microblaze/crtinit.S | 2 +- | 9 | libgloss/microblaze/crtinit.S | 2 +- |
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |