Skip to content

Commit b280c0a

Browse files
WinterMuteWinterMute
committed
devkitARM: update gcc patch
1 parent 776be58 commit b280c0a

1 file changed

Lines changed: 49 additions & 41 deletions

File tree

‎dkarm-eabi/patches/gcc-12.2.0.patch‎

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in
2-
--- gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in 2022-04-29 14:58:22.000000000 +0100
3-
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in 2022-04-30 13:31:09.120134164 +0100
4-
@@ -412,7 +412,7 @@
1+
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
2+
index 0d3082b569f..15be7fc47b3 100644
3+
--- a/gcc/config/arm/arm-cpus.in
4+
+++ b/gcc/config/arm/arm-cpus.in
5+
@@ -412,7 +412,7 @@ begin arch armv6k
56
tune for mpcore
67
tune flags CO_PROC
78
base 6K
@@ -10,16 +11,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-2022
1011
option fp add VFPv2 FP_DBL
1112
optalias vfpv2 fp
1213
option nofp remove ALL_FP
13-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf
14-
--- gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf 2022-04-29 14:58:22.000000000 +0100
15-
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf 2022-04-30 13:31:39.759455398 +0100
16-
@@ -1,4 +1,4 @@
17-
-# Copyright (C) 1998-2022 Free Software Foundation, Inc.
18-
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
19-
#
20-
# This file is part of GCC.
21-
#
22-
@@ -16,120 +16,14 @@
14+
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
15+
index 1459afea921..72e1d20861d 100644
16+
--- a/gcc/config/arm/t-arm-elf
17+
+++ b/gcc/config/arm/t-arm-elf
18+
@@ -16,120 +16,22 @@
2319
# along with GCC; see the file COPYING3. If not see
2420
# <http://www.gnu.org/licenses/>.
2521

@@ -69,8 +65,8 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-202204
6965
-
7066
-MULTILIB_OPTIONS =
7167
-MULTILIB_DIRNAMES =
72-
+MULTILIB_OPTIONS = mthumb mbig-endian march=armv6k mfloat-abi=hard
73-
+MULTILIB_DIRNAMES = thumb be armv6k fpu
68+
+MULTILIB_OPTIONS = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
69+
+MULTILIB_DIRNAMES = thumb be armv6k v6-m fpu nofp
7470
MULTILIB_EXCEPTIONS =
7571
MULTILIB_MATCHES =
7672
-MULTILIB_REUSE =
@@ -117,25 +113,31 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-202204
117113
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
118114
- march?armv7+fp=march?$(ARCH) \
119115
- march?armv7+fp=march?$(ARCH)+fp)
120-
-
116+
121117
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
122118
- march?armv7+fp=march?$(ARCH) \
123119
- $(foreach FPARCH, $(v8_fps), \
124120
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
121+
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard mthumb/march=armv6s-m/mfloat-abi=soft
125122

126123
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v9_archs), \
127124
- march?armv7+fp=march?$(ARCH) \
128125
- $(foreach FPARCH, $(v9_fps), \
129126
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
130-
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard
131127

132128
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
133129
- march?armv7+fp=march?$(ARCH)+fp.dp)
134-
135-
-# PART 4 - Reuse rules
136130
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
137131
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
138132

133+
-# PART 4 - Reuse rules
134+
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0
135+
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m0
136+
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0plus
137+
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m0plus
138+
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m1
139+
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m1
140+
139141
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto
140142
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
141143
-MULTILIB_REUSE += mthumb=mthumb/march.armv5te+fp
@@ -145,9 +147,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-202204
145147
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
146148
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
147149
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
148-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h
149-
--- gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h 2022-04-29 14:58:22.000000000 +0100
150-
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h 2022-04-30 13:31:09.120134164 +0100
150+
+MULTILIB_REUSE = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
151+
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
152+
index bfb294beaa3..7e2e1c7bbbe 100644
153+
--- a/gcc/config/arm/unknown-elf.h
154+
+++ b/gcc/config/arm/unknown-elf.h
151155
@@ -29,7 +29,7 @@
152156
#endif
153157

