Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

newlib/libgloss: Rebase patch for current version #51

Open
wants to merge 1 commit into
base: kirkstone-next
Choose a base branch
from
Open

newlib/libgloss: Rebase patch for current version #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions ...recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
3 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 libgloss/config/microblaze.mt

diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt
new file mode 100644
index 000000000..e8fb922dd
Index: newlib-4.2.0.20211231/libgloss/config/microblaze.mt
===================================================================
--- /dev/null
+++ b/libgloss/config/microblaze.mt
+++ newlib-4.2.0.20211231/libgloss/config/microblaze.mt
@@ -0,0 +1,30 @@
+#
+# Match default.mt to compile generic objects but continue building
Expand Down Expand Up @@ -60,11 +59,11 @@ index 000000000..e8fb922dd
+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
+write.o: ${srcdir}/../write.c
+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure
index 9b2bc7ab4..01f0fb29d 100644
--- a/libgloss/microblaze/configure
+++ b/libgloss/microblaze/configure
@@ -2020,7 +2020,7 @@ LIB_AM_PROG_AS
Index: newlib-4.2.0.20211231/libgloss/microblaze/configure
===================================================================
--- newlib-4.2.0.20211231.orig/libgloss/microblaze/configure
+++ newlib-4.2.0.20211231/libgloss/microblaze/configure
@@ -2550,7 +2550,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA


host_makefile_frag=${srcdir}/../config/default.mh
Expand All @@ -73,10 +72,10 @@ index 9b2bc7ab4..01f0fb29d 100644

host_makefile_frag_path=$host_makefile_frag

diff --git a/libgloss/microblaze/configure.in b/libgloss/microblaze/configure.in
index 77aa769d4..5d179fdfc 100644
--- a/libgloss/microblaze/configure.in
+++ b/libgloss/microblaze/configure.in
Index: newlib-4.2.0.20211231/libgloss/microblaze/configure.ac
===================================================================
--- newlib-4.2.0.20211231.orig/libgloss/microblaze/configure.ac
+++ newlib-4.2.0.20211231/libgloss/microblaze/configure.ac
@@ -35,7 +35,7 @@ LIB_AM_PROG_AS
AC_SUBST(bsp_prefix)

Expand All @@ -86,6 +85,3 @@ index 77aa769d4..5d179fdfc 100644

dnl We have to assign the same value to other variables because autoconf
dnl doesn't provide a mechanism to substitute a replacement keyword with
--
2.17.1

15 changes: 6 additions & 9 deletions ...recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
newlib/libc/include/stdio.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index ab18806e3..8240dd8ab 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const char *__restrict, ...)
Index: newlib-4.2.0.20211231/newlib/libc/include/stdio.h
===================================================================
--- newlib-4.2.0.20211231.orig/newlib/libc/include/stdio.h
+++ newlib-4.2.0.20211231/newlib/libc/include/stdio.h
@@ -245,6 +245,9 @@ int sprintf (char *__restrict, const cha
_ATTRIBUTE ((__format__ (__printf__, 2, 3)));
int remove (const char *);
int rename (const char *, const char *);
+void xil_printf (const char*, ...);
+void putnum (unsigned int );
+void print (const char* );
#ifdef _COMPILING_NEWLIB
#ifdef _LIBC
int _rename (const char *, const char *);
#endif
--
2.17.1