diff options
Diffstat (limited to 'tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff')
-rw-r--r-- | tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff b/tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff new file mode 100644 index 0000000000..cd98d3751c --- /dev/null +++ b/tools/toolchain-patches/rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.9.4.diff | |||
@@ -0,0 +1,56 @@ | |||
1 | diff -Naur gcc-4.9.4/gcc/config/arm/t-arm-elf gcc-4.9.4-fixed/gcc/config/arm/t-arm-elf | ||
2 | --- gcc-4.9.4/gcc/config/arm/t-arm-elf 2014-01-02 17:23:26.000000000 -0500 | ||
3 | +++ gcc-4.9.4-fixed/gcc/config/arm/t-arm-elf 2020-07-01 22:11:01.198403110 -0400 | ||
4 | @@ -44,6 +44,11 @@ | ||
5 | #MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard* | ||
6 | #MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard* | ||
7 | |||
8 | +# We build a lib for each specific CPU Rockbox targets. If anyone knows a better | ||
9 | +# way to do this, please let us know. | ||
10 | +MULTILIB_OPTIONS += mcpu=arm7tdmi/mcpu=arm9tdmi/mcpu=arm9e/mcpu=arm926ej-s/mcpu=arm1136jf-s | ||
11 | +MULTILIB_DIRNAMES += arm7tdmi arm9tdmi arm9e arm926ej-s arm1136jf-s | ||
12 | + | ||
13 | # MULTILIB_OPTIONS += mcpu=ep9312 | ||
14 | # MULTILIB_DIRNAMES += ep9312 | ||
15 | # MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312* | ||
16 | @@ -56,8 +61,8 @@ | ||
17 | # MULTILIB_DIRNAMES += fpu soft | ||
18 | # MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard* | ||
19 | # | ||
20 | -# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork | ||
21 | -# MULTILIB_DIRNAMES += normal interwork | ||
22 | +MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork | ||
23 | +MULTILIB_DIRNAMES += normal interwork | ||
24 | # | ||
25 | # MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore | ||
26 | # MULTILIB_DIRNAMES += elf under | ||
27 | diff -Naur gcc-4.9.4/libgcc/config/arm/t-bpabi gcc-4.9.4-fixed/libgcc/config/arm/t-bpabi | ||
28 | --- gcc-4.9.4/libgcc/config/arm/t-bpabi 2012-08-17 11:06:06.000000000 -0400 | ||
29 | +++ gcc-4.9.4-fixed/libgcc/config/arm/t-bpabi 2020-07-01 22:13:39.103762818 -0400 | ||
30 | @@ -17,4 +17,4 @@ | ||
31 | # On ARM, specifying -fnon-call-exceptions will needlessly pull in | ||
32 | # the unwinder in simple programs which use 64-bit division. Omitting | ||
33 | # the option is safe. | ||
34 | -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions | ||
35 | +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fno-non-call-exceptions | ||
36 | diff -Naur gcc-4.9.4/libgcc/Makefile.in gcc-4.9.4-fixed/libgcc/Makefile.in | ||
37 | --- gcc-4.9.4/libgcc/Makefile.in 2014-01-08 11:37:08.000000000 -0500 | ||
38 | +++ gcc-4.9.4-fixed/libgcc/Makefile.in 2020-07-01 22:11:01.199403087 -0400 | ||
39 | @@ -495,7 +495,7 @@ | ||
40 | ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),) | ||
41 | # Provide default flags for compiling divmod functions, if they haven't been | ||
42 | # set already by a target-specific Makefile fragment. | ||
43 | -LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions -fnon-call-exceptions | ||
44 | +LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions -fno-non-call-exceptions | ||
45 | endif | ||
46 | |||
47 | # Build LIB2_DIVMOD_FUNCS. | ||
48 | @@ -816,7 +816,7 @@ | ||
49 | # libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and | ||
50 | # LIB2ADDEHSHARED matter. (Usually all three are identical.) | ||
51 | |||
52 | -c_flags := -fexceptions | ||
53 | +c_flags := -fno-exceptions | ||
54 | |||
55 | ifeq ($(enable_shared),yes) | ||
56 | |||