Skip to content

Commit a07a271

Browse files
WinterMuteWinterMute
committed
devkitA64: add __DEVKITPRO__ to built-in defines
1 parent 026a498 commit a07a271

1 file changed

Lines changed: 121 additions & 100 deletions

File tree

‎dka64/patches/gcc-12.2.0.patch‎

Lines changed: 121 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,56 @@
1-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc
2-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc 2022-04-29 14:58:22.000000000 +0100
3-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc 2022-05-02 21:50:30.090088643 +0100
4-
@@ -19417,8 +19417,24 @@
1+
diff --git a/gcc/config.gcc b/gcc/config.gcc
2+
index c5064dd3766..decfa78fb7b 100644
3+
--- a/gcc/config.gcc
4+
+++ b/gcc/config.gcc
5+
@@ -1093,7 +1093,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
6+
tmake_file="${tmake_file} aarch64/t-aarch64"
7+
case $target in
8+
aarch64-*-elf*)
9+
+ default_use_cxa_atexit=yes
10+
use_gcc_stdint=wrap
11+
+ tm_file="${tm_file} devkitpro.h"
12+
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
13+
+ extra_options="${extra_options} devkitpro.opt"
14+
+ case ${enable_threads} in
15+
+ "" | yes | posix) thread_file='posix' ;;
16+
+ esac
17+
;;
18+
aarch64-*-fuchsia*)
19+
tm_file="${tm_file} fuchsia.h"
20+
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
21+
index d4d820a9d54..ed5dd440846 100644
22+
--- a/gcc/config/aarch64/aarch64-elf-raw.h
23+
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
24+
@@ -22,6 +22,7 @@
25+
#ifndef GCC_AARCH64_ELF_RAW_H
26+
#define GCC_AARCH64_ELF_RAW_H
27+
28+
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
29+
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
30+
#define ENDFILE_SPEC \
31+
" crtend%O%s crtn%O%s " \
32+
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
33+
index 93572fe8330..9327c52a819 100644
34+
--- a/gcc/config/aarch64/aarch64-opts.h
35+
+++ b/gcc/config/aarch64/aarch64-opts.h
36+
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
37+
TLS_DESCRIPTORS
38+
};
39+
40+
+/* Which thread pointer access sequence to use. */
41+
+enum aarch64_tp_type {
42+
+ TP_HARD,
43+
+ TP_SOFT
44+
+};
45+
+
46+
/* The code model defines the address generation strategy.
47+
Most have a PIC and non-PIC variant. */
48+
enum aarch64_code_model {
49+
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
50+
index 5c9e7791a12..718db155d57 100644
51+
--- a/gcc/config/aarch64/aarch64.cc
52+
+++ b/gcc/config/aarch64/aarch64.cc
53+
@@ -19413,8 +19413,24 @@ aarch64_load_tp (rtx target)
554
|| !register_operand (target, Pmode))
655
target = gen_reg_rtx (Pmode);
756

@@ -28,21 +77,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-2
2877
return target;
2978
}
3079

31-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h
32-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h 2022-04-29 14:58:22.000000000 +0100
33-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h 2022-05-02 21:50:30.086094234 +0100
34-
@@ -22,6 +22,7 @@
35-
#ifndef GCC_AARCH64_ELF_RAW_H
36-
#define GCC_AARCH64_ELF_RAW_H
37-
38-
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
39-
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
40-
#define ENDFILE_SPEC \
41-
" crtend%O%s crtn%O%s " \
42-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h
43-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h 2022-04-29 14:58:22.000000000 +0100
44-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h 2022-05-02 21:50:30.090088643 +0100
45-
@@ -1245,6 +1245,10 @@
80+
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
81+
index 359b6e8561f..f5b596fc312 100644
82+
--- a/gcc/config/aarch64/aarch64.h
83+
+++ b/gcc/config/aarch64/aarch64.h
84+
@@ -1245,6 +1245,10 @@ typedef struct
4685
/* Check TLS Descriptors mechanism is selected. */
4786
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
4887

@@ -53,7 +92,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20
5392
extern enum aarch64_code_model aarch64_cmodel;
5493

5594
/* When using the tiny addressing model conditional and unconditional branches
56-
@@ -1290,7 +1294,7 @@
95+
@@ -1290,7 +1294,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
5796
#define MCPU_TO_MARCH_SPEC_FUNCTIONS \
5897
{ "rewrite_mcpu", aarch64_rewrite_mcpu },
5998

@@ -62,10 +101,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20
62101
extern const char *host_detect_local_cpu (int argc, const char **argv);
63102
#define HAVE_LOCAL_CPU_DETECT
64103
# define EXTRA_SPEC_FUNCTIONS \
65-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md
66-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md 2022-04-29 14:58:22.000000000 +0100
67-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md 2022-05-02 21:50:30.090088643 +0100
68-
@@ -6899,11 +6899,22 @@
104+
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
105+
index 34b8059b45b..4debacf3cb9 100644
106+
--- a/gcc/config/aarch64/aarch64.md
107+
+++ b/gcc/config/aarch64/aarch64.md
108+
@@ -6906,11 +6906,22 @@
69109
(define_insn "aarch64_load_tp_hard"
70110
[(set (match_operand:DI 0 "register_operand" "=r")
71111
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
@@ -90,10 +130,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-2
90130
;; The TLS ABI specifically requires that the compiler does not schedule
91131
;; instructions in the TLS stubs, in order to enable linker relaxation.
92132
;; Therefore we treat the stubs as an atomic sequence.
93-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt
94-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt 2022-04-29 14:58:22.000000000 +0100
95-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt 2022-05-02 21:50:30.090088643 +0100
96-
@@ -122,6 +122,21 @@
133+
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
134+
index 92220b26ee2..68abc1764f6 100644
135+
--- a/gcc/config/aarch64/aarch64.opt
136+
+++ b/gcc/config/aarch64/aarch64.opt
137+
@@ -122,6 +122,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
97138
EnumValue
98139
Enum(aarch64_tls_size) String(48) Value(48)
99140

@@ -115,7 +156,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-
115156
march=
116157
Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
117158
Use features of architecture ARCH.
118-
@@ -260,7 +275,7 @@
159+
@@ -260,7 +275,7 @@ TargetVariable
119160
long aarch64_stack_protector_guard_offset = 0
120161

121162
moutline-atomics
@@ -124,26 +165,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-
124165
Generate local calls to out-of-line atomic operations.
125166

126167
-param=aarch64-sve-compare-costs=
127-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h
128-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h 2022-04-29 14:58:22.000000000 +0100
129-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h 2022-05-02 21:50:30.086094234 +0100
130-
@@ -48,6 +48,12 @@
131-
TLS_DESCRIPTORS
132-
};
133-
134-
+/* Which thread pointer access sequence to use. */
135-
+enum aarch64_tp_type {
136-
+ TP_HARD,
137-
+ TP_SOFT
138-
+};
139-
+
140-
/* The code model defines the address generation strategy.
141-
Most have a PIC and non-PIC variant. */
142-
enum aarch64_code_model {
143-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64
144-
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 2022-04-29 14:58:22.000000000 +0100
145-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64 2022-05-02 21:50:30.090088643 +0100
146-
@@ -177,8 +177,10 @@
168+
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
169+
index ba74abc0a43..5202ec05d0b 100644
170+
--- a/gcc/config/aarch64/t-aarch64
171+
+++ b/gcc/config/aarch64/t-aarch64
172+
@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
147173
$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
148174

149175
comma=,
@@ -156,10 +182,12 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20
156182

157183
insn-conditions.md: s-check-sve-md
158184
s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
159-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h
160-
--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h 1970-01-01 01:00:00.000000000 +0100
161-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h 2022-05-02 22:04:49.962851033 +0100
162-
@@ -0,0 +1,29 @@
185+
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
186+
new file mode 100644
187+
index 00000000000..a25459e4352
188+
--- /dev/null
189+
+++ b/gcc/config/devkitpro.h
190+
@@ -0,0 +1,32 @@
163191
+/* Definitions for devkitPro toolchains.
164192
+ Copyright (C) 2016-2018 Free Software Foundation, Inc.
165193
+
@@ -188,10 +216,15 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429
188216
+#define TARGET_OS_CPP_BUILTINS() \
189217
+ do { \
190218
+ builtin_define ("__DEVKITA64__"); \
219+
+ builtin_define ("__DEVKITPRO__"); \
191220
+ } while (0)
192-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt
193-
--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt 1970-01-01 01:00:00.000000000 +0100
194-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt 2022-05-02 21:50:30.090088643 +0100
221+
+
222+
+
223+
diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
224+
new file mode 100644
225+
index 00000000000..9acbbf9d27c
226+
--- /dev/null
227+
+++ b/gcc/config/devkitpro.opt
195228
@@ -0,0 +1,29 @@
196229
+; Options for devkitPro toolchains.
197230
+
@@ -222,10 +255,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-202204
222255
+Driver
223256
+
224257
+; This comment is to ensure we retain the blank line above.
225-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc
226-
--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc 2022-04-29 14:58:22.000000000 +0100
227-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc 2022-05-02 21:50:30.090088643 +0100
228-
@@ -45,7 +45,11 @@
258+
diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
259+
index 3b0d83ffc60..6e063b6ccd0 100644
260+
--- a/gcc/config/i386/host-mingw32.cc
261+
+++ b/gcc/config/i386/host-mingw32.cc
262+
@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
229263
static inline void w32_error(const char*, const char*, int, const char*);
230264

231265
/* FIXME: Is this big enough? */
@@ -237,28 +271,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC
237271

238272
/* Granularity for reserving address space. */
239273
static size_t va_granularity = 0x10000;
240-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config.gcc gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc
241-
--- gcc-12.1.0-RC-20220429/gcc/config.gcc 2022-04-29 14:58:22.000000000 +0100
242-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc 2022-05-02 21:50:30.086094234 +0100
243-
@@ -1093,7 +1093,14 @@
244-
tmake_file="${tmake_file} aarch64/t-aarch64"
245-
case $target in
246-
aarch64-*-elf*)
247-
+ default_use_cxa_atexit=yes
248-
use_gcc_stdint=wrap
249-
+ tm_file="${tm_file} devkitpro.h"
250-
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
251-
+ extra_options="${extra_options} devkitpro.opt"
252-
+ case ${enable_threads} in
253-
+ "" | yes | posix) thread_file='posix' ;;
254-
+ esac
255-
;;
256-
aarch64-*-fuchsia*)
257-
tm_file="${tm_file} fuchsia.h"
258-
diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc
259-
--- gcc-12.1.0-RC-20220429/gcc/gcc.cc 2022-04-29 14:58:23.000000000 +0100
260-
+++ gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc 2022-05-02 21:50:30.090088643 +0100
261-
@@ -860,6 +860,11 @@
274+
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
275+
index bb07cc244e3..eff31f5093d 100644
276+
--- a/gcc/gcc.cc
277+
+++ b/gcc/gcc.cc
278+
@@ -860,6 +860,11 @@ proper position among the other output files. */
262279
#endif
263280
#endif
264281

