Skip to content

Commit c6675ab

Browse files
committed
devkitARM: update newlib to 3.1.0
1 parent af02813 commit c6675ab

2 files changed

Lines changed: 29 additions & 31 deletions

File tree

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/libgloss/configure b/libgloss/configure
2-
index aa6f8f834..0e8579890 100755
2+
index 1a4033dce..ba7aea7b0 100755
33
--- a/libgloss/configure
44
+++ b/libgloss/configure
5-
@@ -2594,6 +2594,8 @@ if test "${config_libnosys}" = "true"; then
5+
@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
66

77
fi
88

@@ -12,7 +12,7 @@ index aa6f8f834..0e8579890 100755
1212

1313
ac_config_commands="$ac_config_commands depfiles"
1414
diff --git a/libgloss/configure.in b/libgloss/configure.in
15-
index 6da164352..f18f17447 100644
15+
index 41843eed1..dc0e2a5fd 100644
1616
--- a/libgloss/configure.in
1717
+++ b/libgloss/configure.in
1818
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
@@ -23,7 +23,7 @@ index 6da164352..f18f17447 100644
2323

2424
if test "${enable_shared}" = "yes" ; then
2525
echo "Shared libraries not supported for cross compiling, ignored"
26-
@@ -187,6 +188,7 @@ dnl fi
26+
@@ -190,6 +191,7 @@ dnl fi
2727
if test "${config_libnosys}" = "true"; then
2828
AC_CONFIG_SUBDIRS([libnosys])
2929
fi
@@ -7404,10 +7404,10 @@ index 000000000..61de918bc
74047404
+ return ret;
74057405
+}
74067406
diff --git a/newlib/configure.host b/newlib/configure.host
7407-
index eb645868b..9cb69fde9 100644
7407+
index 6c49cb750..6a5e1c78d 100644
74087408
--- a/newlib/configure.host
74097409
+++ b/newlib/configure.host
7410-
@@ -631,6 +631,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
7410+
@@ -666,6 +666,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
74117411
syscall_dir=syscalls
74127412
default_newlib_io_long_long="yes"
74137413
;;
@@ -7423,7 +7423,7 @@ index eb645868b..9cb69fde9 100644
74237423
syscall_dir=syscalls
74247424
;;
74257425
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
7426-
index cbc0fa989..10960f912 100644
7426+
index 164d95bca..083e48758 100644
74277427
--- a/newlib/libc/include/stdio.h
74287428
+++ b/newlib/libc/include/stdio.h
74297429
@@ -233,7 +233,7 @@ int fsetpos (FILE *, const _fpos_t *);
@@ -7436,7 +7436,7 @@ index cbc0fa989..10960f912 100644
74367436
void clearerr (FILE *);
74377437
int feof (FILE *);
74387438
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
7439-
index 2082dfdb1..e535f189b 100644
7439+
index 49b62ebf6..d84ffaa59 100644
74407440
--- a/newlib/libc/include/sys/config.h
74417441
+++ b/newlib/libc/include/sys/config.h
74427442
@@ -4,6 +4,9 @@
@@ -7516,7 +7516,7 @@ index a3fb5c02c..5debd1525 100644
75167516
+
75177517
+#endif // _dirent_h_
75187518
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
7519-
index 2900b332f..6efb54eb3 100644
7519+
index f28dd071b..96980676d 100644
75207520
--- a/newlib/libc/include/sys/features.h
75217521
+++ b/newlib/libc/include/sys/features.h
75227522
@@ -330,6 +330,9 @@ extern "C" {
@@ -7531,7 +7531,7 @@ index 2900b332f..6efb54eb3 100644
75317531
#ifdef __rtems__
75327532
diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
75337533
new file mode 100644
7534-
index 000000000..dfed4107e
7534+
index 000000000..c190fa37d
75357535
--- /dev/null
75367536
+++ b/newlib/libc/include/sys/iosupport.h
75377537
@@ -0,0 +1,112 @@
@@ -7547,7 +7547,7 @@ index 000000000..dfed4107e
75477547
+#include <reent.h>
75487548
+#include <sys/stat.h>
75497549
+#include <sys/statvfs.h>
7550-
+#include <time.h>
7550+
+#include <sys/time.h>
75517551
+
75527552
+enum {
75537553
+ STD_IN,
@@ -7648,7 +7648,7 @@ index 000000000..dfed4107e
76487648
+#endif // __iosupp_h__
76497649
+//---------------------------------------------------------------------------------
76507650
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
7651-
index 1ef226194..ce3721a14 100644
7651+
index 6e55e1c1f..6e0c1c9cf 100644
76527652
--- a/newlib/libc/include/sys/reent.h
76537653
+++ b/newlib/libc/include/sys/reent.h
76547654
@@ -416,6 +416,8 @@ struct _reent
@@ -7659,8 +7659,8 @@ index 1ef226194..ce3721a14 100644
76597659
+ void *deviceData;
76607660
};
76617661

7662-
extern const struct __sFILE_fake __sf_fake_stdin;
7663-
@@ -647,6 +649,7 @@ struct _reent
7662+
#ifdef _REENT_GLOBAL_STDIO_STREAMS
7663+
@@ -686,6 +688,7 @@ struct _reent
76647664
# ifndef _REENT_GLOBAL_STDIO_STREAMS
76657665
__FILE __sf[3]; /* first three file descriptors */
76667666
# endif
@@ -7752,10 +7752,10 @@ index 5e937f103..635a7a6b8 100644
77527752
};
77537753
#endif
77547754
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
7755-
index baa5451a6..a11f89473 100644
7755+
index 4c343e462..c04493460 100644
77567756
--- a/newlib/libc/locale/locale.c
77577757
+++ b/newlib/libc/locale/locale.c
7758-
@@ -91,7 +91,7 @@ beginning with <<"LC_">>.
7758+
@@ -92,7 +92,7 @@ beginning with <<"LC_">>.
77597759

77607760
<<localeconv>> returns a pointer to a structure (also defined in
77617761
`<<locale.h>>') describing the locale-specific conventions currently
@@ -7764,7 +7764,7 @@ index baa5451a6..a11f89473 100644
77647764

77657765
<<_localeconv_r>> and <<_setlocale_r>> are reentrant versions of
77667766
<<localeconv>> and <<setlocale>> respectively. The extra argument
7767-
@@ -165,15 +165,18 @@ No supporting OS subroutines are required.
7767+
@@ -166,15 +166,18 @@ No supporting OS subroutines are required.
77687768
#include "../ctype/ctype_.h"
77697769
#include "../stdlib/local.h"
77707770

@@ -7783,7 +7783,7 @@ index baa5451a6..a11f89473 100644
77837783
#ifdef _MB_CAPABLE
77847784
/*
77857785
* Category names for getenv()
7786-
@@ -193,7 +196,11 @@ static char *categories[_LC_LAST] = {
7786+
@@ -194,7 +197,11 @@ static char *categories[_LC_LAST] = {
77877787
* Default locale per POSIX. Can be overridden on a per-target base.
77887788
*/
77897789
#ifndef DEFAULT_LOCALE
@@ -7796,7 +7796,7 @@ index baa5451a6..a11f89473 100644
77967796
#endif
77977797

77987798
#ifdef _MB_CAPABLE
7799-
@@ -206,8 +213,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
7799+
@@ -207,8 +214,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
78007800
const struct __locale_t __C_locale =
78017801
{
78027802
{ "C", "C", "C", "C", "C", "C", "C", },
@@ -7810,7 +7810,7 @@ index baa5451a6..a11f89473 100644
78107810
0,
78117811
DEFAULT_CTYPE_PTR,
78127812
{
7813-
@@ -218,9 +230,15 @@ const struct __locale_t __C_locale =
7813+
@@ -219,9 +231,15 @@ const struct __locale_t __C_locale =
78147814
CHAR_MAX, CHAR_MAX
78157815
},
78167816
#ifndef __HAVE_LOCALE_INFO__
@@ -7826,7 +7826,7 @@ index baa5451a6..a11f89473 100644
78267826
#else /* __HAVE_LOCALE_INFO__ */
78277827
{
78287828
{ NULL, NULL }, /* LC_ALL */
7829-
@@ -239,10 +257,11 @@ const struct __locale_t __C_locale =
7829+
@@ -240,10 +258,11 @@ const struct __locale_t __C_locale =
78307830
};
78317831
#endif /* _MB_CAPABLE */
78327832

@@ -7839,7 +7839,7 @@ index baa5451a6..a11f89473 100644
78397839
__utf8_wctomb,
78407840
__utf8_mbtowc,
78417841
#else
7842-
@@ -259,9 +278,15 @@ struct __locale_t __global_locale =
7842+
@@ -260,9 +279,15 @@ struct __locale_t __global_locale =
78437843
CHAR_MAX, CHAR_MAX
78447844
},
78457845
#ifndef __HAVE_LOCALE_INFO__
@@ -7855,7 +7855,7 @@ index baa5451a6..a11f89473 100644
78557855
#else /* __HAVE_LOCALE_INFO__ */
78567856
{
78577857
{ NULL, NULL }, /* LC_ALL */
7858-
@@ -295,7 +320,7 @@ _setlocale_r (struct _reent *p,
7858+
@@ -296,7 +321,7 @@ _setlocale_r (struct _reent *p,
78597859
{
78607860
#ifndef _MB_CAPABLE
78617861
if (locale)
@@ -7864,7 +7864,7 @@ index baa5451a6..a11f89473 100644
78647864
if (strcmp (locale, "POSIX") && strcmp (locale, "C")
78657865
&& strcmp (locale, ""))
78667866
return NULL;
7867-
@@ -982,6 +1007,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
7867+
@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
78687868

78697869
const char *
78707870
__locale_ctype_ptr (void)
@@ -7932,17 +7932,15 @@ index d9dbcd5c3..43712f813 100644
79327932

79337933
diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
79347934
new file mode 100644
7935-
index 000000000..3acc9e094
7935+
index 000000000..f5a85c3a8
79367936
--- /dev/null
79377937
+++ b/newlib/libc/machine/arm/sync_synchronize.c
7938-
@@ -0,0 +1,10 @@
7938+
@@ -0,0 +1,8 @@
79397939
+#if __ARM_ARCH < 6
79407940
+#include <sys/cdefs.h>
79417941
+void __attribute__((weak))
79427942
+__sync_synchronize (void)
79437943
+{
7944-
+ __warn_references (__sync_synchronize,
7945-
+ "legacy compatible __sync_synchronize used. Not suitable for multi-threaded applications");
79467944
+ return;
79477945
+}
79487946
+#endif
@@ -8093,7 +8091,7 @@ index c4bf2dbe3..d756df37d 100644
80938091
if (ch == 'S' || (flags & LONGINT)) {
80948092
mbstate_t ps;
80958093
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
8096-
index b97235559..298f68a9c 100644
8094+
index 9c38eebf4..fbc8d877d 100644
80978095
--- a/newlib/libc/stdio/vfscanf.c
80988096
+++ b/newlib/libc/stdio/vfscanf.c
80998097
@@ -74,6 +74,8 @@ These are GNU extensions.
@@ -8120,7 +8118,7 @@ index 980b31e3b..722be905e 100644
81208118

81218119
#ifdef INTEGER_ONLY
81228120
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
8123-
index c3470a15c..626f13723 100644
8121+
index 0464b0837..435fc0142 100644
81248122
--- a/newlib/libc/stdio/vfwscanf.c
81258123
+++ b/newlib/libc/stdio/vfwscanf.c
81268124
@@ -74,6 +74,9 @@ PORTABILITY

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=8.2.0
3434
BINUTILS_VER=2.32
35-
NEWLIB_VER=3.0.0
35+
NEWLIB_VER=3.1.0
3636
GDB_VER=8.2.1
3737
basedir='dkarm-eabi'
3838
package=devkitARM

0 commit comments

Comments
 (0)