Skip to content

Commit f6ea2ea

Browse files
mati865mati865
committed
Upgrade mingw-w64 on CI
1 parent 226b249 commit f6ea2ea

File tree

10 files changed

+34
-41
lines changed

10 files changed

+34
-41
lines changed

‎.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -418,29 +418,29 @@ jobs:
418418
os: windows-latest-xl
419419
- name: i686-mingw-1
420420
env:
421-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
421+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
422422
SCRIPT: make ci-mingw-subset-1
423423
NO_DOWNLOAD_CI_LLVM: 1
424424
CUSTOM_MINGW: 1
425425
os: windows-latest-xl
426426
- name: i686-mingw-2
427427
env:
428-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
428+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
429429
SCRIPT: make ci-mingw-subset-2
430430
NO_DOWNLOAD_CI_LLVM: 1
431431
CUSTOM_MINGW: 1
432432
os: windows-latest-xl
433433
- name: x86_64-mingw-1
434434
env:
435435
SCRIPT: make ci-mingw-subset-1
436-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
436+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
437437
NO_DOWNLOAD_CI_LLVM: 1
438438
CUSTOM_MINGW: 1
439439
os: windows-latest-xl
440440
- name: x86_64-mingw-2
441441
env:
442442
SCRIPT: make ci-mingw-subset-2
443-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
443+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
444444
NO_DOWNLOAD_CI_LLVM: 1
445445
CUSTOM_MINGW: 1
446446
os: windows-latest-xl
@@ -465,7 +465,7 @@ jobs:
465465
os: windows-latest-xl
466466
- name: dist-i686-mingw
467467
env:
468-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
468+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
469469
NO_DOWNLOAD_CI_LLVM: 1
470470
SCRIPT: python x.py dist bootstrap --include-default-paths
471471
CUSTOM_MINGW: 1
@@ -474,7 +474,7 @@ jobs:
474474
- name: dist-x86_64-mingw
475475
env:
476476
SCRIPT: python x.py dist bootstrap --include-default-paths
477-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
477+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
478478
NO_DOWNLOAD_CI_LLVM: 1
479479
CUSTOM_MINGW: 1
480480
DIST_REQUIRE_ALL_TOOLS: 1

‎src/ci/github-actions/ci.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -629,9 +629,7 @@ jobs:
629629

630630
- name: i686-mingw-1
631631
env:
632-
RUST_CONFIGURE_ARGS: >-
633-
--build=i686-pc-windows-gnu
634-
--set llvm.allow-old-toolchain
632+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
635633
SCRIPT: make ci-mingw-subset-1
636634
# We are intentionally allowing an old toolchain on this builder (and that's
637635
# incompatible with LLVM downloads today).
@@ -641,9 +639,7 @@ jobs:
641639

642640
- name: i686-mingw-2
643641
env:
644-
RUST_CONFIGURE_ARGS: >-
645-
--build=i686-pc-windows-gnu
646-
--set llvm.allow-old-toolchain
642+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
647643
SCRIPT: make ci-mingw-subset-2
648644
# We are intentionally allowing an old toolchain on this builder (and that's
649645
# incompatible with LLVM downloads today).
@@ -657,7 +653,6 @@ jobs:
657653
RUST_CONFIGURE_ARGS: >-
658654
--build=x86_64-pc-windows-gnu
659655
--enable-profiler
660-
--set llvm.allow-old-toolchain
661656
# We are intentionally allowing an old toolchain on this builder (and that's
662657
# incompatible with LLVM downloads today).
663658
NO_DOWNLOAD_CI_LLVM: 1
@@ -670,7 +665,6 @@ jobs:
670665
RUST_CONFIGURE_ARGS: >-
671666
--build=x86_64-pc-windows-gnu
672667
--enable-profiler
673-
--set llvm.allow-old-toolchain
674668
# We are intentionally allowing an old toolchain on this builder (and that's
675669
# incompatible with LLVM downloads today).
676670
NO_DOWNLOAD_CI_LLVM: 1
@@ -722,7 +716,6 @@ jobs:
722716
--build=i686-pc-windows-gnu
723717
--enable-full-tools
724718
--enable-profiler
725-
--set llvm.allow-old-toolchain
726719
# We are intentionally allowing an old toolchain on this builder (and that's
727720
# incompatible with LLVM downloads today).
728721
NO_DOWNLOAD_CI_LLVM: 1
@@ -738,7 +731,6 @@ jobs:
738731
--build=x86_64-pc-windows-gnu
739732
--enable-full-tools
740733
--enable-profiler
741-
--set llvm.allow-old-toolchain
742734
# We are intentionally allowing an old toolchain on this builder (and that's
743735
# incompatible with LLVM downloads today).
744736
NO_DOWNLOAD_CI_LLVM: 1

‎src/ci/scripts/install-mingw.sh

+2-21
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,15 @@
22
# If we need to download a custom MinGW, do so here and set the path
33
# appropriately.
44
#
5-
# Here we also do a pretty heinous thing which is to mangle the MinGW
6-
# installation we just downloaded. Currently, as of this writing, we're using
7-
# MinGW-w64 builds of gcc, and that's currently at 6.3.0. We use 6.3.0 as it
8-
# appears to be the first version which contains a fix for #40546, builds
9-
# randomly failing during LLVM due to ar.exe/ranlib.exe failures.
10-
#
11-
# Unfortunately, though, 6.3.0 *also* is the first version of MinGW-w64 builds
12-
# to contain a regression in gdb (#40184). As a result if we were to use the
13-
# gdb provided (7.11.1) then we would fail all debuginfo tests.
14-
#
15-
# In order to fix spurious failures (pretty high priority) we use 6.3.0. To
16-
# avoid disabling gdb tests we download an *old* version of gdb, specifically
17-
# that found inside the 6.2.0 distribution. We then overwrite the 6.3.0 gdb
18-
# with the 6.2.0 gdb to get tests passing.
19-
#
20-
# Note that we don't literally overwrite the gdb.exe binary because it appears
21-
# to just use gdborig.exe, so that's the binary we deal with instead.
22-
#
235
# Otherwise install MinGW through `pacman`
246

