Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2e53675

Browse files
committed
Auto merge of #144222 - Kobzol:stdarch-push, r=folkertdev
stdarch subtree update Subtree update of `stdarch` to rust-lang/stdarch@5531955. Created using https://github.com/rust-lang/josh-sync. I saw that there were non-trivial changes made to `std_detect` in `stdarch` recently. So I want to get them merged here before we move forward with #143412. r? `@folkertdev`
2 parents 35487a2 + 9b7d31c commit 2e53675

File tree

72 files changed

+4642
-5042
lines changed

Some content is hidden

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

72 files changed

+4642
-5042
lines changed

‎library/stdarch/.github/workflows/main.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,28 @@ jobs:
255255
env:
256256
TARGET: ${{ matrix.target.tuple }}
257257

258+
# Check that the generated files agree with the checked-in versions.
259+
check-stdarch-gen:
260+
needs: [style]
261+
name: Check stdarch-gen-{arm, loongarch} output
262+
runs-on: ubuntu-latest
263+
steps:
264+
- uses: actions/checkout@v4
265+
- name: Install Rust
266+
run: rustup update nightly && rustup default nightly && rustup component add rustfmt
267+
- name: Check arm spec
268+
run: |
269+
cargo run --bin=stdarch-gen-arm --release -- crates/stdarch-gen-arm/spec
270+
git diff --exit-code
271+
- name: Check lsx.spec
272+
run: |
273+
cargo run --bin=stdarch-gen-loongarch --release -- crates/stdarch-gen-loongarch/lsx.spec
274+
git diff --exit-code
275+
- name: Check lasx.spec
276+
run: |
277+
cargo run --bin=stdarch-gen-loongarch --release -- crates/stdarch-gen-loongarch/lasx.spec
278+
git diff --exit-code
279+
258280
build-std-detect:
259281
needs: [style]
260282
name: Build std_detect
@@ -271,6 +293,7 @@ jobs:
271293
- verify
272294
- test
273295
- build-std-detect
296+
- check-stdarch-gen
274297
runs-on: ubuntu-latest
275298
# We need to ensure this job does *not* get skipped if its dependencies fail,
276299
# because a skipped job is considered a success by GitHub. So we have to
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Perform a subtree sync (pull) using the josh-sync tool once every few days (or on demand).
2+
name: rustc-pull
3+
4+
on:
5+
workflow_dispatch:
6+
schedule:
7+
# Run at 04:00 UTC every Monday and Thursday
8+
- cron: '0 4 * * 1,4'
9+
10+
jobs:
11+
pull:
12+
if: github.repository == 'rust-lang/stdarch'
13+
uses: rust-lang/josh-sync/.github/workflows/rustc-pull.yml@main
14+
with:
15+
# https://rust-lang.zulipchat.com/#narrow/channel/208962-t-libs.2Fstdarch/topic/Subtree.20sync.20automation/with/528461782
16+
zulip-stream-id: 208962
17+
zulip-bot-email: "stdarch-ci-bot@rust-lang.zulipchat.com"
18+
pr-base-branch: master
19+
branch-name: rustc-pull
20+
secrets:
21+
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}
22+
token: ${{ secrets.GITHUB_TOKEN }}

‎library/stdarch/Cargo.lock‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,26 @@ version = "0.1.0"
7373
dependencies = [
7474
"proc-macro2",
7575
"quote",
76-
"syn 2.0.102",
76+
"syn 2.0.104",
7777
]
7878

7979
[[package]]
8080
name = "autocfg"
81-
version = "1.4.0"
81+
version = "1.5.0"
8282
source = "registry+https://github.com/rust-lang/crates.io-index"
83-
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
83+
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
84+
85+
[[package]]
86+
name = "bitflags"
87+
version = "2.9.1"
88+
source = "registry+https://github.com/rust-lang/crates.io-index"
89+
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
8490

