Skip to content

Commit d7d67d8

Browse files
cuvipercuviper
committed
ci: upgrade to crosstool-ng 1.25.0
1 parent 9c044d7 commit d7d67d8

33 files changed

+1635
-918
lines changed

‎src/ci/docker/README.md

+42-21
Original file line numberDiff line numberDiff line change
@@ -163,39 +163,44 @@ $category > $option = $value -- $comment
163163
For targets: `arm-unknown-linux-gnueabi`
164164
165165
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
166-
- Path and misc options > Patches origin = Bundled only
166+
- Path and misc options > Use a mirror = ENABLE
167+
- Path and misc options > Base URL = https://ci-mirrors.rust-lang.org/rustc
167168
- Target options > Target Architecture = arm
168169
- Target options > Architecture level = armv6 -- (+)
169170
- Target options > Floating point = software (no FPU) -- (\*)
170171
- Operating System > Target OS = linux
171172
- Operating System > Linux kernel version = 3.2.101
173+
- Binary utilities > Version of binutils = 2.32
172174
- C-library > glibc version = 2.17.0
173-
- C compiler > gcc version = 8.3.0
175+
- C compiler > gcc version = 8.5.0
174176
- C compiler > C++ = ENABLE -- to cross compile LLVM
175177
176178
### `arm-linux-gnueabihf.config`
177179
178180
For targets: `arm-unknown-linux-gnueabihf`
179181
180182
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
181-
- Path and misc options > Patches origin = Bundled only
183+
- Path and misc options > Use a mirror = ENABLE
184+
- Path and misc options > Base URL = https://ci-mirrors.rust-lang.org/rustc
182185
- Target options > Target Architecture = arm
183186
- Target options > Architecture level = armv6 -- (+)
184187
- Target options > Use specific FPU = vfp -- (+)
185188
- Target options > Floating point = hardware (FPU) -- (\*)
186189
- Target options > Default instruction set mode = arm -- (+)
187190
- Operating System > Target OS = linux
188191
- Operating System > Linux kernel version = 3.2.101
192+
- Binary utilities > Version of binutils = 2.32
189193
- C-library > glibc version = 2.17.0
190-
- C compiler > gcc version = 8.3.0
194+
- C compiler > gcc version = 8.5.0
191195
- C compiler > C++ = ENABLE -- to cross compile LLVM
192196
193197
### `armv7-linux-gnueabihf.config`
194198
195199
For targets: `armv7-unknown-linux-gnueabihf`
196200
197201
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
198-
- Path and misc options > Patches origin = Bundled only
202+
- Path and misc options > Use a mirror = ENABLE
203+
- Path and misc options > Base URL = https://ci-mirrors.rust-lang.org/rustc
199204
- Target options > Target Architecture = arm
200205
- Target options > Suffix to the arch-part = v7
201206
- Target options > Architecture level = armv7-a -- (+)
@@ -204,8 +209,9 @@ For targets: `armv7-unknown-linux-gnueabihf`
204209
- Target options > Default instruction set mode = thumb -- (\*)
205210
- Operating System > Target OS = linux
206211
- Operating System > Linux kernel version = 3.2.101
212+
- Binary utilities > Version of binutils = 2.32
207213
- C-library > glibc version = 2.17.0
208-
- C compiler > gcc version = 8.3.0
214+
- C compiler > gcc version = 8.5.0
209215
- C compiler > C++ = ENABLE -- to cross compile LLVM
210216
211217
(\*) These options have been selected to match the configuration of the arm
@@ -225,17 +231,16 @@ For targets: `aarch64-unknown-linux-gnu`
225231
- Target options > Bitness = 64-bit
226232
- Operating System > Target OS = linux
227233
- Operating System > Linux kernel version = 4.1.49
228-
- Binary utilities > Version of binutils = 2.32
234+
- Binary utilities > Version of binutils = 2.29.1
229235
- C-library > glibc version = 2.17 -- aarch64 support was introduced in this version
230-
- C compiler > gcc version = 8.3.0
236+
- C compiler > gcc version = 8.5.0
231237
- C compiler > C++ = ENABLE -- to cross compile LLVM
232238
233239
### `i586-linux-gnu.config`
234240
235241
For targets: `i586-unknown-linux-gnu`
236242
237243
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
238-
- Path and misc options > Patches origin = Bundled only
239244
- Target options > Target Architecture = x86
240245
- Target options > Architecture level = i586
241246
- Target options > Target CFLAGS = -Wa,-mrelax-relocations=no
@@ -244,7 +249,7 @@ For targets: `i586-unknown-linux-gnu`
244249
- Binary utilities > Version of binutils = 2.32
245250
- Binary utilities > binutils extra config = --enable-compressed-debug-sections=none -- (\*)
246251
- C-library > glibc version = 2.17.0
247-
- C compiler > gcc version = 8.3.0
252+
- C compiler > gcc version = 8.5.0
248253
- C compiler > C++ = ENABLE
249254
250255
(\*) Compressed debug is enabled by default for gas (assembly) on Linux/x86 targets,
@@ -265,10 +270,10 @@ For targets: `mips-unknown-linux-gnu`
265270
- Target options > Bitness = 32-bit
266271
- Target options > Architecture level = mips32r2
267272
- Operating System > Target OS = linux
268-
- Operating System > Linux kernel version = 4.4.174
273+
- Operating System > Linux kernel version = 4.4.302
269274
- Binary utilities > Version of binutils = 2.32
270275
- C-library > glibc version = 2.23
271-
- C compiler > gcc version = 8.3.0
276+
- C compiler > gcc version = 8.5.0
272277
- C compiler > gcc extra config = --with-fp-32=xx --with-odd-spreg-32=no
273278
- C compiler > C++ = ENABLE -- to cross compile LLVM
274279
@@ -287,10 +292,10 @@ For targets: `mipsel-unknown-linux-gnu`
287292
- Target options > Bitness = 32-bit
288293
- Target options > Architecture level = mips32r2
289294
- Operating System > Target OS = linux
290-
- Operating System > Linux kernel version = 4.4.174
295+
- Operating System > Linux kernel version = 4.4.302
291296
- Binary utilities > Version of binutils = 2.32
292297
- C-library > glibc version = 2.23
293-
- C compiler > gcc version = 8.3.0
298+
- C compiler > gcc version = 8.5.0
294299
- C compiler > gcc extra config = --with-fp-32=xx --with-odd-spreg-32=no
295300
- C compiler > C++ = ENABLE -- to cross compile LLVM
296301
@@ -309,10 +314,10 @@ For targets: `mips64-unknown-linux-gnuabi64`
309314
- Target options > Bitness = 64-bit
310315
- Target options > Architecture level = mips64r2
311316
- Operating System > Target OS = linux
312-
- Operating System > Linux kernel version = 4.4.174
317+
- Operating System > Linux kernel version = 4.4.302
313318
- Binary utilities > Version of binutils = 2.32
314319
- C-library > glibc version = 2.23
315-
- C compiler > gcc version = 8.3.0
320+
- C compiler > gcc version = 8.5.0
316321
- C compiler > C++ = ENABLE -- to cross compile LLVM
317322
318323
### `mips64el-linux-gnu.config`
@@ -330,10 +335,10 @@ For targets: `mips64el-unknown-linux-gnuabi64`
330335
- Target options > Bitness = 64-bit
331336
- Target options > Architecture level = mips64r2
332337
- Operating System > Target OS = linux
333-
- Operating System > Linux kernel version = 4.4.174
338+
- Operating System > Linux kernel version = 4.4.302
334339
- Binary utilities > Version of binutils = 2.32
335340
- C-library > glibc version = 2.23
336-
- C compiler > gcc version = 8.3.0
341+
- C compiler > gcc version = 8.5.0
337342
- C compiler > C++ = ENABLE -- to cross compile LLVM
338343
339344
### `powerpc-linux-gnu.config`
@@ -349,7 +354,7 @@ For targets: `powerpc-unknown-linux-gnu`
349354
- Operating System > Linux kernel version = 3.2.101
350355
- Binary utilities > Version of binutils = 2.30
351356
- C-library > glibc version = 2.17 -- ~RHEL7 glibc
352-
- C compiler > gcc version = 8.3.0
357+
- C compiler > gcc version = 8.5.0
353358
- C compiler > C++ = ENABLE -- to cross compile LLVM
354359
355360
### `powerpc64-linux-gnu.config`
@@ -367,11 +372,27 @@ For targets: `powerpc64-unknown-linux-gnu`
367372
- Operating System > Linux kernel version = 3.2.101
368373
- Binary utilities > Version of binutils = 2.32
369374
- C-library > glibc version = 2.17 -- ~RHEL7 glibc
370-
- C compiler > gcc version = 8.3.0
375+
- C compiler > gcc version = 8.5.0
371376
- C compiler > C++ = ENABLE -- to cross compile LLVM
372377
373378
(+) These CPU options match the configuration of the toolchains in RHEL6.
374379
380+
### `riscv64-unknown-linux-gnu.config`
381+
382+
For targets: `riscv64-unknown-linux-gnu`
383+
384+
- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
385+
- Path and misc options > Use a mirror = ENABLE
386+
- Path and misc options > Base URL = https://ci-mirrors.rust-lang.org/rustc
387+
- Target options > Target Architecture = riscv
388+
- Target options > Bitness = 64-bit
389+
- Operating System > Target OS = linux
390+
- Operating System > Linux kernel version = 4.20.17
391+
- Binary utilities > Version of binutils = 2.32
392+
- C-library > glibc version = 2.29
393+
- C compiler > gcc version = 8.5.0
394+
- C compiler > C++ = ENABLE -- to cross compile LLVM
395+
375396
### `s390x-linux-gnu.config`
376397
377398
For targets: `s390x-unknown-linux-gnu`
@@ -385,6 +406,6 @@ For targets: `s390x-unknown-linux-gnu`
385406
- Operating System > Linux kernel version = 3.2.101
386407
- Binary utilities > Version of binutils = 2.32
387408
- C-library > glibc version = 2.17 -- ~RHEL7 glibc
388-
- C compiler > gcc version = 8.3.0
409+
- C compiler > gcc version = 8.5.0
389410
- C compiler > gcc extra config = --with-arch=z10 -- LLVM's minimum support
390411
- C compiler > C++ = ENABLE -- to cross compile LLVM

‎src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
COPY scripts/crosstool-ng-1.24.sh /scripts/
7-
RUN sh /scripts/crosstool-ng-1.24.sh
6+
COPY scripts/crosstool-ng.sh /scripts/
7+
RUN sh /scripts/crosstool-ng.sh
88

99
COPY scripts/rustbuild-setup.sh /scripts/
1010
RUN sh /scripts/rustbuild-setup.sh

0 commit comments

Comments
 (0)