257
set -euo pipefail
268
IFS=$'\n\t'
279

2810
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
2911

30-
MINGW_ARCHIVE_32="i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z"
31-
MINGW_ARCHIVE_64="x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z"
12+
MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
13+
MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
3214

3315
if isWindows; then
3416
case "${CI_JOB_NAME}" in
@@ -66,7 +48,6 @@ if isWindows; then
6648

6749
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
6850
7z x -y mingw.7z > /dev/null
69-
curl -o "${mingw_dir}/bin/gdborig.exe" "${MIRRORS_BASE}/2017-04-20-${bits}bit-gdborig.exe"
7051
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
7152
fi
7253
fi

‎tests/debuginfo/embedded-visualizer.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// compile-flags:-g
22
// min-gdb-version: 8.1
33
// ignore-lldb
4+
// ignore-windows-gnu // emit_debug_gdb_scripts is disabled on Windows
45

56
// === CDB TESTS ==================================================================================
67

‎tests/debuginfo/numeric-types.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// compile-flags:-g
22

33
// min-gdb-version: 8.1
4+
// ignore-windows-gnu // emit_debug_gdb_scripts is disabled on Windows
45

56
// Tests the visualizations for `NonZero{I,U}{8,16,32,64,128,size}`, `Wrapping<T>` and
67
// `Atomic{Bool,I8,I16,I32,I64,Isize,U8,U16,U32,U64,Usize}` located in `libcore.natvis`.

‎tests/debuginfo/vec-slices.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ignore-windows
21
// min-lldb-version: 310
32

43
// compile-flags:-g

‎tests/run-make/native-link-modifier-bundle/Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ include ../../run-make-fulldeps/tools.mk
55

66
# We're using the llvm-nm instead of the system nm to ensure it is compatible
77
# with the LLVM bitcode generated by rustc.
8+
# Except on Windows where piping/IO redirection under MSYS2 is wonky with llvm-nm.
9+
ifndef IS_WINDOWS
810
NM = "$(LLVM_BIN_DIR)"/llvm-nm
11+
else
12+
NM = nm
13+
endif
914

1015
all: $(call NATIVE_STATICLIB,native-staticlib)
1116
# Build a staticlib and a rlib, the `native_func` symbol will be bundled into them

‎tests/run-make/raw-dylib-inline-cross-dylib/Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@
44

55
include ../../run-make-fulldeps/tools.mk
66

7+
# We'd be using the llvm-objdump instead of the system objdump to ensure compatibility
8+
# with the LLVM bitcode generated by rustc but on Windows piping/IO redirection under MSYS2 is wonky with llvm-objdump.
9+
OBJDUMP = objdump
10+
711
all:
812
$(RUSTC) --crate-type dylib --crate-name raw_dylib_test lib.rs -C prefer-dynamic
913
$(RUSTC) --crate-type dylib --crate-name raw_dylib_test_wrapper lib_wrapper.rs -C prefer-dynamic
1014
$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)" -C prefer-dynamic
1115
# Make sure we don't find an import to the functions we expect to be inlined.
12-
"$(LLVM_BIN_DIR)"/llvm-objdump -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function"
13-
"$(LLVM_BIN_DIR)"/llvm-objdump -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function_calls_inline"
16+
$(OBJDUMP) -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function"
17+
$(OBJDUMP) -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function_calls_inline"
1418
# Make sure we do find an import to the functions we expect to be imported.
15-
"$(LLVM_BIN_DIR)"/llvm-objdump -p $(TMPDIR)/driver.exe | $(CGREP) -e "library_function"
19+
$(OBJDUMP) -p $(TMPDIR)/driver.exe | $(CGREP) -e "library_function"
1620
$(call COMPILE_OBJ,"$(TMPDIR)"/extern_1.obj,extern_1.c)
1721
$(call COMPILE_OBJ,"$(TMPDIR)"/extern_2.obj,extern_2.c)
1822
ifdef IS_MSVC

‎tests/run-make/rlib-format-packed-bundled-libs-2/Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66

77
# We're using the llvm-nm instead of the system nm to ensure it is compatible
88
# with the LLVM bitcode generated by rustc.
9+
# Except on Windows where piping/IO redirection under MSYS2 is wonky with llvm-nm.
10+
ifndef IS_WINDOWS
911
NM = "$(LLVM_BIN_DIR)"/llvm-nm
12+
else
13+
NM = nm
14+
endif
1015

1116
all:
1217
# Build strange-named dep.

‎tests/run-make/rlib-format-packed-bundled-libs/Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66

77
# We're using the llvm-nm instead of the system nm to ensure it is compatible
88
# with the LLVM bitcode generated by rustc.
9+
# Except on Windows where piping/IO redirection under MSYS2 is wonky with llvm-nm.
10+
ifndef IS_WINDOWS
911
NM = "$(LLVM_BIN_DIR)"/llvm-nm
12+
else
13+
NM = nm
14+
endif
1015

1116
all: $(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
1217
$(RUSTC) rust_dep_up.rs --crate-type=rlib -Zpacked_bundled_libs

0 commit comments

Comments
 (0)