@@ -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 \
0 commit comments