@@ -164,10 +168,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20
164168
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
165169
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
166170
+
167-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc
168-
--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc 2022-04-29 14:58:22.000000000 +0100
169-
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc 2022-04-30 13:31:09.120134164 +0100
170-
@@ -45,7 +45,11 @@
171+
diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
172+
index 3b0d83ffc60..6e063b6ccd0 100644
173+
--- a/gcc/config/i386/host-mingw32.cc
174+
+++ b/gcc/config/i386/host-mingw32.cc
175+
@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
171176
static inline void w32_error(const char*, const char*, int, const char*);
172177

173178
/* FIXME: Is this big enough? */
@@ -179,10 +184,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC
179184

180185
/* Granularity for reserving address space. */
181186
static size_t va_granularity = 0x10000;
182-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc
183-
--- gcc-12.1.0-RC-20220429/gcc/gcc.cc 2022-04-29 14:58:23.000000000 +0100
184-
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc 2022-04-30 13:31:09.120134164 +0100
185-
@@ -860,6 +860,11 @@
187+
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
188+
index bb07cc244e3..eff31f5093d 100644
189+
--- a/gcc/gcc.cc
190+
+++ b/gcc/gcc.cc
191+
@@ -860,6 +860,11 @@ proper position among the other output files. */
186192
#endif
187193
#endif
188194

@@ -194,35 +200,37 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/g
194200
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
195201
#ifndef STARTFILE_SPEC
196202
#define STARTFILE_SPEC \
197-
@@ -1204,6 +1209,7 @@
203+
@@ -1204,6 +1209,7 @@ static const char *link_spec = LINK_SPEC;
198204
static const char *lib_spec = LIB_SPEC;
199205
static const char *link_gomp_spec = "";
200206
static const char *libgcc_spec = LIBGCC_SPEC;
201207
+static const char *libgloss_spec = LIBGLOSS_SPEC;
202208
static const char *endfile_spec = ENDFILE_SPEC;
203209
static const char *startfile_spec = STARTFILE_SPEC;
204210
static const char *linker_name_spec = LINKER_NAME;
205-
@@ -1709,6 +1715,7 @@
211+
@@ -1709,6 +1715,7 @@ static struct spec_list static_specs[] =
206212
INIT_STATIC_SPEC ("lib", &lib_spec),
207213
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
208214
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
209215
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
210216
INIT_STATIC_SPEC ("startfile", &startfile_spec),
211217
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
212218
INIT_STATIC_SPEC ("version", &compiler_version),
213-
diff -NBaur gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi
214-
--- gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi 2022-04-29 14:58:25.000000000 +0100
215-
+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi 2022-04-30 13:31:09.120134164 +0100
216-
@@ -17,4 +17,4 @@
219+
diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
220+
index dddddc7c444..c2502597953 100644
221+
--- a/libgcc/config/arm/t-bpabi
222+
+++ b/libgcc/config/arm/t-bpabi
223+
@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
217224
# On ARM, specifying -fnon-call-exceptions will needlessly pull in
218225
# the unwinder in simple programs which use 64-bit division. Omitting
219226
# the option is safe.
220227
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
221228
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
222-
diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c
223-
--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c 2022-04-29 14:58:25.000000000 +0100
224-
+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c 2022-04-30 13:31:09.120134164 +0100
225-
@@ -325,7 +325,7 @@
229+
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
230+
index b98b86a5a88..3f62b3616d2 100644
231+
--- a/libgcc/crtstuff.c
232+
+++ b/libgcc/crtstuff.c
233+
@@ -325,7 +325,7 @@ register_tm_clones (void)
226234

227235
#ifdef OBJECT_FORMAT_ELF
228236

0 commit comments

Comments
 (0)