Skip to content

Commit a5a94a2

Browse files
committed
Drop end of life 8.x and update Dockerfile comments and configure flags
> https://gcc.gnu.org/pipermail/gcc-announce/2021/000167.html
1 parent d9fe78c commit a5a94a2

File tree

7 files changed

+39
-224
lines changed

7 files changed

+39
-224
lines changed

10/Dockerfile

Lines changed: 6 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

11/Dockerfile

Lines changed: 8 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

12/Dockerfile

Lines changed: 8 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8/Dockerfile

Lines changed: 0 additions & 155 deletions
This file was deleted.

9/Dockerfile

Lines changed: 6 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,24 @@ RUN set -ex; \
9595
extraConfigureArgs=''; \
9696
dpkgArch="$(dpkg --print-architecture)"; \
9797
case "$dpkgArch" in \
98-
# with-arch: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l491
99-
# with-float: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l416
100-
# with-mode: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l376
98+
# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L462-502
99+
# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L502-512
100+
# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L480
101101
armel) \
102-
extraConfigureArgs="$extraConfigureArgs --with-arch=armv4t --with-float=soft" \
102+
extraConfigureArgs="$extraConfigureArgs --with-arch=armv5te --with-float=soft" \
103103
;; \
104104
armhf) \
105+
{{ if env.version | tonumber >= 11 then ( -}}
106+
# https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1939379/comments/2
107+
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
108+
{{ ) else ( -}}
105109
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
110+
{{ ) end -}}
106111
;; \
107112
\
108-
# with-arch-32: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l590
113+
# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L598
109114
i386) \
110-
osVersionID="$(set -e; . /etc/os-release; echo "$VERSION_ID")"; \
111-
case "$osVersionID" in \
112-
8) extraConfigureArgs="$extraConfigureArgs --with-arch-32=i586" ;; \
113-
*) extraConfigureArgs="$extraConfigureArgs --with-arch-32=i686" ;; \
114-
esac; \
115-
# TODO for some reason, libgo + i386 fails on https://github.com/gcc-mirror/gcc/blob/gcc-7_1_0-release/libgo/runtime/proc.c#L154
116-
# "error unknown case for SETCONTEXT_CLOBBERS_TLS"
115+
extraConfigureArgs="$extraConfigureArgs --with-arch-32=i686"; \
117116
;; \
118117
esac; \
119118
\

versions.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
"lastModified": "2022-05-06",
2121
"version": "12.1.0"
2222
},
23-
"8": {
24-
"compression": "xz",
25-
"debian": "buster",
26-
"eol": "2022-11-14",
27-
"lastModified": "2021-05-14",
28-
"version": "8.5.0"
29-
},
3023
"9": {
3124
"compression": "xz",
3225
"debian": "buster",

0 commit comments

Comments
 (0)