len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Toolchains: Update to GCC 8.5.0

Browse source 
All toolchain dependencies are circa the GCC 8.5.0 release:

  GCC 8.5.0, binutils 2.37, gmp 6.2.1, mpfr 4.1.0, mpc 1.2.1, isl 0.18

Native:

 * arm  (smoke tested on ipodvideo+mini2g)
 * mips (seems to be stable on xDuoo X3)
 * m68k (binaries untested)

Hosted:

 * arm (binaries untested)
 * mips (smoke tested on xDuoo X3ii)

Unchanged:

 * Android NDK (unchanged at GCC 4.9.4)

Change-Id: I1c2fca5d87d4a11e50aa495fad75f4f9c938c766
This commit is contained in:
Solomon Peachy 2022-10-09 19:17:41 -04:00
parent 36fdd3dfed
commit 67dc833e46
5 changed files with 172 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/configure vendored
View file

@ -137,7 +137,7 @@ app_set_lcd_size () {
findarmgcc() { findarmgcc() {
prefixtools arm-elf-eabi- prefixtools arm-elf-eabi-
gccchoice="4.9.4" gccchoice="8.5.0"
} }
# scan the $PATH for the given command # scan the $PATH for the given command
@ -531,7 +531,7 @@ coldfirecc () {
GCCOPTS="$CCOPTS -mcpu=5249 -malign-int -mstrict-align" GCCOPTS="$CCOPTS -mcpu=5249 -malign-int -mstrict-align"
GCCOPTIMIZE="-fomit-frame-pointer" GCCOPTIMIZE="-fomit-frame-pointer"
endian="big" endian="big"
gccchoice="4.9.4" gccchoice="8.5.0"
} }
arm7tdmicc () { arm7tdmicc () {
@ -604,7 +604,7 @@ mipselcc () {
GCCOPTS="$GCCOPTS -ffunction-sections -msoft-float -G 0 -Wno-parentheses" GCCOPTS="$GCCOPTS -ffunction-sections -msoft-float -G 0 -Wno-parentheses"
GCCOPTIMIZE="-fomit-frame-pointer" GCCOPTIMIZE="-fomit-frame-pointer"
endian="little" endian="little"
gccchoice="4.9.4" gccchoice="8.5.0"
} }
mipsr2elcc () { mipsr2elcc () {
@ -614,7 +614,7 @@ mipsr2elcc () {
GCCOPTS="$GCCOPTS -ffunction-sections -msoft-float -G 0 -Wno-parentheses" GCCOPTS="$GCCOPTS -ffunction-sections -msoft-float -G 0 -Wno-parentheses"
GCCOPTIMIZE="-fomit-frame-pointer" GCCOPTIMIZE="-fomit-frame-pointer"
endian="little" endian="little"
gccchoice="4.9.4" gccchoice="8.5.0"
} }
maemocc () { maemocc () {
@ -761,7 +761,7 @@ arm1176jzlinuxcc () {
GCCOPTS="$GCCOPTS -D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_REENTRANT" GCCOPTS="$GCCOPTS -D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_REENTRANT"
# Set up compiler # Set up compiler
gccchoice="4.9.4" gccchoice="8.5.0"
prefixtools "arm-rockbox-linux-gnueabi-" prefixtools "arm-rockbox-linux-gnueabi-"
} }
@ -935,7 +935,7 @@ mipsellinuxcc () {
GCCOPTS="$GCCOPTS -D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_REENTRANT" GCCOPTS="$GCCOPTS -D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_REENTRANT"
# Set up compiler # Set up compiler
gccchoice="4.9.4" gccchoice="8.5.0"
prefixtools "mipsel-rockbox-linux-gnu-" prefixtools "mipsel-rockbox-linux-gnu-"
} }

103
tools/rockboxdev.sh
View file

@ -458,30 +458,30 @@ build() {
cd "$toolname-$version" cd "$toolname-$version"
if (echo $needs_libs | grep -q gmp && test ! -d gmp); then if (echo $needs_libs | grep -q gmp && test ! -d gmp); then
echo "ROCKBOXDEV: Getting GMP" echo "ROCKBOXDEV: Getting GMP"
getfile "gmp-4.3.2.tar.bz2" "$GNU_MIRROR/gmp" getfile "gmp-6.2.1.tar.bz2" "$GNU_MIRROR/gmp"
tar xjf $dlwhere/gmp-4.3.2.tar.bz2 tar xjf $dlwhere/gmp-6.2.1.tar.bz2
ln -s gmp-4.3.2 gmp ln -s gmp-6.2.1 gmp
fi fi
if (echo $needs_libs | grep -q mpfr && test ! -d mpfr); then if (echo $needs_libs | grep -q mpfr && test ! -d mpfr); then
echo "ROCKBOXDEV: Getting MPFR" echo "ROCKBOXDEV: Getting MPFR"
getfile "mpfr-3.1.0.tar.bz2" "$GNU_MIRROR/mpfr" getfile "mpfr-4.1.0.tar.bz2" "$GNU_MIRROR/mpfr"
tar xjf $dlwhere/mpfr-3.1.0.tar.bz2 tar xjf $dlwhere/mpfr-4.1.0.tar.bz2
ln -s mpfr-3.1.0 mpfr ln -s mpfr-4.1.0 mpfr
fi fi
if (echo $needs_libs | grep -q mpc && test ! -d mpc); then if (echo $needs_libs | grep -q mpc && test ! -d mpc); then
echo "ROCKBOXDEV: Getting MPC" echo "ROCKBOXDEV: Getting MPC"
getfile "mpc-1.0.1.tar.gz" "http://www.multiprecision.org/downloads" getfile "mpc-1.2.1.tar.gz" "http://www.multiprecision.org/downloads"
tar xzf $dlwhere/mpc-1.0.1.tar.gz tar xzf $dlwhere/mpc-1.2.1.tar.gz
ln -s mpc-1.0.1 mpc ln -s mpc-1.2.1 mpc
fi fi
if (echo $needs_libs | grep -q isl && test ! -d isl); then if (echo $needs_libs | grep -q isl && test ! -d isl); then
echo "ROCKBOXDEV: Getting ISL" echo "ROCKBOXDEV: Getting ISL"
getfile "isl-0.15.tar.bz2" "https://gcc.gnu.org/pub/gcc/infrastructure" getfile "isl-0.18.tar.bz2" "https://gcc.gnu.org/pub/gcc/infrastructure"
tar xjf $dlwhere/isl-0.15.tar.bz2 tar xjf $dlwhere/isl-0.18.tar.bz2
ln -s isl-0.15 isl ln -s isl-0.18 isl
fi fi
cd $builddir cd $builddir
fi fi
@ -541,9 +541,9 @@ build_linux_toolchain () {
# check libraries: # check libraries:
# contrary to other toolchains that rely on a hack to avoid installing # contrary to other toolchains that rely on a hack to avoid installing
# gmp, mpc and mpfr, we simply require that they are installed on the system # gmp, mpc, and mpfr, we simply require that they are installed on
# this is not a huge requirement since virtually all systems these days # the system this is not a huge requirement since virtually all systems
# provide dev packages for them # these days provide dev packages for them
# FIXME: maybe add an option to download and install them automatically # FIXME: maybe add an option to download and install them automatically
checklib "mpc" "gmp" "mpfr" checklib "mpc" "gmp" "mpfr"
@ -764,26 +764,26 @@ do
echo "" echo ""
case $arch in case $arch in
[Ii]) [Ii])
build "binutils" "mipsel-elf" "2.26.1" "" "--disable-werror" "isl" build "binutils" "mipsel-elf" "2.37" "" "--disable-werror" "gmp isl"
build "gcc" "mipsel-elf" "4.9.4" "" "" "gmp mpfr mpc isl" build "gcc" "mipsel-elf" "8.5.0" "" "" "gmp mpfr mpc isl"
;; ;;
[Mm]) [Mm])
build "binutils" "m68k-elf" "2.26.1" "" "--disable-werror" "isl" build "binutils" "m68k-elf" "2.37" "" "--disable-werror" "gmp isl"
build "gcc" "m68k-elf" "4.9.4" "" "--with-arch=cf MAKEINFO=missing" "gmp mpfr mpc isl" build "gcc" "m68k-elf" "8.5.0" "" "--with-arch=cf MAKEINFO=missing" "gmp mpfr mpc isl"
;; ;;
[Aa]) [Aa])
binopts="" binopts=""
gccopts="" gccopts="--with-multilib-list=rmprofile"
case $system in case $system in
Darwin) Darwin)
binopts="--disable-nls" binopts="--disable-nls"
gccopts="--disable-nls" gccopts="--disable-nls"
;; ;;
esac esac
build "binutils" "arm-elf-eabi" "2.26.1" "" "$binopts --disable-werror" "isl" build "binutils" "arm-elf-eabi" "2.37" "" "$binopts --disable-werror" "gmp isl"
build "gcc" "arm-elf-eabi" "4.9.4" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff" "$gccopts MAKEINFO=missing" "gmp mpfr mpc isl" build "gcc" "arm-elf-eabi" "8.5.0" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-8.5.0.diff" "$gccopts MAKEINFO=missing" "gmp mpfr mpc isl"
;; ;;
[Xx]) [Xx])
# IMPORTANT NOTE # IMPORTANT NOTE
@ -792,30 +792,19 @@ do
# #
# Samsung YP-R0/R1: # Samsung YP-R0/R1:
# ARM1176JZF-S, softfp EABI # ARM1176JZF-S, softfp EABI
# gcc: 4.9.4 is the latest 4.9.x stable branch, also the only one that # kernel: device runs 2.6.24, but oem toolchain is built against 2.6.27.59
# compiles with GCC >6 # glibc: device runs 2.4.2
# kernel: 2.6.27.59 is the same 2.6.x stable kernel as used by the #
# original ct-ng toolchain, the device runs kernel 2.6.24
# glibc: 2.19 is the latest version that supports kernel 2.6.24 which
# is used on the device, but we need to support ABI 2.4 because
# the device uses glibc 2.4.2
#
# Sony NWZ: # Sony NWZ:
# gcc: 4.9.4 is the latest 4.9.x stable branch, also the only one that # kernel: Varies from device to device; 2.6.23, 2.6.35, and 3.x seen.
# compiles with GCC >6 # glibc: device runs 2.7
# kernel: 2.6.32.68 is the latest 2.6.x stable kernel, the device
# runs kernel 2.6.23 or 2.6.35 or 3.x for the most recent
# glibc: 2.19 is the latest version that supports kernel 2.6.23 which
# is used on many Sony players, but we need to support ABI 2.7
# because the device uses glibc 2.7
# #
# Thus the lowest common denominator is to use the latest 2.6.x stable # Thus the lowest common denominator is to target 2.6.23 and glibc 2.4
# kernel but compile glibc to support kernel 2.6.23 and glibc 2.4. # Use a recent 2.6.32 LTS kernel, but glibc 2.20 targeting 2.6.23 and API 2.4
# We use a recent 2.26.1 binutils to avoid any build problems and #
# avoid patches/bugs.
glibcopts="--enable-kernel=2.6.23 --enable-oldest-abi=2.4" glibcopts="--enable-kernel=2.6.23 --enable-oldest-abi=2.4"
build_linux_toolchain "arm-rockbox-linux-gnueabi" "2.26.1" "" "4.9.4" \ build_linux_toolchain "arm-rockbox-linux-gnueabi" "2.37" "" "8.5.0" \
"$gccopts" "2.6.32.68" "2.19" "$glibcopts" "glibc-220-make44.patch" "$gccopts" "2.6.32.71" "2.20" "$glibcopts" "glibc-220-make44.patch"
# build alsa-lib # build alsa-lib
# we need to set the prefix to how it is on device (/usr) and then # we need to set the prefix to how it is on device (/usr) and then
# tweak install dir at make install step # tweak install dir at make install step
@ -830,28 +819,22 @@ do
# This toolchain must support several targets and thus must support # This toolchain must support several targets and thus must support
# the oldest possible configuration. # the oldest possible configuration.
# #
# AGPTek Rocker: # AGPTek Rocker (and other HibyOS players):
# XBurst release 1 (something inbetween mips32r1 and mips32r2)
# gcc: 4.9.4 is the latest 4.9.x stable branch, also the only one that
# compiles with GCC >6
# kernel: 3.10.14 # kernel: 3.10.14
# glibc: 2.16 # glibc: 2.16
# alsa: 1.0.29 # alsa: 1.0.29
# #
# FiiO M3K Linux: # FiiO M3K Linux (Based on Ingenic SDK):
# kernel: 3.10.14 # kernel: 3.10.14
# glibc: 2.16 # glibc: 2.16
# alsa: 1.0.26 # alsa: 1.0.26
# #
# To maximize compatibility, we use kernel 3.2.85 which is the lastest # Use a recent 3.10 LTS kernel, but glibc 2.27 targeting 3.2.x and API 2.16
# longterm 3.2 kernel and is supported by the latest glibc, and we #
# require support for up to glibc 2.16
# We use a recent 2.26.1 binutils to avoid any build problems and
# avoid patches/bugs.
glibcopts="--enable-kernel=3.2 --enable-oldest-abi=2.16" glibcopts="--enable-kernel=3.2 --enable-oldest-abi=2.16"
# FIXME: maybe add -mhard-float # FIXME: maybe add -mhard-float?
build_linux_toolchain "mipsel-rockbox-linux-gnu" "2.26.1" "" "4.9.4" \ build_linux_toolchain "mipsel-rockbox-linux-gnu" "2.37" "" "8.5.0" \
"$gccopts" "3.2.85" "2.25" "$glibcopts" "glibc-225-make44.patch" "$gccopts" "3.10.108" "2.27" "$glibcopts" "glibc-227-make44.patch"
# build alsa-lib # build alsa-lib
# we need to set the prefix to how it is on device (/usr) and then # we need to set the prefix to how it is on device (/usr) and then
# tweak install dir at make install step # tweak install dir at make install step
@ -859,7 +842,10 @@ do
gettool "alsa-lib" "$alsalib_ver" gettool "alsa-lib" "$alsalib_ver"
extract "alsa-lib-$alsalib_ver" extract "alsa-lib-$alsalib_ver"
prefix="/usr" buildtool "alsa-lib" "$alsalib_ver" \ prefix="/usr" buildtool "alsa-lib" "$alsalib_ver" \
"--host=$target --disable-python" "" "install DESTDIR=$prefix/$target/sysroot" "--host=$target --disable-python" "" "install DESTDIR=$prefix/$target/sysroot"
### Everything below here is needed only for bluetooth support
# build libffi # build libffi
libffi_ver="3.2.1" libffi_ver="3.2.1"
gettool "libffi" "$libffi_ver" gettool "libffi" "$libffi_ver"
@ -880,7 +866,7 @@ do
gettool "glib" "$glib_ver" gettool "glib" "$glib_ver"
extract "glib-$glib_ver" extract "glib-$glib_ver"
prefix="/usr" buildtool "glib" "$glib_ver" \ prefix="/usr" buildtool "glib" "$glib_ver" \
"--host=$target --with-sysroot=$prefix/$target/sysroot --disable-libelf glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes" "" "install DESTDIR=$prefix/$target/sysroot" "--host=$target --with-sysroot=$prefix/$target/sysroot --disable-libelf glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes CFLAGS=-Wno-error=format-nonliteral" "" "install DESTDIR=$prefix/$target/sysroot"
# build expat # build expat
expat_ver="2.1.0" expat_ver="2.1.0"
@ -896,7 +882,6 @@ do
prefix="/usr" buildtool "dbus" "$dbus_ver" \ prefix="/usr" buildtool "dbus" "$dbus_ver" \
"--host=$target --with-sysroot=$prefix/$target/sysroot --includedir=/usr/include --enable-abstract-sockets ac_cv_lib_expat_XML_ParserCreate_MM=yes --disable-systemd --disable-launchd --enable-x11-autolaunch=no --with-x=no -disable-selinux --disable-apparmor --disable-doxygen-docs " "" "install DESTDIR=$prefix/$target/sysroot " "--host=$target --with-sysroot=$prefix/$target/sysroot --includedir=/usr/include --enable-abstract-sockets ac_cv_lib_expat_XML_ParserCreate_MM=yes --disable-systemd --disable-launchd --enable-x11-autolaunch=no --with-x=no -disable-selinux --disable-apparmor --disable-doxygen-docs " "" "install DESTDIR=$prefix/$target/sysroot "
;; ;;
*) *)
echo "ROCKBOXDEV: Unsupported architecture option: $arch" echo "ROCKBOXDEV: Unsupported architecture option: $arch"