8591
[[package]]
8692
name = "cc"
87-
version = "1.2.26"
93+
version = "1.2.30"
8894
source = "registry+https://github.com/rust-lang/crates.io-index"
89-
checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac"
95+
checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
9096
dependencies = [
9197
"shlex",
9298
]
@@ -99,19 +105,19 @@ checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
99105

100106
[[package]]
101107
name = "clap"
102-
version = "4.5.40"
108+
version = "4.5.41"
103109
source = "registry+https://github.com/rust-lang/crates.io-index"
104-
checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
110+
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
105111
dependencies = [
106112
"clap_builder",
107113
"clap_derive",
108114
]
109115

110116
[[package]]
111117
name = "clap_builder"
112-
version = "4.5.40"
118+
version = "4.5.41"
113119
source = "registry+https://github.com/rust-lang/crates.io-index"
114-
checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
120+
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
115121
dependencies = [
116122
"anstream",
117123
"anstyle",
@@ -121,14 +127,14 @@ dependencies = [
121127

122128
[[package]]
123129
name = "clap_derive"
124-
version = "4.5.40"
130+
version = "4.5.41"
125131
source = "registry+https://github.com/rust-lang/crates.io-index"
126-
checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
132+
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
127133
dependencies = [
128134
"heck",
129135
"proc-macro2",
130136
"quote",
131-
"syn 2.0.102",
137+
"syn 2.0.104",
132138
]
133139

134140
[[package]]
@@ -338,9 +344,9 @@ dependencies = [
338344

339345
[[package]]
340346
name = "indexmap"
341-
version = "2.9.0"
347+
version = "2.10.0"
342348
source = "registry+https://github.com/rust-lang/crates.io-index"
343-
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
349+
checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
344350
dependencies = [
345351
"equivalent",
346352
"hashbrown 0.15.4",
@@ -403,9 +409,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
403409

404410
[[package]]
405411
name = "libc"
406-
version = "0.2.172"
412+
version = "0.2.174"
407413
source = "registry+https://github.com/rust-lang/crates.io-index"
408-
checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
414+
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
409415

410416
[[package]]
411417
name = "linked-hash-map"
@@ -624,7 +630,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
624630
dependencies = [
625631
"proc-macro2",
626632
"quote",
627-
"syn 2.0.102",
633+
"syn 2.0.104",
628634
]
629635

630636
[[package]]
@@ -685,7 +691,7 @@ version = "0.1.0"
685691
dependencies = [
686692
"proc-macro2",
687693
"quote",
688-
"syn 2.0.102",
694+
"syn 2.0.104",
689695
]
690696

691697
[[package]]
@@ -703,7 +709,6 @@ name = "stdarch-gen-arm"
703709
version = "0.1.0"
704710
dependencies = [
705711
"itertools",
706-
"lazy_static",
707712
"proc-macro2",
708713
"quote",
709714
"regex",
@@ -727,7 +732,6 @@ dependencies = [
727732
"assert-instr-macro",
728733
"cc",
729734
"cfg-if",
730-
"lazy_static",
731735
"rustc-demangle",
732736
"simd-test-macro",
733737
"wasmprinter",
@@ -742,7 +746,7 @@ dependencies = [
742746
"quote",
743747
"serde",
744748
"serde_json",
745-
"syn 2.0.102",
749+
"syn 2.0.104",
746750
]
747751

748752
[[package]]
@@ -780,9 +784,9 @@ dependencies = [
780784

781785
[[package]]
782786
name = "syn"
783-
version = "2.0.102"
787+
version = "2.0.104"
784788
source = "registry+https://github.com/rust-lang/crates.io-index"
785-
checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
789+
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
786790
dependencies = [
787791
"proc-macro2",
788792
"quote",
@@ -834,21 +838,23 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
834838

835839
[[package]]
836840
name = "wasmparser"
837-
version = "0.113.3"
841+
version = "0.235.0"
838842
source = "registry+https://github.com/rust-lang/crates.io-index"
839-
checksum = "286049849b5a5bd09a8773171be96824afabffc7cc3df6caaf33a38db6cd07ae"
843+
checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
840844
dependencies = [
841-
"indexmap 2.9.0",
845+
"bitflags",
846+
"indexmap 2.10.0",
842847
"semver",
843848
]
844849

845850
[[package]]
846851
name = "wasmprinter"
847-
version = "0.2.67"
852+
version = "0.235.0"
848853
source = "registry+https://github.com/rust-lang/crates.io-index"
849-
checksum = "f6615a5587149e753bf4b93f90fa3c3f41c88597a7a2da72879afcabeda9648f"
854+
checksum = "75aa8e9076de6b9544e6dab4badada518cca0bf4966d35b131bbd057aed8fa0a"
850855
dependencies = [
851856
"anyhow",
857+
"termcolor",
852858
"wasmparser",
853859
]
854860

@@ -945,20 +951,20 @@ dependencies = [
945951

946952
[[package]]
947953
name = "zerocopy"
948-
version = "0.8.25"
954+
version = "0.8.26"
949955
source = "registry+https://github.com/rust-lang/crates.io-index"
950-
checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
956+
checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
951957
dependencies = [
952958
"zerocopy-derive",
953959
]
954960

955961
[[package]]
956962
name = "zerocopy-derive"
957-
version = "0.8.25"
963+
version = "0.8.26"
958964
source = "registry+https://github.com/rust-lang/crates.io-index"
959-
checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
965+
checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
960966
dependencies = [
961967
"proc-macro2",
962968
"quote",
963-
"syn 2.0.102",
969+
"syn 2.0.104",
964970
]

‎library/stdarch/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ members = [
55
"examples",
66
]
77
exclude = [
8-
"crates/wasm-assert-instr-tests"
8+
"crates/wasm-assert-instr-tests",
9+
"rust_programs",
910
]
1011

1112
[profile.release]

‎library/stdarch/ci/docker/aarch64-unknown-linux-gnu/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:25.04
1+
FROM ubuntu:25.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
g++ \
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang-19 \
13+
clang \
1414
lld
1515

1616
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \

‎library/stdarch/ci/docker/aarch64_be-unknown-linux-gnu/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:25.04
1+
FROM ubuntu:25.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc \
@@ -9,15 +9,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
qemu-user \
1010
make \
1111
file \
12-
clang-19 \
12+
clang \
1313
curl \
1414
xz-utils \
1515
lld
1616

17-
ENV TOOLCHAIN="arm-gnu-toolchain-14.2.rel1-x86_64-aarch64_be-none-linux-gnu"
17+
ENV TOOLCHAIN="arm-gnu-toolchain-14.3.rel1-x86_64-aarch64_be-none-linux-gnu"
1818

1919
# Download the aarch64_be gcc toolchain
20-
RUN curl -L "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/${TOOLCHAIN}.tar.xz" -o "${TOOLCHAIN}.tar.xz"
20+
RUN curl -L "https://developer.arm.com/-/media/Files/downloads/gnu/14.3.rel1/binrel/${TOOLCHAIN}.tar.xz" -o "${TOOLCHAIN}.tar.xz"
2121
RUN tar -xvf "${TOOLCHAIN}.tar.xz"
2222
RUN mkdir /toolchains && mv "./${TOOLCHAIN}" /toolchains
2323

‎library/stdarch/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:25.04
1+
FROM ubuntu:25.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
ca-certificates \

‎library/stdarch/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang-19 \
13+
clang \
1414
lld
1515
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
1616
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -cpu max -L /usr/arm-linux-gnueabihf" \

‎library/stdarch/ci/docker/i586-unknown-linux-gnu/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:25.04
1+
FROM ubuntu:25.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc-multilib \
44
libc6-dev \

‎library/stdarch/ci/docker/i686-unknown-linux-gnu/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:25.04
1+
FROM ubuntu:25.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc-multilib \
44
libc6-dev \

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /