Skip to content

Commit b700c35

Browse files
WinterMuteWinterMute
committed
devkitARM: update newlib to 4.2.0.20211231
1 parent 73b1cb9 commit b700c35

2 files changed

Lines changed: 31 additions & 44 deletions

File tree

dkarm-eabi/patches/newlib-4.1.0.patch renamed to dkarm-eabi/patches/newlib-4.2.0.20211231.patch

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/libgloss/configure b/libgloss/configure
2-
index 816b9c4b8..b79edb6c8 100755
2+
index e70c57d89..ac5c745f9 100755
33
--- a/libgloss/configure
44
+++ b/libgloss/configure
5-
@@ -2609,6 +2609,8 @@ if test "${config_libnosys}" = "true"; then
5+
@@ -2787,6 +2787,8 @@ if test "${config_libnosys}" = "true"; then
66

77
fi
88

@@ -11,12 +11,12 @@ index 816b9c4b8..b79edb6c8 100755
1111
DEPDIR="${am__leading_dot}deps"
1212

1313
ac_config_commands="$ac_config_commands depfiles"
14-
diff --git a/libgloss/configure.in b/libgloss/configure.in
15-
index 4111724e1..0e44d885e 100644
16-
--- a/libgloss/configure.in
17-
+++ b/libgloss/configure.in
14+
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
15+
index 0fbe99526..577dfdec6 100644
16+
--- a/libgloss/configure.ac
17+
+++ b/libgloss/configure.ac
1818
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
19-
AC_PREREQ(2.59)
19+
AC_PREREQ(2.69)dnl
2020
AC_INIT([libgloss],[LIBGLOSS_VERSION])
2121
AC_CONFIG_SRCDIR([libnosys])
2222
+AC_CONFIG_SRCDIR([libsysbase])
@@ -7392,10 +7392,10 @@ index 000000000..61de918bc
73927392
+ return ret;
73937393
+}
73947394
diff --git a/newlib/configure.host b/newlib/configure.host
7395-
index 1ddbb6c76..ed9999bea 100644
7395+
index c429dde1c..26fb553a7 100644
73967396
--- a/newlib/configure.host
73977397
+++ b/newlib/configure.host
7398-
@@ -694,6 +694,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
7398+
@@ -693,6 +693,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
73997399
syscall_dir=syscalls
74007400
default_newlib_io_long_long="yes"
74017401
;;
@@ -7437,7 +7437,7 @@ index 5c293c83d..75ccf89f5 100644
74377437
#define _jp2uc(c) (c)
74387438
#define _jp2uc_l(c, l) (c)
74397439
diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
7440-
index 2b01fbe8f..7af875b81 100644
7440+
index 23d572cd3..65310c084 100644
74417441
--- a/newlib/libc/include/reent.h
74427442
+++ b/newlib/libc/include/reent.h
74437443
@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
@@ -7449,7 +7449,7 @@ index 2b01fbe8f..7af875b81 100644
74497449
extern int _stat_r (struct _reent *, const char *, struct stat *);
74507450
extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
74517451
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
7452-
index ab18806e3..db77ebb2a 100644
7452+
index 7748351f0..7377b2aa3 100644
74537453
--- a/newlib/libc/include/stdio.h
74547454
+++ b/newlib/libc/include/stdio.h
74557455
@@ -233,7 +233,7 @@ int fsetpos (FILE *, const _fpos_t *);
@@ -7462,7 +7462,7 @@ index ab18806e3..db77ebb2a 100644
74627462
void clearerr (FILE *);
74637463
int feof (FILE *);
74647464
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
7465-
index 4bc8d29bf..35c05e6af 100644
7465+
index 61a6f95d8..34aeaad3d 100644
74667466
--- a/newlib/libc/include/sys/config.h
74677467
+++ b/newlib/libc/include/sys/config.h
74687468
@@ -4,6 +4,9 @@
@@ -7542,10 +7542,10 @@ index a3fb5c02c..5debd1525 100644
75427542
+
75437543
+#endif // _dirent_h_
75447544
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
7545-
index 218807178..c9efd7d03 100644
7545+
index 45476ce4a..d76706321 100644
75467546
--- a/newlib/libc/include/sys/features.h
75477547
+++ b/newlib/libc/include/sys/features.h
7548-
@@ -330,6 +330,9 @@ extern "C" {
7548+
@@ -331,6 +331,9 @@ extern "C" {
75497549
# define __SSP_FORTIFY_LEVEL 0
75507550
#endif
75517551

@@ -7691,7 +7691,7 @@ index 9a6f115a6..142e71d35 100644
76917691
#define MAXPATHLEN PATH_MAX
76927692

76937693
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
7694-
index 74b70e9c0..d8c5410ec 100644
7694+
index e4e36170e..5b8d06ed6 100644
76957695
--- a/newlib/libc/include/sys/reent.h
76967696
+++ b/newlib/libc/include/sys/reent.h
76977697
@@ -421,6 +421,8 @@ struct _reent
@@ -7712,7 +7712,7 @@ index 74b70e9c0..d8c5410ec 100644
77127712

77137713
#ifdef _REENT_GLOBAL_STDIO_STREAMS
77147714
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
7715-
index 8769112b0..5526e59ee 100644
7715+
index 6525272dd..d24673618 100644
77167716
--- a/newlib/libc/include/sys/stat.h
77177717
+++ b/newlib/libc/include/sys/stat.h
77187718
@@ -142,8 +142,9 @@ int mkfifo (const char *__path, mode_t __mode );
@@ -7916,10 +7916,10 @@ index 968642745..2ab1f9570 100644
79167916
return __get_current_locale ()->ctype_ptr;
79177917
}
79187918
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
7919-
index 9bd35e733..731130092 100644
7919+
index 2d559464a..1e6625c05 100644
79207920
--- a/newlib/libc/machine/arm/Makefile.am
79217921
+++ b/newlib/libc/machine/arm/Makefile.am
7922-
@@ -11,7 +11,9 @@ noinst_LIBRARIES = lib.a
7922+
@@ -9,7 +9,9 @@ noinst_LIBRARIES = lib.a
79237923
lib_a_SOURCES = setjmp.S strcmp.S strcpy.c \
79247924
aeabi_memcpy.c aeabi_memcpy-armv7a.S \
79257925
aeabi_memmove.c aeabi_memmove-soft.S \
@@ -7931,10 +7931,10 @@ index 9bd35e733..731130092 100644
79317931
lib_a_SOURCES += memchr.S
79327932
lib_a_SOURCES += memcpy-stub.c
79337933
diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
7934-
index d9dbcd5c3..43712f813 100644
7934+
index 17a46a44d..b319b8349 100644
79357935
--- a/newlib/libc/machine/arm/Makefile.in
79367936
+++ b/newlib/libc/machine/arm/Makefile.in
7937-
@@ -75,10 +75,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
7937+
@@ -81,10 +81,10 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcmp.$(OBJEXT) \
79387938
lib_a-aeabi_memmove.$(OBJEXT) \
79397939
lib_a-aeabi_memmove-soft.$(OBJEXT) \
79407940
lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
@@ -7949,7 +7949,7 @@ index d9dbcd5c3..43712f813 100644
79497949
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
79507950
DEFAULT_INCLUDES = -I.@am__isrc@
79517951
depcomp =
7952-
@@ -208,8 +208,8 @@ noinst_LIBRARIES = lib.a
7952+
@@ -230,8 +230,8 @@ noinst_LIBRARIES = lib.a
79537953
lib_a_SOURCES = setjmp.S strcmp.S strcpy.c aeabi_memcpy.c \
79547954
aeabi_memcpy-armv7a.S aeabi_memmove.c aeabi_memmove-soft.S \
79557955
aeabi_memset.c aeabi_memset-soft.S aeabi_memclr.c \
@@ -7960,9 +7960,9 @@ index d9dbcd5c3..43712f813 100644
79607960
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
79617961
lib_a_CFLAGS = $(AM_CFLAGS)
79627962
ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
7963-
@@ -367,6 +367,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
7963+
@@ -389,6 +389,12 @@ lib_a-aeabi_memclr.o: aeabi_memclr.c
79647964
lib_a-aeabi_memclr.obj: aeabi_memclr.c
7965-
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
7965+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-aeabi_memclr.obj `if test -f 'aeabi_memclr.c'; then $(CYGPATH_W) 'aeabi_memclr.c'; else $(CYGPATH_W) '$(srcdir)/aeabi_memclr.c'; fi`
79667966

79677967
+lib_a-sync_synchronize.o: sync_synchronize.c
79687968
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.o `test -f 'sync_synchronize.c' || echo '$(srcdir)/'`sync_synchronize.c
@@ -7971,7 +7971,7 @@ index d9dbcd5c3..43712f813 100644
79717971
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-sync_synchronize.obj `if test -f 'sync_synchronize.c'; then $(CYGPATH_W) 'sync_synchronize.c'; else $(CYGPATH_W) '$(srcdir)/sync_synchronize.c'; fi`
79727972
+
79737973
lib_a-memchr-stub.o: memchr-stub.c
7974-
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
7974+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memchr-stub.o `test -f 'memchr-stub.c' || echo '$(srcdir)/'`memchr-stub.c
79757975

79767976
diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
79777977
new file mode 100644
@@ -8142,7 +8142,7 @@ index d8dfdbd82..a85b5a99b 100644
81428142
return 0;
81438143
}
81448144
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
8145-
index 1aaf05aa4..b67182a79 100644
8145+
index c1483c0ac..319b1972b 100644
81468146
--- a/newlib/libc/stdio/vfprintf.c
81478147
+++ b/newlib/libc/stdio/vfprintf.c
81488148
@@ -108,6 +108,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
@@ -8154,7 +8154,7 @@ index 1aaf05aa4..b67182a79 100644
81548154
#if defined(LIBC_SCCS) && !defined(lint)
81558155
/*static char *sccsid = "from: @(#)vfprintf.c 5.50 (Berkeley) 12/16/92";*/
81568156
static char *rcsid = "$Id$";
8157-
@@ -1434,7 +1436,7 @@ reswitch: switch (ch) {
8157+
@@ -1431,7 +1433,7 @@ reswitch: switch (ch) {
81588158
string:
81598159
#endif
81608160
sign = '\0';
@@ -8163,7 +8163,7 @@ index 1aaf05aa4..b67182a79 100644
81638163
/* Behavior is undefined if the user passed a
81648164
NULL string when precision is not 0.
81658165
However, if we are not optimizing for size,
8166-
@@ -1444,7 +1446,7 @@ string:
8166+
@@ -1441,7 +1443,7 @@ string:
81678167
size = ((unsigned) prec > 6U) ? 6 : prec;
81688168
}
81698169
else
@@ -8173,7 +8173,7 @@ index 1aaf05aa4..b67182a79 100644
81738173
if (ch == 'S' || (flags & LONGINT)) {
81748174
mbstate_t ps;
81758175
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
8176-
index 994cee7fc..5d1d0a1cd 100644
8176+
index 037692531..b5e524c53 100644
81778177
--- a/newlib/libc/stdio/vfscanf.c
81788178
+++ b/newlib/libc/stdio/vfscanf.c
81798179
@@ -74,6 +74,8 @@ These are GNU extensions.
@@ -8186,7 +8186,7 @@ index 994cee7fc..5d1d0a1cd 100644
81868186
#include <reent.h>
81878187
#include <newlib.h>
81888188
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
8189-
index 980b31e3b..722be905e 100644
8189+
index 7384b37d3..b4e1dbde5 100644
81908190
--- a/newlib/libc/stdio/vfwprintf.c
81918191
+++ b/newlib/libc/stdio/vfwprintf.c
81928192
@@ -92,6 +92,9 @@ SEEALSO
@@ -8200,7 +8200,7 @@ index 980b31e3b..722be905e 100644
82008200

82018201
#ifdef INTEGER_ONLY
82028202
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
8203-
index f00d41a09..7e290ee8d 100644
8203+
index e9e00dfec..c38d81e17 100644
82048204
--- a/newlib/libc/stdio/vfwscanf.c
82058205
+++ b/newlib/libc/stdio/vfwscanf.c
82068206
@@ -74,6 +74,9 @@ PORTABILITY
@@ -8213,19 +8213,6 @@ index f00d41a09..7e290ee8d 100644
82138213
#include <_ansi.h>
82148214
#include <reent.h>
82158215
#include <newlib.h>
8216-
diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
8217-
index feb22c24b..3dae0c9a9 100644
8218-
--- a/newlib/libc/stdlib/aligned_alloc.c
8219-
+++ b/newlib/libc/stdlib/aligned_alloc.c
8220-
@@ -28,6 +28,8 @@
8221-
8222-
#include <reent.h>
8223-
#include <stdlib.h>
8224-
+#include <malloc.h>
8225-
+#include <errno.h>
8226-
8227-
void *
8228-
aligned_alloc (size_t align, size_t size)
82298216
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
82308217
index 920a7ea3c..ba5ee7652 100644
82318218
--- a/newlib/libc/stdlib/mbtowc_r.c

‎select_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ case "$VERSION" in
3232
"1" )
3333
GCC_VER=11.2.0
3434
BINUTILS_VER=2.37
35-
NEWLIB_VER=4.1.0
35+
NEWLIB_VER=4.2.0.20211231
3636
basedir='dkarm-eabi'
3737
package=devkitARM
3838
target=arm-none-eabi

0 commit comments

Comments
 (0)