Skip to content

Commit f4f9233

Browse files
bootstrap: bump gcc to 13.2.0
Signed-off-by: Anhad Singh <[email protected]>
1 parent 10fc44e commit f4f9233

File tree

2 files changed

+37
-49
lines changed

2 files changed

+37
-49
lines changed

bootstrap.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ sources:
1919
- name: gcc
2020
subdir: 'bundled'
2121
git: 'git://gcc.gnu.org/git/gcc.git'
22-
tag: 'releases/gcc-11.2.0'
22+
tag: 'releases/gcc-13.2.0'
2323
patch-path-strip: 1
24-
version: '11.2.0'
24+
version: '13.2.0'
2525
tools_required:
2626
- host-autoconf-v2.69
2727
- host-automake-v1.16
@@ -38,16 +38,16 @@ sources:
3838
'@THIS_SOURCE_DIR@/']
3939
- args: ['cp',
4040
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
41-
'@THIS_SOURCE_DIR@/gmp-6.1.0/configfsf.sub']
41+
'@THIS_SOURCE_DIR@/gmp-6.2.1/configfsf.sub']
4242
- args: ['cp',
4343
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
44-
'@THIS_SOURCE_DIR@/isl-0.18/config.sub']
44+
'@THIS_SOURCE_DIR@/isl-0.24/config.sub']
4545
- args: ['cp', '-f',
4646
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
47-
'@THIS_SOURCE_DIR@/mpc-1.0.3/config.sub']
47+
'@THIS_SOURCE_DIR@/mpc-1.2.1/config.sub']
4848
- args: ['cp',
4949
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
50-
'@THIS_SOURCE_DIR@/mpfr-3.1.6/config.sub']
50+
'@THIS_SOURCE_DIR@/mpfr-4.1.0/config.sub']
5151

5252
- name: mlibc
5353
subdir: 'bundled'

patches/gcc/gcc.patch

Lines changed: 31 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
From dee75c7161a4ffc5760f7615ed7846a9592bc77c Mon Sep 17 00:00:00 2001
2-
From: Andy-Python-Programmer <[email protected]>
3-
Date: Tue, 31 Aug 2021 11:02:13 +1000
4-
Subject: [PATCH] targets: add aero target port
1+
From 4c867374622a04f29a5501dfc74f1057041cc0fc Mon Sep 17 00:00:00 2001
2+
From: Anhad Singh <[email protected]>
3+
Date: Thu, 3 Aug 2023 12:51:21 +1000
4+
Subject: [PATCH] gcc: add aero target
55

6-
Signed-off-by: Andy-Python-Programmer <[email protected]>
6+
Signed-off-by: Anhad Singh <[email protected]>
77
---
8-
.vscode/settings.json | 3 +++
98
config.sub | 4 ++--
109
fixincludes/mkfixinc.sh | 1 +
1110
gcc/config.gcc | 12 ++++++++++++
@@ -14,42 +13,31 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
1413
libgcc/libgcov.h | 1 +
1514
libstdc++-v3/crossconfig.m4 | 12 ++++++++++++
1615
libtool.m4 | 14 ++++++++++++++
17-
9 files changed, 83 insertions(+), 2 deletions(-)
18-
create mode 100644 .vscode/settings.json
16+
8 files changed, 80 insertions(+), 2 deletions(-)
1917
create mode 100644 gcc/config/aero.h
2018

21-
diff --git a/.vscode/settings.json b/.vscode/settings.json
22-
new file mode 100644
23-
index 000000000..560faaa36
24-
--- /dev/null
25-
+++ b/.vscode/settings.json
26-
@@ -0,0 +1,3 @@
27-
+{
28-
+ "editor.formatOnSave": false,
29-
+}
30-
\ No newline at end of file
3119
diff --git a/config.sub b/config.sub
32-
index 63c1f1c8b..36fff07fb 100755
20+
index 38f3d037a..956f31f08 100755
3321
--- a/config.sub
3422
+++ b/config.sub
35-
@@ -133,7 +133,7 @@ case $1 in
36-
case $maybe_os in
23+
@@ -145,7 +145,7 @@ case $1 in
3724
nto-qnx* | linux-* | uclinux-uclibc* \
3825
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
39-
- | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
40-
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* | aero* \
41-
| storm-chaos* | os2-emx* | rtmk-nova*)
26+
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
27+
- | storm-chaos* | os2-emx* | rtmk-nova*)
28+
+ | storm-chaos* | os2-emx* | rtmk-nova* | aero*)
4229
basic_machine=$field1
4330
basic_os=$maybe_os
44-
@@ -1723,7 +1723,7 @@ case $os in
45-
| scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
46-
| powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
47-
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
48-
- | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
49-
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | aero* | bme* \
31+
;;
32+
@@ -1749,7 +1749,7 @@ case $os in
33+
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
5034
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
51-
| nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
35+
| nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
36+
- | fiwix* )
37+
+ | fiwix* | aero*)
5238
;;
39+
# This one is extra strict with allowed versions
40+
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
5341
diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
5442
index df90720b7..e8c2b21c1 100755
5543
--- a/fixincludes/mkfixinc.sh
@@ -63,10 +51,10 @@ index df90720b7..e8c2b21c1 100755
6351
i?86-*-mingw32* | \
6452
x86_64-*-mingw32* | \
6553
diff --git a/gcc/config.gcc b/gcc/config.gcc
66-
index 357b0bed0..a88cface2 100644
54+
index 648b3dc21..4a13aceda 100644
6755
--- a/gcc/config.gcc
6856
+++ b/gcc/config.gcc
69-
@@ -822,6 +822,15 @@ case ${target} in
57+
@@ -840,6 +840,15 @@ case ${target} in
7058
tmake_file="${tmake_file} t-freebsd"
7159
target_has_targetdm=yes
7260
;;
@@ -82,12 +70,12 @@ index 357b0bed0..a88cface2 100644
8270
*-*-fuchsia*)
8371
native_system_header_dir=/include
8472
;;
85-
@@ -2240,6 +2249,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
73+
@@ -2214,6 +2223,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
8674
;;
8775
esac
8876
;;
8977
+x86_64-*-aero*)
90-
+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h gnu-user.h glibc-stdint.h i386/x86-64.h i386/gnu-user-common.h i386/gnu-user64.h aero.h"
78+
+ tm_file="${tm_file} i386/unix.h i386/att.h elfos.h gnu-user.h glibc-stdint.h i386/x86-64.h i386/gnu-user-common.h i386/gnu-user64.h aero.h"
9179
+ ;;
9280
x86_64-*-fuchsia*)
9381
tmake_file="${tmake_file} i386/t-x86_64-elf"
@@ -129,10 +117,10 @@ index 000000000..e8c149e40
129117
+ builtin_assert("system=posix"); \
130118
+ } while (0);
131119
diff --git a/libgcc/config.host b/libgcc/config.host
132-
index 50f000622..d1aa00f1a 100644
120+
index 9d7212028..3724a1ac5 100644
133121
--- a/libgcc/config.host
134122
+++ b/libgcc/config.host
135-
@@ -245,6 +245,11 @@ case ${host} in
123+
@@ -281,6 +281,11 @@ case ${host} in
136124
tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-fuchsia"
137125
extra_parts="crtbegin.o crtend.o"
138126
;;
@@ -144,7 +132,7 @@ index 50f000622..d1aa00f1a 100644
144132
*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu | *-*-uclinuxfdpiceabi)
145133
tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
146134
extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
147-
@@ -703,6 +708,9 @@ x86_64-*-elf* | x86_64-*-rtems*)
135+
@@ -715,6 +720,9 @@ x86_64-*-elf* | x86_64-*-rtems*)
148136
x86_64-*-fuchsia*)
149137
tmake_file="$tmake_file t-libgcc-pic"
150138
;;
@@ -155,7 +143,7 @@ index 50f000622..d1aa00f1a 100644
155143
tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
156144
md_unwind_header=i386/dragonfly-unwind.h
157145
diff --git a/libgcc/libgcov.h b/libgcc/libgcov.h
158-
index 7b0d367ec..2bce0a7e1 100644
146+
index 92df440d4..320f3b500 100644
159147
--- a/libgcc/libgcov.h
160148
+++ b/libgcc/libgcov.h
161149
@@ -44,6 +44,7 @@
@@ -167,7 +155,7 @@ index 7b0d367ec..2bce0a7e1 100644
167155
#if HAVE_SYS_MMAN_H
168156
#include <sys/mman.h>
169157
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
170-
index ff44d5ae0..8b41eb058 100644
158+
index b3269cb88..4187dba89 100644
171159
--- a/libstdc++-v3/crossconfig.m4
172160
+++ b/libstdc++-v3/crossconfig.m4
173161
@@ -136,6 +136,18 @@ case "${host}" in
@@ -190,7 +178,7 @@ index ff44d5ae0..8b41eb058 100644
190178
SECTION_FLAGS='-ffunction-sections -fdata-sections'
191179
AC_SUBST(SECTION_FLAGS)
192180
diff --git a/libtool.m4 b/libtool.m4
193-
index 17f8e5f30..5d29258d9 100644
181+
index b92e284d9..491d24c54 100644
194182
--- a/libtool.m4
195183
+++ b/libtool.m4
196184
@@ -2491,6 +2491,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi)
@@ -210,7 +198,7 @@ index 17f8e5f30..5d29258d9 100644
210198
netbsd*)
211199
version_type=sunos
212200
need_lib_prefix=no
213-
@@ -3090,6 +3100,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
201+
@@ -3109,6 +3119,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
214202
lt_cv_deplibs_check_method=pass_all
215203
;;
216204

@@ -222,5 +210,5 @@ index 17f8e5f30..5d29258d9 100644
222210
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
223211
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
224212
--
225-
2.25.1
213+
2.41.0
226214

0 commit comments

Comments
 (0)