Skip to content

Commit b6576e3

Browse files
borsbors
committed
Auto merge of rust-lang#130948 - GuillaumeGomez:subtree-update, r=GuillaumeGomez
GCC backend subtree update We just finished the [last sync](rust-lang/rustc_codegen_gcc#556) so time to sync back. cc `@antoyo`
2 parents 1b6d674 + d0102fd commit b6576e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+943
-366
lines changed

‎compiler/rustc_codegen_gcc/.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
]
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040

4141
# `rustup show` installs from rust-toolchain.toml
4242
- name: Setup rust toolchain
@@ -113,13 +113,13 @@ jobs:
113113
duplicates:
114114
runs-on: ubuntu-latest
115115
steps:
116-
- uses: actions/checkout@v3
116+
- uses: actions/checkout@v4
117117
- run: python tools/check_intrinsics_duplicates.py
118118

119119
build_system:
120120
runs-on: ubuntu-latest
121121
steps:
122-
- uses: actions/checkout@v3
122+
- uses: actions/checkout@v4
123123
- name: Test build system
124124
run: |
125125
cd build_system

‎compiler/rustc_codegen_gcc/.github/workflows/failures.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
env_extra: "TEST_FLAGS='-Cpanic=abort -Zpanic-abort-tests' GCC_EXEC_PREFIX=/usr/lib/gcc/"
3232

3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535

3636
# `rustup show` installs from rust-toolchain.toml
3737
- name: Setup rust toolchain

‎compiler/rustc_codegen_gcc/.github/workflows/gcc12.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
]
3434

3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737

3838
# `rustup show` installs from rust-toolchain.toml
3939
- name: Setup rust toolchain

‎compiler/rustc_codegen_gcc/.github/workflows/m68k.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
]
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040

4141
# `rustup show` installs from rust-toolchain.toml
4242
- name: Setup rust toolchain
@@ -85,14 +85,14 @@ jobs:
8585
- name: Build sample project with target defined as JSON spec
8686
run: |
8787
./y.sh prepare --only-libcore --cross
88-
./y.sh build --sysroot --target-triple m68k-unknown-linux-gnu --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
88+
./y.sh build --sysroot --features compiler_builtins/no-f16-f128 --target-triple m68k-unknown-linux-gnu --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
8989
./y.sh cargo build --manifest-path=./tests/hello-world/Cargo.toml --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
9090
./y.sh clean all
9191
9292
- name: Build
9393
run: |
9494
./y.sh prepare --only-libcore --cross
95-
./y.sh build --sysroot --target-triple m68k-unknown-linux-gnu
95+
./y.sh build --sysroot --features compiler_builtins/no-f16-f128 --target-triple m68k-unknown-linux-gnu
9696
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test
9797
./y.sh clean all
9898
@@ -107,4 +107,4 @@ jobs:
107107

108108
- name: Run tests
109109
run: |
110-
./y.sh test --release --clean --build-sysroot ${{ matrix.commands }}
110+
./y.sh test --release --clean --build-sysroot --sysroot-features compiler_builtins/no-f16-f128 ${{ matrix.commands }}

‎compiler/rustc_codegen_gcc/.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
]
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828

2929
# `rustup show` installs from rust-toolchain.toml
3030
- name: Setup rust toolchain

‎compiler/rustc_codegen_gcc/.github/workflows/stdarch.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-24.04
1717

1818
strategy:
1919
fail-fast: false
@@ -24,7 +24,7 @@ jobs:
2424
]
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828

2929
# `rustup show` installs from rust-toolchain.toml
3030
- name: Setup rust toolchain
@@ -36,6 +36,13 @@ jobs:
3636
- name: Install packages
3737
run: sudo apt-get install ninja-build ripgrep
3838

39+
# TODO: remove when we have binutils version 2.43 in the repo.
40+
- name: Install more recent binutils
41+
run: |
42+
echo "deb http://archive.ubuntu.com/ubuntu oracular main universe" | sudo tee /etc/apt/sources.list.d/oracular-copies.list
43+
sudo apt-get update
44+
sudo apt-get install binutils
45+
3946
- name: Install Intel Software Development Emulator
4047
if: ${{ matrix.cargo_runner }}
4148
run: |
@@ -96,4 +103,5 @@ jobs:
96103
run: |
97104
# FIXME: these tests fail when the sysroot is compiled with LTO because of a missing symbol in proc-macro.
98105
# TODO: remove --skip test_mm512_stream_ps when stdarch is updated in rustc.
99-
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a --skip test_mm512_stream_ps
106+
# TODO: remove --skip test_tile_ when it's implemented.
107+
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features --cfg stdarch_intel_sde" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a --skip test_mm512_stream_ps --skip test_tile_