102
tools/toolchain-patches/glibc-225-make44.patch → tools/toolchain-patches/glibc-227-make44.patch
View file

@ -1,7 +1,7 @@
diff -Naur glibc-2.25/libio/stdio.h glibc-2.25-patched/libio/stdio.h diff -Naur glibc-2.27/libio/stdio.h glibc-2.27-patched/libio/stdio.h
--- glibc-2.25/libio/stdio.h 2017-02-05 10:28:43.000000000 -0500 --- glibc-2.27/libio/stdio.h 2018-02-01 11:17:18.000000000 -0500
+++ glibc-2.25-patched/libio/stdio.h 2023-05-23 15:22:27.482980335 -0400 +++ glibc-2.27-patched/libio/stdio.h 2023-05-23 14:10:06.618633203 -0400
@@ -154,18 +154,23 @@ @@ -118,18 +118,23 @@
# define P_tmpdir "/tmp" # define P_tmpdir "/tmp"
#endif #endif
@ -32,20 +32,19 @@ diff -Naur glibc-2.25/libio/stdio.h glibc-2.25-patched/libio/stdio.h
/* Standard streams. */ /* Standard streams. */
extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdin; /* Standard input stream. */
diff -Naur glibc-2.25/Makerules glibc-2.25-patched/Makerules diff -Naur glibc-2.27/Makerules glibc-2.27-patched/Makerules
--- glibc-2.25/Makerules 2017-02-05 10:28:43.000000000 -0500 --- glibc-2.27/Makerules 2018-02-01 11:17:18.000000000 -0500
+++ glibc-2.25-patched/Makerules 2023-05-23 15:22:05.594967548 -0400 +++ glibc-2.27-patched/Makerules 2023-05-23 14:10:06.617633203 -0400
@@ -1474,55 +1474,7 @@ @@ -1522,46 +1522,6 @@
endif
endif endif
-
-# These will have been set by sysdeps/posix/Makefile. -# These will have been set by sysdeps/posix/Makefile.
-L_tmpnam ?= 1 -L_tmpnam ?= 1
-TMP_MAX ?= 0 -TMP_MAX ?= 0
-L_ctermid ?= 1 -L_ctermid ?= 1
-L_cuserid ?= 1 -L_cuserid ?= 1
-
-stdio_lim = $(common-objpfx)bits/stdio_lim.h -stdio_lim = $(common-objpfx)bits/stdio_lim.h
- -
-$(stdio_lim:lim.h=%.h) $(stdio_lim:lim.h=%.d): $(stdio_lim:lim.h=%.st); @: -$(stdio_lim:lim.h=%.h) $(stdio_lim:lim.h=%.d): $(stdio_lim:lim.h=%.st); @:
@ -53,8 +52,7 @@ diff -Naur glibc-2.25/Makerules glibc-2.25-patched/Makerules
- $(common-objpfx)config.make - $(common-objpfx)config.make
- $(make-target-directory) - $(make-target-directory)
- { echo '#include "$(..)posix/bits/posix1_lim.h"'; \ - { echo '#include "$(..)posix/bits/posix1_lim.h"'; \
- echo '#define _LIBC 1'; \ - } | \
- echo '#include "$(..)misc/sys/uio.h"'; } | \
- $(CC) -E -dM -MD -MP -MF $(@:st=dT) -MT '$(@:st=h) $(@:st=d)' \ - $(CC) -E -dM -MD -MP -MF $(@:st=dT) -MT '$(@:st=h) $(@:st=d)' \
- $(CPPUNDEFS) $(+includes) -xc - -o $(@:st=hT) - $(CPPUNDEFS) $(+includes) -xc - -o $(@:st=hT)
- sed $(sed-remove-objpfx) $(sed-remove-dotdot) \ - sed $(sed-remove-objpfx) $(sed-remove-dotdot) \
@ -62,21 +60,14 @@ diff -Naur glibc-2.25/Makerules glibc-2.25-patched/Makerules
- mv -f $(@:st=dt) $(@:st=d) - mv -f $(@:st=dt) $(@:st=d)
- fopen_max=`sed -n 's/^#define OPEN_MAX //1p' $(@:st=hT)`; \ - fopen_max=`sed -n 's/^#define OPEN_MAX //1p' $(@:st=hT)`; \
- filename_max=`sed -n 's/^#define PATH_MAX //1p' $(@:st=hT)`; \ - filename_max=`sed -n 's/^#define PATH_MAX //1p' $(@:st=hT)`; \
- iov_max=`sed -n 's/^#define UIO_MAXIOV //p' $(@:st=hT)`; \
- fopen_max=$${fopen_max:-16}; \ - fopen_max=$${fopen_max:-16}; \
- filename_max=$${filename_max:-1024}; \ - filename_max=$${filename_max:-1024}; \
- if [ -z "$$iov_max" ]; then \
- define_iov_max="# undef IOV_MAX"; \
- else \
- define_iov_max="# define IOV_MAX $$iov_max"; \
- fi; \
- sed -e "s/@FOPEN_MAX@/$$fopen_max/" \ - sed -e "s/@FOPEN_MAX@/$$fopen_max/" \
- -e "s/@FILENAME_MAX@/$$filename_max/" \ - -e "s/@FILENAME_MAX@/$$filename_max/" \
- -e "s/@L_tmpnam@/$(L_tmpnam)/" \ - -e "s/@L_tmpnam@/$(L_tmpnam)/" \
- -e "s/@TMP_MAX@/$(TMP_MAX)/" \ - -e "s/@TMP_MAX@/$(TMP_MAX)/" \
- -e "s/@L_ctermid@/$(L_ctermid)/" \ - -e "s/@L_ctermid@/$(L_ctermid)/" \
- -e "s/@L_cuserid@/$(L_cuserid)/" \ - -e "s/@L_cuserid@/$(L_cuserid)/" \
- -e "s/@define_IOV_MAX@/$$define_iov_max/" \
- $< > $(@:st=h.new) - $< > $(@:st=h.new)
- $(move-if-change) $(@:st=h.new) $(@:st=h) - $(move-if-change) $(@:st=h.new) $(@:st=h)
-# Remove these last so that they can be examined if something went wrong. -# Remove these last so that they can be examined if something went wrong.
@ -91,9 +82,9 @@ diff -Naur glibc-2.25/Makerules glibc-2.25-patched/Makerules
FORCE: FORCE:
.PHONY: echo-headers .PHONY: echo-headers
diff -Naur glibc-2.25/Rules glibc-2.25-patched/Rules diff -Naur glibc-2.27/Rules glibc-2.27-patched/Rules
--- glibc-2.25/Rules 2017-02-05 10:28:43.000000000 -0500 --- glibc-2.27/Rules 2018-02-01 11:17:18.000000000 -0500
+++ glibc-2.25-patched/Rules 2023-05-23 15:22:27.482980335 -0400 +++ glibc-2.27-patched/Rules 2023-05-23 14:10:06.617633203 -0400
@@ -60,9 +60,6 @@ @@ -60,9 +60,6 @@
common-generated := common-generated :=
endif endif
@ -104,11 +95,11 @@ diff -Naur glibc-2.25/Rules glibc-2.25-patched/Rules
include $(..)Makerules include $(..)Makerules
.PHONY: subdir_lib .PHONY: subdir_lib
diff -Naur glibc-2.25/stdio-common/stdio_lim.h.in glibc-2.25-patched/stdio-common/stdio_lim.h.in diff -Naur glibc-2.27/stdio-common/stdio_lim.h.in glibc-2.27-patched/stdio-common/stdio_lim.h.in
--- glibc-2.25/stdio-common/stdio_lim.h.in 2017-02-05 10:28:43.000000000 -0500 --- glibc-2.27/stdio-common/stdio_lim.h.in 2018-02-01 11:17:18.000000000 -0500
+++ glibc-2.25-patched/stdio-common/stdio_lim.h.in 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.27-patched/stdio-common/stdio_lim.h.in 1969-12-31 19:00:00.000000000 -0500
@@ -1,42 +0,0 @@ @@ -1,39 +0,0 @@
-/* Copyright (C) 1994-2017 Free Software Foundation, Inc. -/* Copyright (C) 1994-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library. - This file is part of the GNU C Library.
- -
- The GNU C Library is free software; you can redistribute it and/or - The GNU C Library is free software; you can redistribute it and/or
@ -125,34 +116,31 @@ diff -Naur glibc-2.25/stdio-common/stdio_lim.h.in glibc-2.25-patched/stdio-commo
- License along with the GNU C Library; if not, see - License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */ - <http://www.gnu.org/licenses/>. */
- -
-#if !defined _STDIO_H && !defined __need_FOPEN_MAX && !defined __need_IOV_MAX -#ifndef _BITS_STDIO_LIM_H
-#define _BITS_STDIO_LIM_H 1
-
-#ifndef _STDIO_H
-# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead." -# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead."
-#endif -#endif
- -
-#ifdef _STDIO_H -#define L_tmpnam @L_tmpnam@
-# define L_tmpnam @L_tmpnam@ -#define TMP_MAX @TMP_MAX@
-# define TMP_MAX @TMP_MAX@ -#define FILENAME_MAX @FILENAME_MAX@
-# define FILENAME_MAX @FILENAME_MAX@
- -
-# ifdef __USE_POSIX -#ifdef __USE_POSIX
-# define L_ctermid @L_ctermid@ -# define L_ctermid @L_ctermid@
-# if !defined __USE_XOPEN2K || defined __USE_GNU -# if !defined __USE_XOPEN2K || defined __USE_GNU
-# define L_cuserid @L_cuserid@ -# define L_cuserid @L_cuserid@
-# endif
-# endif -# endif
-#endif -#endif
- -
-#if defined __need_FOPEN_MAX || defined _STDIO_H -#undef FOPEN_MAX
-# undef FOPEN_MAX -#define FOPEN_MAX @FOPEN_MAX@
-# define FOPEN_MAX @FOPEN_MAX@
-#endif
- -
-#if defined __need_IOV_MAX && !defined IOV_MAX -#endif /* bits/stdio_lim.h */
-@define_IOV_MAX@ diff -Naur glibc-2.27/sysdeps/mach/hurd/bits/stdio_lim.h glibc-2.27-patched/sysdeps/mach/hurd/bits/stdio_lim.h
-#endif --- glibc-2.27/sysdeps/mach/hurd/bits/stdio_lim.h 1969-12-31 19:00:00.000000000 -0500
diff -Naur glibc-2.25/sysdeps/mach/hurd/bits/stdio_lim.h glibc-2.25-patched/sysdeps/mach/hurd/bits/stdio_lim.h +++ glibc-2.27-patched/sysdeps/mach/hurd/bits/stdio_lim.h 2023-05-23 14:10:06.618633203 -0400
--- glibc-2.25/sysdeps/mach/hurd/bits/stdio_lim.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.25-patched/sysdeps/mach/hurd/bits/stdio_lim.h 2023-05-23 15:22:27.483980336 -0400
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
+/* System specific stdio.h definitions. Hurd version. +/* System specific stdio.h definitions. Hurd version.
+ Copyright (C) 2023 Free Software Foundation, Inc. + Copyright (C) 2023 Free Software Foundation, Inc.
@ -182,9 +170,9 @@ diff -Naur glibc-2.25/sysdeps/mach/hurd/bits/stdio_lim.h glibc-2.25-patched/sysd
+#define FILENAME_MAX 1024 +#define FILENAME_MAX 1024
+ +
+#endif /* bits/stdio_lim.h */ +#endif /* bits/stdio_lim.h */
diff -Naur glibc-2.25/sysdeps/posix/Makefile glibc-2.25-patched/sysdeps/posix/Makefile diff -Naur glibc-2.27/sysdeps/posix/Makefile glibc-2.27-patched/sysdeps/posix/Makefile
--- glibc-2.25/sysdeps/posix/Makefile 2017-02-05 10:28:43.000000000 -0500 --- glibc-2.27/sysdeps/posix/Makefile 2018-02-01 11:17:18.000000000 -0500
+++ glibc-2.25-patched/sysdeps/posix/Makefile 2023-05-23 15:22:27.483980336 -0400 +++ glibc-2.27-patched/sysdeps/posix/Makefile 2023-05-23 14:10:06.618633203 -0400
@@ -1,8 +1,3 @@ @@ -1,8 +1,3 @@
-# These affect the generated bits/stdio_lim.h file. -# These affect the generated bits/stdio_lim.h file.
-L_tmpnam = 20 -L_tmpnam = 20
@ -194,9 +182,9 @@ diff -Naur glibc-2.25/sysdeps/posix/Makefile glibc-2.25-patched/sysdeps/posix/Ma
ifeq ($(subdir)|$(have-thread-library),rt|no) ifeq ($(subdir)|$(have-thread-library),rt|no)
# With NPTL, this lives in libpthread so it can be used for sem_open too. # With NPTL, this lives in libpthread so it can be used for sem_open too.
diff -Naur glibc-2.25/sysdeps/unix/sysv/linux/bits/stdio_lim.h glibc-2.25-patched/sysdeps/unix/sysv/linux/bits/stdio_lim.h diff -Naur glibc-2.27/sysdeps/unix/sysv/linux/bits/stdio_lim.h glibc-2.27-patched/sysdeps/unix/sysv/linux/bits/stdio_lim.h
--- glibc-2.25/sysdeps/unix/sysv/linux/bits/stdio_lim.h 1969-12-31 19:00:00.000000000 -0500 --- glibc-2.27/sysdeps/unix/sysv/linux/bits/stdio_lim.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.25-patched/sysdeps/unix/sysv/linux/bits/stdio_lim.h 2023-05-23 15:22:27.483980336 -0400 +++ glibc-2.27-patched/sysdeps/unix/sysv/linux/bits/stdio_lim.h 2023-05-23 14:10:06.618633203 -0400
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
+/* System specific stdio.h definitions. Linux version. +/* System specific stdio.h definitions. Linux version.
+ Copyright (C) 2023 Free Software Foundation, Inc. + Copyright (C) 2023 Free Software Foundation, Inc.
@ -219,9 +207,9 @@ diff -Naur glibc-2.25/sysdeps/unix/sysv/linux/bits/stdio_lim.h glibc-2.25-patche
+#ifndef _BITS_STDIO_LIM_H +#ifndef _BITS_STDIO_LIM_H
+#define _BITS_STDIO_LIM_H 1 +#define _BITS_STDIO_LIM_H 1
+ +
+//#ifndef _STDIO_H +#ifndef _STDIO_H
+//# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead." +# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead."
+//#endif +#endif
+ +
+#define FILENAME_MAX 4096 +#define FILENAME_MAX 4096
+ +

56
tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff
View file

@ -1,56 +0,0 @@
diff -Naur gcc-4.9.4/gcc/config/arm/t-arm-elf gcc-4.9.4-fixed/gcc/config/arm/t-arm-elf
--- gcc-4.9.4/gcc/config/arm/t-arm-elf 2014-01-02 17:23:26.000000000 -0500
+++ gcc-4.9.4-fixed/gcc/config/arm/t-arm-elf 2020-07-01 22:11:01.198403110 -0400
@@ -44,6 +44,11 @@
#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard*
#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard*
+# We build a lib for each specific CPU Rockbox targets. If anyone knows a better
+# way to do this, please let us know.
+MULTILIB_OPTIONS += mcpu=arm7tdmi/mcpu=arm9tdmi/mcpu=arm9e/mcpu=arm926ej-s/mcpu=arm1136jf-s
+MULTILIB_DIRNAMES += arm7tdmi arm9tdmi arm9e arm926ej-s arm1136jf-s
+
# MULTILIB_OPTIONS += mcpu=ep9312
# MULTILIB_DIRNAMES += ep9312
# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
@@ -56,8 +61,8 @@
# MULTILIB_DIRNAMES += fpu soft
# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
#
-# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork
-# MULTILIB_DIRNAMES += normal interwork
+MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork
+MULTILIB_DIRNAMES += normal interwork
#
# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore
# MULTILIB_DIRNAMES += elf under
diff -Naur gcc-4.9.4/libgcc/config/arm/t-bpabi gcc-4.9.4-fixed/libgcc/config/arm/t-bpabi
--- gcc-4.9.4/libgcc/config/arm/t-bpabi 2012-08-17 11:06:06.000000000 -0400
+++ gcc-4.9.4-fixed/libgcc/config/arm/t-bpabi 2020-07-01 22:13:39.103762818 -0400
@@ -17,4 +17,4 @@
# On ARM, specifying -fnon-call-exceptions will needlessly pull in
# the unwinder in simple programs which use 64-bit division. Omitting
# the option is safe.
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fno-non-call-exceptions
diff -Naur gcc-4.9.4/libgcc/Makefile.in gcc-4.9.4-fixed/libgcc/Makefile.in
--- gcc-4.9.4/libgcc/Makefile.in 2014-01-08 11:37:08.000000000 -0500
+++ gcc-4.9.4-fixed/libgcc/Makefile.in 2020-07-01 22:11:01.199403087 -0400
@@ -495,7 +495,7 @@
ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),)
# Provide default flags for compiling divmod functions, if they haven't been
# set already by a target-specific Makefile fragment.
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -fnon-call-exceptions
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fno-non-call-exceptions
endif
# Build LIB2_DIVMOD_FUNCS.
@@ -816,7 +816,7 @@
# libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and
# LIB2ADDEHSHARED matter. (Usually all three are identical.)
-c_flags := -fexceptions
+c_flags := -fno-exceptions
ifeq ($(enable_shared),yes)

77
tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-8.5.0.diff Normal file
View file

@ -0,0 +1,77 @@
diff -Naur gcc-8.5.0/gcc/config/arm/arm_cmse.h gcc-8.5.0-patched/gcc/config/arm/ar
m_cmse.h
--- gcc-8.5.0/gcc/config/arm/arm_cmse.h 2021-05-14 04:42:08.000000000 -0400
+++ gcc-8.5.0-patched/gcc/config/arm/arm_cmse.h 2023-04-17 14:32:56.547477547 -0400
@@ -35,7 +35,7 @@
#if __ARM_FEATURE_CMSE & 1
#include <stddef.h>
-#include <stdint.h>
+//#include <stdint.h>
#ifdef __ARM_BIG_ENDIAN
diff -aur gcc-8.5.0/gcc/config/arm/t-arm-elf gcc-8.5.0-patched/gcc/config/arm/t-arm-elf
--- gcc-8.5.0/gcc/config/arm/t-arm-elf 2021-05-14 04:42:08.000000000 -0400
+++ gcc-8.5.0-patched/gcc/config/arm/t-arm-elf 2022-11-26 23:16:30.714433566 -0500
@@ -80,6 +80,10 @@
MULTILIB_REQUIRED += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
MULTILIB_REQUIRED += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
+# And we want to be able to disable interworking
+MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork
+MULTILIB_DIRNAMES += normal interwork
+
# PART 3 - Match rules
# Map all supported FPUs onto mfpu=auto
diff -aur gcc-8.5.0/libgcc/config/arm/t-bpabi gcc-8.5.0-patched/libgcc/config/arm/t-bpabi
--- gcc-8.5.0/libgcc/config/arm/t-bpabi 2021-05-14 04:42:10.000000000 -0400
+++ gcc-8.5.0-patched/libgcc/config/arm/t-bpabi 2022-11-26 23:14:40.938038440 -0500
@@ -17,4 +17,4 @@
# On ARM, specifying -fnon-call-exceptions will needlessly pull in
# the unwinder in simple programs which use 64-bit division. Omitting
# the option is safe.
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fno-non-call-exceptions
diff -aur gcc-8.5.0/libgcc/config/arm/cmse.c gcc-8.5.0-patch/libgcc/config/arm/cmse.c
--- gcc-8.5.0/libgcc/config/arm/cmse.c 2021-05-14 04:42:10.000000000 -0400
+++ gcc-8.5.0-patched/libgcc/config/arm/cmse.c 2023-04-17 15:12:11.865456701 -0400
@@ -36,7 +36,7 @@
char *pb = (char *) p, *pe;
/* Check if the range wraps around. */
- if (UINTPTR_MAX - (uintptr_t) p < size)
+ if (__UINTPTR_MAX__ - (__UINTPTR_TYPE__) p < size)
return NULL;
/* Check if an unknown flag is present. */
@@ -51,7 +51,7 @@
/* Execute the right variant of the TT instructions. */
pe = pb + size - 1;
- const int singleCheck = (((uintptr_t) pb ^ (uintptr_t) pe) < 32);
+ const int singleCheck = (((__UINTPTR_TYPE__) pb ^ (__UINTPTR_TYPE__) pe) < 32);
switch (flags & known_secure_level)
{
case 0:
diff -aur gcc-8.5.0/libgcc/Makefile.in gcc-8.5.0-patched/libgcc/Makefile.in
--- gcc-8.5.0/libgcc/Makefile.in 2021-05-14 04:42:10.000000000 -0400
+++ gcc-8.5.0-patched/libgcc/Makefile.in 2022-11-26 23:13:56.781304250 -0500
@@ -526,7 +526,7 @@
ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),)
# Provide default flags for compiling divmod functions, if they haven't been
# set already by a target-specific Makefile fragment.
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -fnon-call-exceptions
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fno-non-call-exceptions
endif
# Build LIB2_DIVMOD_FUNCS.
@@ -847,7 +847,7 @@
# libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and
# LIB2ADDEHSHARED matter. (Usually all three are identical.)
-c_flags := -fexceptions
+c_flags := -fno-exceptions
ifeq ($(enable_shared),yes)