Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -2,7 +2,7 @@ variables:
    2 2 
       GIT_SSL_NO_VERIFY: "1"
    3 3
    4 4 
       # Commit of ghc/ci-images repository from which to pull Docker images
    5 
    -  DOCKER_REV: 14b23867eebc6d5f43e79dab32304175e2416797
    5 
    +  DOCKER_REV: 8f318609d86acfbf3f0cc6a05784e14ba259080d
    6 6
    7 7 
       # Sequential version number of all cached things.
    8 8 
       # Bump to invalidate GitLab CI cache.

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -1361,7 +1361,7 @@ cross_jobs = [
    1361 1361
    1362 1362 
         makeWineArmJobs =
    1363 1363 
           let
    1364 
    -        llvm_path = "C:/msys64/opt/llvm-mingw-windows/bin"
    1364 
    +        llvm_path = "C:/msys64/opt/ghc-bootstrap/mingw/bin"
    1365 1365 
             llvm_prefix = llvm_path ++ "/aarch64-w64-mingw32-"
    1366 1366 
             exe_suffix = ".exe"
    1367 1367 
             -- See Note [Windows Toolchain Standard Library Options]

  • .gitlab/jobs.yaml
    ... ... @@ -530,37 +530,37 @@
    530 530 
           "aarch64-linux"
    531 531 
         ],
    532 532 
         "variables": {
    533 
    -      "AR": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ar.exe",
    533 
    +      "AR": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-llvm-ar.exe",
    534 534 
           "BIGNUM_BACKEND": "native",
    535 535 
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build",
    536 536 
           "BUILD_FLAVOUR": "validate",
    537 
    -      "CC": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang",
    538 
    -      "CC_STAGE0": "C:/msys64/opt/llvm-mingw-windows/bin/x86_64-w64-mingw32-clang",
    539 
    -      "CFLAGS": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    537 
    +      "CC": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-clang",
    538 
    +      "CC_STAGE0": "C:/msys64/opt/ghc-bootstrap/mingw/bin/x86_64-w64-mingw32-clang",
    539 
    +      "CFLAGS": "-fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    540 540 
           "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check --build=x86_64-unknown-mingw32 --host=x86_64-unknown-mingw32",
    541 
    -      "CONF_CC_OPTS_STAGE0": "--target=x86_64-unknown-mingw32 -fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    542 
    -      "CONF_CC_OPTS_STAGE1": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    543 
    -      "CONF_CC_OPTS_STAGE2": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    541 
    +      "CONF_CC_OPTS_STAGE0": "--target=x86_64-unknown-mingw32 -fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    542 
    +      "CONF_CC_OPTS_STAGE1": "-fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    543 
    +      "CONF_CC_OPTS_STAGE2": "-fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    544 544 
           "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine",
    545 545 
           "CROSS_TARGET": "aarch64-unknown-mingw32",
    546 
    -      "CXX": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang++",
    547 
    -      "DLLTOOL": "C:/msys64/opt/llvm-mingw-windows/bin/dlltool.exe",
    546 
    +      "CXX": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-clang++",
    547 
    +      "DLLTOOL": "C:/msys64/opt/ghc-bootstrap/mingw/bin/dlltool.exe",
    548 548 
           "HADRIAN_ARGS": "--docs=none",
    549 549 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    550 
    -      "LD": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-ld",
    551 
    -      "LLVMAS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang",
    550 
    +      "LD": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-ld",
    551 
    +      "LLVMAS": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-clang",
    552 552 
           "MergeObjsCmd": "",
    553 
    -      "NM": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-nm.exe",
    554 
    -      "OBJCOPY": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objcopy",
    555 
    -      "OBJDUMP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objdump",
    556 
    -      "RANLIB": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ranlib.exe",
    553 
    +      "NM": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-nm.exe",
    554 
    +      "OBJCOPY": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-objcopy",
    555 
    +      "OBJDUMP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-objdump",
    556 
    +      "RANLIB": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-llvm-ranlib.exe",
    557 557 
           "RUNTEST_ARGS": "",
    558 
    -      "SIZE": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-size",
    559 
    -      "STRINGS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strings",
    560 
    -      "STRIP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strip",
    558 
    +      "SIZE": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-size",
    559 
    +      "STRINGS": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strings",
    560 
    +      "STRIP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strip",
    561 561 
           "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build",
    562 562 
           "TOOLCHAIN_SOURCE": "env",
    563 
    -      "WindresCmd": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-windres"
    563 
    +      "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres"
    564 564 
         }
    565 565 
       },
    566 566 
       "i386-linux-alpine3_20-validate": {
    ... ... @@ -1287,37 +1287,37 @@
    1287 1287 
           "aarch64-linux"
    1288 1288 
         ],
    1289 1289 
         "variables": {
    1290 
    -      "AR": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ar.exe",
    1290 
    +      "AR": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-llvm-ar.exe",
    1291 1291 
           "BIGNUM_BACKEND": "native",
    1292 1292 
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build",
    1293 1293 
           "BUILD_FLAVOUR": "validate",
    1294 
    -      "CC": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang",
    1295 
    -      "CC_STAGE0": "C:/msys64/opt/llvm-mingw-windows/bin/x86_64-w64-mingw32-clang",
    1296 
    -      "CFLAGS": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1294 
    +      "CC": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-clang",
    1295 
    +      "CC_STAGE0": "C:/msys64/opt/ghc-bootstrap/mingw/bin/x86_64-w64-mingw32-clang",
    1296 
    +      "CFLAGS": "-fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1297 1297 
           "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check --build=x86_64-unknown-mingw32 --host=x86_64-unknown-mingw32",
    1298 
    -      "CONF_CC_OPTS_STAGE0": "--target=x86_64-unknown-mingw32 -fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1299 
    -      "CONF_CC_OPTS_STAGE1": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1300 
    -      "CONF_CC_OPTS_STAGE2": "-fuse-ld=C:/msys64/opt/llvm-mingw-windows/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1298 
    +      "CONF_CC_OPTS_STAGE0": "--target=x86_64-unknown-mingw32 -fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1299 
    +      "CONF_CC_OPTS_STAGE1": "-fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1300 
    +      "CONF_CC_OPTS_STAGE2": "-fuse-ld=C:/msys64/opt/ghc-bootstrap/mingw/bin/ld.lld --rtlib=compiler-rt -D_UCRT",
    1301 1301 
           "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine",
    1302 1302 
           "CROSS_TARGET": "aarch64-unknown-mingw32",
    1303 
    -      "CXX": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang++",
    1304 
    -      "DLLTOOL": "C:/msys64/opt/llvm-mingw-windows/bin/dlltool.exe",
    1303 
    +      "CXX": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-clang++",
    1304 
    +      "DLLTOOL": "C:/msys64/opt/ghc-bootstrap/mingw/bin/dlltool.exe",
    1305 1305 
           "HADRIAN_ARGS": "--docs=none",
    1306 1306 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    1307 
    -      "LD": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-ld",
    1308 
    -      "LLVMAS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-clang",
    1307 
    +      "LD": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-ld",
    1308 
    +      "LLVMAS": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-clang",
    1309 1309 
           "MergeObjsCmd": "",
    1310 
    -      "NM": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-nm.exe",
    1311 
    -      "OBJCOPY": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objcopy",
    1312 
    -      "OBJDUMP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-objdump",
    1313 
    -      "RANLIB": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-llvm-ranlib.exe",
    1310 
    +      "NM": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-nm.exe",
    1311 
    +      "OBJCOPY": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-objcopy",
    1312 
    +      "OBJDUMP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-objdump",
    1313 
    +      "RANLIB": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-llvm-ranlib.exe",
    1314 1314 
           "RUNTEST_ARGS": "",
    1315 
    -      "SIZE": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-size",
    1316 
    -      "STRINGS": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strings",
    1317 
    -      "STRIP": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-strip",
    1315 
    +      "SIZE": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-size",
    1316 
    +      "STRINGS": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strings",
    1317 
    +      "STRIP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strip",
    1318 1318 
           "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build",
    1319 1319 
           "TOOLCHAIN_SOURCE": "env",
    1320 
    -      "WindresCmd": "C:/msys64/opt/llvm-mingw-windows/bin/aarch64-w64-mingw32-windres",
    1320 
    +      "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres",
    1321 1321 
           "XZ_OPT": "-9"
    1322 1322 
         }
    1323 1323 
       },

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help