‎compiler/rustc_codegen_gcc/Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ dependencies = [
2828

2929
[[package]]
3030
name = "gccjit"
31-
version = "2.1.0"
31+
version = "2.2.0"
3232
source = "registry+https://github.com/rust-lang/crates.io-index"
33-
checksum = "62e0ba949ebee07c5cc21f02cb48f28f2c8db7fcbc15fdc5120476a6c43b4636"
33+
checksum = "4bb376e98c82d9284c3a17fc1d6bf9bc921055418950238d7a553c27a7e1f6ab"
3434
dependencies = [
3535
"gccjit_sys",
3636
]
3737

3838
[[package]]
3939
name = "gccjit_sys"
40-
version = "0.2.0"
40+
version = "0.3.0"
4141
source = "registry+https://github.com/rust-lang/crates.io-index"
42-
checksum = "a5bbf85e12c2593772329a9d4e8310271f6706e6045ce4f41b041dd34fba6603"
42+
checksum = "93b4b1be553b5df790bf25ca2a1d6add81727dc29f8d5c8742468ed306d621d1"
4343
dependencies = [
4444
"libc",
4545
]

‎compiler/rustc_codegen_gcc/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ master = ["gccjit/master"]
2222
default = ["master"]
2323

2424
[dependencies]
25-
gccjit = "2.1"
25+
gccjit = "2.2"
26+
#gccjit = { git = "https://github.com/rust-lang/gccjit.rs" }
27+
2628
# Local copy.
2729
#gccjit = { path = "../gccjit.rs" }
2830

‎compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.lock

+54-45
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.21.0"
7+
version = "0.22.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
9+
checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
1010
dependencies = [
1111
"compiler_builtins",
12-
"gimli",
12+
"gimli 0.29.0",
1313
"rustc-std-workspace-alloc",
1414
"rustc-std-workspace-core",
1515
]
@@ -52,7 +52,7 @@ dependencies = [
5252
name = "compiler_builtins"
5353
version = "0.1.118"
5454
source = "registry+https://github.com/rust-lang/crates.io-index"
55-
checksum = "f11973008a8cf741fe6d22f339eba21fd0ca81e2760a769ba8243ed6c21edd7e"
55+
checksum = "92afe7344b64cccf3662ca26d5d1c0828ab826f04206b97d856e3625e390e4b5"
5656
dependencies = [
5757
"rustc-std-workspace-core",
5858
]
@@ -97,9 +97,20 @@ dependencies = [
9797

9898
[[package]]
9999
name = "gimli"
100-
version = "0.28.1"
100+
version = "0.29.0"
101101
source = "registry+https://github.com/rust-lang/crates.io-index"
102-
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
102+
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
103+
dependencies = [
104+
"compiler_builtins",
105+
"rustc-std-workspace-alloc",
106+
"rustc-std-workspace-core",
107+
]
108+
109+
[[package]]
110+
name = "gimli"
111+
version = "0.30.0"
112+
source = "registry+https://github.com/rust-lang/crates.io-index"
113+
checksum = "e2e1d97fbe9722ba9bbd0c97051c2956e726562b61f86a25a4360398a40edfc9"
103114
dependencies = [
104115
"compiler_builtins",
105116
"rustc-std-workspace-alloc",
@@ -120,9 +131,9 @@ dependencies = [
120131

121132
[[package]]
122133
name = "hermit-abi"
123-
version = "0.3.9"
134+
version = "0.4.0"
124135
source = "registry+https://github.com/rust-lang/crates.io-index"
125-
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
136+
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
126137
dependencies = [
127138
"compiler_builtins",
128139
"rustc-std-workspace-alloc",
@@ -131,28 +142,28 @@ dependencies = [
131142

132143
[[package]]
133144
name = "libc"
134-
version = "0.2.153"
145+
version = "0.2.155"
135146
source = "registry+https://github.com/rust-lang/crates.io-index"
136-
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
147+
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
137148
dependencies = [
138149
"rustc-std-workspace-core",
139150
]
140151

141152
[[package]]
142153
name = "memchr"
143-
version = "2.7.2"
154+
version = "2.7.4"
144155
source = "registry+https://github.com/rust-lang/crates.io-index"
145-
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
156+
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
146157
dependencies = [
147158
"compiler_builtins",
148159
"rustc-std-workspace-core",
149160
]
150161

151162
[[package]]
152163
name = "miniz_oxide"
153-
version = "0.7.2"
164+
version = "0.7.4"
154165
source = "registry+https://github.com/rust-lang/crates.io-index"
155-
checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
166+
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
156167
dependencies = [
157168
"adler",
158169
"compiler_builtins",
@@ -162,9 +173,9 @@ dependencies = [
162173

163174
[[package]]
164175
name = "object"
165-
version = "0.32.2"
176+
version = "0.36.3"
166177
source = "registry+https://github.com/rust-lang/crates.io-index"
167-
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
178+
checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
168179
dependencies = [
169180
"compiler_builtins",
170181
"memchr",
@@ -205,9 +216,9 @@ dependencies = [
205216

206217
[[package]]
207218
name = "r-efi"
208-
version = "4.4.0"
219+
version = "4.5.0"
209220
source = "registry+https://github.com/rust-lang/crates.io-index"
210-
checksum = "c47196f636c4cc0634b73b0405323d177753c2e15e866952c64ea22902567a34"
221+
checksum = "e9e935efc5854715dfc0a4c9ef18dc69dee0ec3bf9cc3ab740db831c0fdd86a3"
211222
dependencies = [
212223
"compiler_builtins",
213224
"rustc-std-workspace-core",
@@ -226,9 +237,9 @@ dependencies = [
226237

227238
[[package]]
228239
name = "rustc-demangle"
229-
version = "0.1.23"
240+
version = "0.1.24"
230241
source = "registry+https://github.com/rust-lang/crates.io-index"
231-
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
242+
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
232243
dependencies = [
233244
"compiler_builtins",
234245
"rustc-std-workspace-core",
@@ -310,16 +321,14 @@ dependencies = [
310321
"core",
311322
"getopts",
312323
"libc",
313-
"panic_abort",
314-
"panic_unwind",
315324
"std",
316325
]
317326

318327
[[package]]
319328
name = "unicode-width"
320-
version = "0.1.12"
329+
version = "0.1.13"
321330
source = "registry+https://github.com/rust-lang/crates.io-index"
322-
checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
331+
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
323332
dependencies = [
324333
"compiler_builtins",
325334
"rustc-std-workspace-core",
@@ -339,12 +348,12 @@ dependencies = [
339348

340349
[[package]]
341350
name = "unwinding"
342-
version = "0.2.1"
351+
version = "0.2.2"
343352
source = "registry+https://github.com/rust-lang/crates.io-index"
344-
checksum = "37a19a21a537f635c16c7576f22d0f2f7d63353c1337ad4ce0d8001c7952a25b"
353+
checksum = "dc55842d0db6329a669d55a623c674b02d677b16bfb2d24857d4089d41eba882"
345354
dependencies = [
346355
"compiler_builtins",
347-
"gimli",
356+
"gimli 0.30.0",
348357
"rustc-std-workspace-core",
349358
]
350359

@@ -370,9 +379,9 @@ dependencies = [
370379

371380
[[package]]
372381
name = "windows-targets"
373-
version = "0.52.5"
382+
version = "0.52.6"
374383
source = "registry+https://github.com/rust-lang/crates.io-index"
375-
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
384+
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
376385
dependencies = [
377386
"windows_aarch64_gnullvm",
378387
"windows_aarch64_msvc",
@@ -386,48 +395,48 @@ dependencies = [
386395

387396
[[package]]
388397
name = "windows_aarch64_gnullvm"
389-
version = "0.52.5"
398+
version = "0.52.6"
390399
source = "registry+https://github.com/rust-lang/crates.io-index"
391-
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
400+
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
392401

393402
[[package]]
394403
name = "windows_aarch64_msvc"
395-
version = "0.52.5"
404+
version = "0.52.6"
396405
source = "registry+https://github.com/rust-lang/crates.io-index"
397-
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
406+
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
398407

399408
[[package]]
400409
name = "windows_i686_gnu"
401-
version = "0.52.5"
410+
version = "0.52.6"
402411
source = "registry+https://github.com/rust-lang/crates.io-index"
403-
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
412+
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
404413

405414
[[package]]
406415
name = "windows_i686_gnullvm"
407-
version = "0.52.5"
416+
version = "0.52.6"
408417
source = "registry+https://github.com/rust-lang/crates.io-index"
409-
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
418+
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
410419

411420
[[package]]
412421
name = "windows_i686_msvc"
413-
version = "0.52.5"
422+
version = "0.52.6"
414423
source = "registry+https://github.com/rust-lang/crates.io-index"
415-
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
424+
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
416425

417426
[[package]]
418427
name = "windows_x86_64_gnu"
419-
version = "0.52.5"
428+
version = "0.52.6"
420429
source = "registry+https://github.com/rust-lang/crates.io-index"
421-
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
430+
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
422431

423432
[[package]]
424433
name = "windows_x86_64_gnullvm"
425-
version = "0.52.5"
434+
version = "0.52.6"
426435
source = "registry+https://github.com/rust-lang/crates.io-index"
427-
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
436+
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
428437

429438
[[package]]
430439
name = "windows_x86_64_msvc"
431-
version = "0.52.5"
440+
version = "0.52.6"
432441
source = "registry+https://github.com/rust-lang/crates.io-index"
433-
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
442+
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

0 commit comments

Comments
 (0)