From 6c1da921b1f2a6e48ab554b849d48a32bf87f425 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 13:55:54 -0800 Subject: [PATCH 01/14] BUmp to cc 80 --- .github/workflows/ci.yml | 7 +++---- Cargo.lock | 4 ++-- compiler/rustc_llvm/Cargo.toml | 2 +- src/ci/github-actions/ci.yml | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b0a33841ad99..6382cac1f2015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,10 +58,9 @@ jobs: - name: mingw-check-tidy os: ubuntu-20.04-4core-16gb env: {} - - name: x86_64-gnu-llvm-16 - env: - ENABLE_GCC_CODEGEN: "1" - os: ubuntu-20.04-16core-64gb + - name: arm-android + os: ubuntu-20.04-8core-32gb + env: {} - name: x86_64-gnu-tools os: ubuntu-20.04-16core-64gb env: {} diff --git a/Cargo.lock b/Cargo.lock index 47977a8850d6a..ecb1167b12b36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,9 +447,9 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" [[package]] name = "cfg-if" diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index 6598f1db86dac..f5fcda6be1341 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "=1.0.79" +cc = "1.0.80" # tidy-alphabetical-end diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 58d5dec9ba520..9fb42c9bc73fb 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -357,10 +357,8 @@ jobs: - name: mingw-check-tidy <<: *job-linux-4c - - name: x86_64-gnu-llvm-16 - env: - ENABLE_GCC_CODEGEN: "1" - <<: *job-linux-16c + - name: arm-android + <<: *job-linux-8c - name: x86_64-gnu-tools <<: *job-linux-16c From a556bb92ee8c116d97f60b8288397c2460e343d6 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 13:58:22 -0800 Subject: [PATCH 02/14] cc86 --- compiler/rustc_llvm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index f5fcda6be1341..4b8cc681d0d70 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "1.0.80" +cc = "1.0.86" # tidy-alphabetical-end From 4ed1cdfeec51b90144ab7f2cdf3e7519382c0117 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 13:59:31 -0800 Subject: [PATCH 03/14] cc83 --- compiler/rustc_llvm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index 4b8cc681d0d70..facde3b4f9145 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "1.0.86" +cc = "1.0.83" # tidy-alphabetical-end From 8cbdebfda28b1e4b65e3174ab220bdbbfdcf4ebc Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 14:03:10 -0800 Subject: [PATCH 04/14] fix lock --- Cargo.lock | 7 +++++-- compiler/rustc_llvm/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ecb1167b12b36..2b0a1372ac500 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,9 +447,12 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.88" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index facde3b4f9145..c5c986fd9409b 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "1.0.83" +cc = "=1.0.83" # tidy-alphabetical-end From 0cf6e0edc02c1233d86ba73051c913a851c820f1 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 14:04:45 -0800 Subject: [PATCH 05/14] actually 80 --- Cargo.lock | 4 ++-- compiler/rustc_llvm/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b0a1372ac500..831ee5edb18d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,9 +447,9 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" dependencies = [ "libc", ] diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index c5c986fd9409b..bbf7bb4e977c8 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "=1.0.83" +cc = "=1.0.80" # tidy-alphabetical-end From 38dd0b00c2df7c446cfb3431698d1296905506d7 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 14:09:41 -0800 Subject: [PATCH 06/14] only build arm --- .github/workflows/ci.yml | 9 --------- src/ci/github-actions/ci.yml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6382cac1f2015..7f11cb67c5db4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,18 +52,9 @@ jobs: strategy: matrix: include: - - name: mingw-check - os: ubuntu-20.04-4core-16gb - env: {} - - name: mingw-check-tidy - os: ubuntu-20.04-4core-16gb - env: {} - name: arm-android os: ubuntu-20.04-8core-32gb env: {} - - name: x86_64-gnu-tools - os: ubuntu-20.04-16core-64gb - env: {} defaults: run: shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 9fb42c9bc73fb..add42155d25a5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -351,18 +351,9 @@ jobs: strategy: matrix: include: - - name: mingw-check - <<: *job-linux-4c - - - name: mingw-check-tidy - <<: *job-linux-4c - - name: arm-android <<: *job-linux-8c - - name: x86_64-gnu-tools - <<: *job-linux-16c - auto: <<: *base-ci-job name: auto - ${{ matrix.name }} From ec5aaefe32291dbefa20f67c9aea9729f11f8452 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 14:34:23 -0800 Subject: [PATCH 07/14] text android fix branch --- Cargo.lock | 8 ++------ Cargo.toml | 1 + compiler/rustc_llvm/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 831ee5edb18d8..c80fc8c2e57ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,12 +447,8 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" -dependencies = [ - "libc", -] +version = "1.0.88" +source = "git+https://github.com/mariotaku/cc-rs?branch=feature/android-llvm-ar#98dd8bd0ed9749453f1d754779d571e77951b5db" [[package]] name = "cfg-if" diff --git a/Cargo.toml b/Cargo.toml index 2ea16c2266615..fda7d89eb350f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,6 +118,7 @@ strip = true rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } +cc = { git="https://github.com/mariotaku/cc-rs", branch="feature/android-llvm-ar" } [patch."https://github.com/rust-lang/rust-clippy"] clippy_lints = { path = "src/tools/clippy/clippy_lints" } diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index bbf7bb4e977c8..f5fcda6be1341 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "=1.0.80" +cc = "1.0.80" # tidy-alphabetical-end From 9c6cda7ea7a943ea6205d1c86d38f5b79d79c3fe Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 15:50:54 -0800 Subject: [PATCH 08/14] 83 without libc --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c80fc8c2e57ff..894358b7b39b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,8 +447,8 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.88" -source = "git+https://github.com/mariotaku/cc-rs?branch=feature/android-llvm-ar#98dd8bd0ed9749453f1d754779d571e77951b5db" +version = "1.0.83" +source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#60f707c0d2955c35f9f229ac4a32011fa277014b" [[package]] name = "cfg-if" diff --git a/Cargo.toml b/Cargo.toml index fda7d89eb350f..c71d6344ab1eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,7 +118,7 @@ strip = true rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } -cc = { git="https://github.com/mariotaku/cc-rs", branch="feature/android-llvm-ar" } +cc = { git="https://github.com/dpaoliello/cc-rs", branch="experiment" } [patch."https://github.com/rust-lang/rust-clippy"] clippy_lints = { path = "src/tools/clippy/clippy_lints" } From 256f2c15c6402d8b6822630815c338f0b83775a8 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 16:03:46 -0800 Subject: [PATCH 09/14] fix cc --- .github/workflows/ci.yml | 2 +- Cargo.lock | 2 +- src/ci/github-actions/ci.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f11cb67c5db4..495761d0ae05d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: matrix: include: - name: arm-android - os: ubuntu-20.04-8core-32gb + os: ubuntu-20.04-16core-64gb env: {} defaults: run: diff --git a/Cargo.lock b/Cargo.lock index 894358b7b39b2..f147e291ffafd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -448,7 +448,7 @@ version = "0.1.0" [[package]] name = "cc" version = "1.0.83" -source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#60f707c0d2955c35f9f229ac4a32011fa277014b" +source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#bb5da6b5948efe3557304b5ab9594adc703a24c5" [[package]] name = "cfg-if" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index add42155d25a5..eaeca17b62d11 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -352,7 +352,7 @@ jobs: matrix: include: - name: arm-android - <<: *job-linux-8c + <<: *job-linux-16c auto: <<: *base-ci-job From 9924f807385160aa688918b197f0c34e33df9611 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 16:40:27 -0800 Subject: [PATCH 10/14] BUmp to 84 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f147e291ffafd..e379059c778f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,8 +447,8 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.83" -source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#bb5da6b5948efe3557304b5ab9594adc703a24c5" +version = "1.0.84" +source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#879fe28a3801b024135fe70ed7b7ad19a47824e7" [[package]] name = "cfg-if" From 09747c750ebbc31f7c1c1496e8897ae20ca2b595 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 17:06:45 -0800 Subject: [PATCH 11/14] 53564e00498156c9be00361c4b039952cbf7ff59 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e379059c778f7..8e8e50629664a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,8 +447,8 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.84" -source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#879fe28a3801b024135fe70ed7b7ad19a47824e7" +version = "1.0.83" +source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#37dc04b53d41860af47fb7df6f3c0eb855e47e87" [[package]] name = "cfg-if" From 66bd26c08813256e939fc268741e93689574fb96 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Mon, 4 Mar 2024 10:24:51 -0800 Subject: [PATCH 12/14] 755e4fe6fbf4b86679aa07d02e0228315321d534 --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 8e8e50629664a..519974c734a97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -448,7 +448,7 @@ version = "0.1.0" [[package]] name = "cc" version = "1.0.83" -source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#37dc04b53d41860af47fb7df6f3c0eb855e47e87" +source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#a5150f113ee054247cc12f44d6ee3246e8f8a6d9" [[package]] name = "cfg-if" From 60f94793a31a95095587bcb7405966312cdda8e8 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Mon, 4 Mar 2024 10:51:40 -0800 Subject: [PATCH 13/14] 1.0.88 without 53564e00498156c9be00361c4b039952cbf7ff59 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 519974c734a97..aa332c1928405 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,8 +447,8 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.83" -source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#a5150f113ee054247cc12f44d6ee3246e8f8a6d9" +version = "1.0.88" +source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#38c7d5d95786b5e1c307ef47c17c9fe87cd82bc2" [[package]] name = "cfg-if" From f994f55ff2b7cc7106df1e96085b8d6108dcb2df Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Mon, 4 Mar 2024 11:44:08 -0800 Subject: [PATCH 14/14] Use proposed fix --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa332c1928405..4dc61af4716be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,8 +447,8 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.88" -source = "git+https://github.com/dpaoliello/cc-rs?branch=experiment#38c7d5d95786b5e1c307ef47c17c9fe87cd82bc2" +version = "1.0.89" +source = "git+https://github.com/dpaoliello/cc-rs?branch=fixarm#ec3050366f1eb572cd227248a1cf87de64dae7bd" [[package]] name = "cfg-if" diff --git a/Cargo.toml b/Cargo.toml index c71d6344ab1eb..bb51aa4da7f52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,7 +118,7 @@ strip = true rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } -cc = { git="https://github.com/dpaoliello/cc-rs", branch="experiment" } +cc = { git="https://github.com/dpaoliello/cc-rs", branch="fixarm" } [patch."https://github.com/rust-lang/rust-clippy"] clippy_lints = { path = "src/tools/clippy/clippy_lints" }