@@ -270,26 +287,27 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
270287
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
271288
#ifndef STARTFILE_SPEC
272289
#define STARTFILE_SPEC \
273-
@@ -1204,6 +1209,7 @@
290+
@@ -1204,6 +1209,7 @@ static const char *link_spec = LINK_SPEC;
274291
static const char *lib_spec = LIB_SPEC;
275292
static const char *link_gomp_spec = "";
276293
static const char *libgcc_spec = LIBGCC_SPEC;
277294
+static const char *libgloss_spec = LIBGLOSS_SPEC;
278295
static const char *endfile_spec = ENDFILE_SPEC;
279296
static const char *startfile_spec = STARTFILE_SPEC;
280297
static const char *linker_name_spec = LINKER_NAME;
281-
@@ -1709,6 +1715,7 @@
298+
@@ -1709,6 +1715,7 @@ static struct spec_list static_specs[] =
282299
INIT_STATIC_SPEC ("lib", &lib_spec),
283300
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
284301
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
285302
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
286303
INIT_STATIC_SPEC ("startfile", &startfile_spec),
287304
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
288305
INIT_STATIC_SPEC ("version", &compiler_version),
289-
diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c
290-
--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c 2022-04-29 14:58:25.000000000 +0100
291-
+++ gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c 2022-05-02 21:50:30.094083051 +0100
292-
@@ -325,7 +325,7 @@
306+
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
307+
index b98b86a5a88..3f62b3616d2 100644
308+
--- a/libgcc/crtstuff.c
309+
+++ b/libgcc/crtstuff.c
310+
@@ -325,7 +325,7 @@ register_tm_clones (void)
293311

294312
#ifdef OBJECT_FORMAT_ELF
295313

@@ -298,10 +316,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka6
298316
/* Declare the __dso_handle variable. It should have a unique value
299317
in every shared-object; in a main program its value is zero. The
300318
object should in any case be protected. This means the instance
301-
diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h
302-
--- gcc-12.1.0-RC-20220429/libgcc/gthr.h 2022-04-29 14:58:25.000000000 +0100
303-
+++ gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h 2022-05-02 21:50:30.094083051 +0100
304-
@@ -136,7 +136,7 @@
319+
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
320+
index 7943c94f6d1..6d23362f7f0 100644
321+
--- a/libgcc/gthr.h
322+
+++ b/libgcc/gthr.h
323+
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
305324
/* The pe-coff weak support isn't fully compatible to ELF's weak.
306325
For static libraries it might would work, but as we need to deal
307326
with shared versions too, we disable it for mingw-targets. */
@@ -310,21 +329,23 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/li
310329
#undef GTHREAD_USE_WEAK
311330
#define GTHREAD_USE_WEAK 0
312331
#endif
313-
diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am
314-
--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am 2022-04-29 14:58:26.000000000 +0100
315-
+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am 2022-05-02 21:50:30.094083051 +0100
316-
@@ -1366,6 +1366,7 @@
332+
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
333+
index 7708f4cf6c5..d3f484a5623 100644
334+
--- a/libstdc++-v3/include/Makefile.am
335+
+++ b/libstdc++-v3/include/Makefile.am
336+
@@ -1366,6 +1366,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
317337
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
318338
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
319339
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
320340
+ -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
321341
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
322342
< $< > $@
323343

324-
diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in
325-
--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in 2022-04-29 14:58:26.000000000 +0100
326-
+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in 2022-05-02 21:50:30.094083051 +0100
327-
@@ -1857,6 +1857,7 @@
344+
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
345+
index 7023c2de23e..d150a616d13 100644
346+
--- a/libstdc++-v3/include/Makefile.in
347+
+++ b/libstdc++-v3/include/Makefile.in
348+
@@ -1857,6 +1857,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
328349
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
329350
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
330351
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \

0 commit comments

Comments
 (0)