Skip to content

Commit 73b1cb9

Browse files
WinterMuteWinterMute
committed
devkitPPC: update newlib to 4.2.0.20211231
1 parent 3ca5189 commit 73b1cb9

2 files changed

Lines changed: 30 additions & 43 deletions

File tree

dkppc/patches/newlib-4.1.0.patch renamed to dkppc/patches/newlib-4.2.0.20211231.patch

Lines changed: 29 additions & 42 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..dfd632c20 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..42ea1d2ed 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])
@@ -7381,10 +7381,10 @@ index 000000000..bd25d775d
73817381
+ exit ( main(__system_argv->argc,__system_argv->argv) );
73827382
+}
73837383
diff --git a/newlib/configure.host b/newlib/configure.host
7384-
index 1ddbb6c76..ef4cbe6c3 100644
7384+
index c429dde1c..350dbc8f0 100644
73857385
--- a/newlib/configure.host
73867386
+++ b/newlib/configure.host
7387-
@@ -864,7 +864,13 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
7387+
@@ -863,7 +863,13 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
73887388
default_newlib_io_long_long="yes"
73897389
newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
73907390
;;
@@ -7426,7 +7426,7 @@ index 5c293c83d..75ccf89f5 100644
74267426
#define _jp2uc(c) (c)
74277427
#define _jp2uc_l(c, l) (c)
74287428
diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
7429-
index 2b01fbe8f..7af875b81 100644
7429+
index 23d572cd3..65310c084 100644
74307430
--- a/newlib/libc/include/reent.h
74317431
+++ b/newlib/libc/include/reent.h
74327432
@@ -150,6 +150,7 @@ extern int _mkdir_r (struct _reent *, const char *, int);
@@ -7501,10 +7501,10 @@ index a3fb5c02c..adb8e1083 100644
75017501
+
75027502
+#endif // _dirent_h_
75037503
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
7504-
index 218807178..c9efd7d03 100644
7504+
index 45476ce4a..d76706321 100644
75057505
--- a/newlib/libc/include/sys/features.h
75067506
+++ b/newlib/libc/include/sys/features.h
7507-
@@ -330,6 +330,9 @@ extern "C" {
7507+
@@ -331,6 +331,9 @@ extern "C" {
75087508
# define __SSP_FORTIFY_LEVEL 0
75097509
#endif
75107510

@@ -7638,7 +7638,7 @@ index 000000000..9bec9e473
76387638
+#endif // __iosupp_h__
76397639
+//---------------------------------------------------------------------------------
76407640
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
7641-
index 74b70e9c0..d8c5410ec 100644
7641+
index e4e36170e..5b8d06ed6 100644
76427642
--- a/newlib/libc/include/sys/reent.h
76437643
+++ b/newlib/libc/include/sys/reent.h
76447644
@@ -421,6 +421,8 @@ struct _reent
@@ -7659,7 +7659,7 @@ index 74b70e9c0..d8c5410ec 100644
76597659

76607660
#ifdef _REENT_GLOBAL_STDIO_STREAMS
76617661
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
7662-
index 8769112b0..5526e59ee 100644
7662+
index 6525272dd..d24673618 100644
76637663
--- a/newlib/libc/include/sys/stat.h
76647664
+++ b/newlib/libc/include/sys/stat.h
76657665
@@ -142,8 +142,9 @@ int mkfifo (const char *__path, mode_t __mode );
@@ -7892,10 +7892,10 @@ index a0c80843a..efabdcfc4 100644
78927892

78937893
/* Only access fixed "C" locale using this function. Fake for !_MB_CAPABLE
78947894
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
7895-
index e86afdf1c..007bd1567 100644
7895+
index 577b7f9b3..ce3bb7b53 100644
78967896
--- a/newlib/libc/machine/powerpc/Makefile.am
78977897
+++ b/newlib/libc/machine/powerpc/Makefile.am
7898-
@@ -10,7 +10,7 @@ noinst_LIBRARIES = lib.a
7898+
@@ -8,7 +8,7 @@ noinst_LIBRARIES = lib.a
78997899

79007900
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
79017901

@@ -7905,19 +7905,19 @@ index e86afdf1c..007bd1567 100644
79057905
lib_a_CFLAGS=$(AM_CFLAGS)
79067906
lib_a_LIBADD = @extra_objs@
79077907
diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in
7908-
index 73b0cc471..12044cb8a 100644
7908+
index 46acda680..892a82288 100644
79097909
--- a/newlib/libc/machine/powerpc/Makefile.in
79107910
+++ b/newlib/libc/machine/powerpc/Makefile.in
7911-
@@ -68,7 +68,7 @@ CONFIG_CLEAN_VPATH_FILES =
7912-
LIBRARIES = $(noinst_LIBRARIES)
7913-
ARFLAGS = cru
7911+
@@ -74,7 +74,7 @@ AM_V_at = $(am__v_at_@AM_V@)
7912+
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
7913+
am__v_at_0 = @
79147914
lib_a_AR = $(AR) $(ARFLAGS)
79157915
-am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
79167916
+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT)
79177917
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
79187918
DEFAULT_INCLUDES = -I.@am__isrc@
79197919
depcomp =
7920-
@@ -196,7 +196,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
7920+
@@ -218,7 +218,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
79217921
AM_CCASFLAGS = $(INCLUDES)
79227922
noinst_LIBRARIES = lib.a
79237923
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
@@ -7926,9 +7926,9 @@ index 73b0cc471..12044cb8a 100644
79267926
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
79277927
lib_a_CFLAGS = $(AM_CFLAGS)
79287928
lib_a_LIBADD = @extra_objs@
7929-
@@ -280,6 +280,12 @@ lib_a-setjmp.obj: setjmp.S
7929+
@@ -302,6 +302,12 @@ lib_a-setjmp.obj: setjmp.S
79307930
.c.obj:
7931-
$(COMPILE) -c `$(CYGPATH_W) '$<'`
7931+
$(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
79327932

79337933
+lib_a-access.o: access.c
79347934
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.o `test -f 'access.c' || echo '$(srcdir)/'`access.c
@@ -7937,7 +7937,7 @@ index 73b0cc471..12044cb8a 100644
79377937
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-access.obj `if test -f 'access.c'; then $(CYGPATH_W) 'access.c'; else $(CYGPATH_W) '$(srcdir)/access.c'; fi`
79387938
+
79397939
lib_a-vfprintf.o: vfprintf.c
7940-
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfprintf.o `test -f 'vfprintf.c' || echo '$(srcdir)/'`vfprintf.c
7940+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfprintf.o `test -f 'vfprintf.c' || echo '$(srcdir)/'`vfprintf.c
79417941

79427942
diff --git a/newlib/libc/machine/powerpc/access.c b/newlib/libc/machine/powerpc/access.c
79437943
new file mode 100644
@@ -8105,20 +8105,20 @@ index 95f1a7422..c797d2e64 100644
81058105
+
81068106
#endif
81078107
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
8108-
index aa22a0e3a..93e672b6a 100644
8108+
index 6d18a4443..01402f4de 100644
81098109
--- a/newlib/libc/stdio/Makefile.in
81108110
+++ b/newlib/libc/stdio/Makefile.in
8111-
@@ -507,6 +507,7 @@ GENERAL_SOURCES = \
8111+
@@ -527,6 +527,7 @@ GENERAL_SOURCES = \
81128112
rename.c \
81138113
rewind.c \
81148114
rget.c \
81158115
+ rmdir.c \
81168116
scanf.c \
81178117
sccl.c \
81188118
setbuf.c \
8119-
@@ -1176,6 +1177,12 @@ lib_a-rget.o: rget.c
8119+
@@ -1196,6 +1197,12 @@ lib_a-rget.o: rget.c
81208120
lib_a-rget.obj: rget.c
8121-
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rget.obj `if test -f 'rget.c'; then $(CYGPATH_W) 'rget.c'; else $(CYGPATH_W) '$(srcdir)/rget.c'; fi`
8121+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rget.obj `if test -f 'rget.c'; then $(CYGPATH_W) 'rget.c'; else $(CYGPATH_W) '$(srcdir)/rget.c'; fi`
81228122

81238123
+lib_a-rmdir.o: rmdir.c
81248124
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rmdir.o `test -f 'rmdir.c' || echo '$(srcdir)/'`rmdir.c
@@ -8127,7 +8127,7 @@ index aa22a0e3a..93e672b6a 100644
81278127
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rmdir.obj `if test -f 'rmdir.c'; then $(CYGPATH_W) 'rmdir.c'; else $(CYGPATH_W) '$(srcdir)/rmdir.c'; fi`
81288128
+
81298129
lib_a-scanf.o: scanf.c
8130-
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-scanf.o `test -f 'scanf.c' || echo '$(srcdir)/'`scanf.c
8130+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-scanf.o `test -f 'scanf.c' || echo '$(srcdir)/'`scanf.c
81318131

81328132
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
81338133
index 1ac551fed..d293b7b0e 100644
@@ -8219,19 +8219,6 @@ index d8dfdbd82..a85b5a99b 100644
82198219

82208220
return 0;
82218221
}
8222-
diff --git a/newlib/libc/stdlib/aligned_alloc.c b/newlib/libc/stdlib/aligned_alloc.c
8223-
index feb22c24b..3dae0c9a9 100644
8224-
--- a/newlib/libc/stdlib/aligned_alloc.c
8225-
+++ b/newlib/libc/stdlib/aligned_alloc.c
8226-
@@ -28,6 +28,8 @@
8227-
8228-
#include <reent.h>
8229-
#include <stdlib.h>
8230-
+#include <malloc.h>
8231-
+#include <errno.h>
8232-
8233-
void *
8234-
aligned_alloc (size_t align, size_t size)
82358222
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
82368223
index 920a7ea3c..ba5ee7652 100644
82378224
--- a/newlib/libc/stdlib/mbtowc_r.c

‎select_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ case "$VERSION" in
4242
GCC_VER=11.2.0
4343
BINUTILS_VER=2.37
4444
MN_BINUTILS_VER=2.24
45-
NEWLIB_VER=4.1.0
45+
NEWLIB_VER=4.2.0.20211231
4646
basedir='dkppc'
4747
package=devkitPPC
4848
target=powerpc-eabi

0 commit comments

Comments
 (0)