Skip to content

Commit bd076c3

Browse files
Merge commit '3187d32079b817522cc17413ec9185b130daf693' into subtree-update
1 parent 3862f62 commit bd076c3

Some content is hidden

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

42 files changed

+943
-365
lines changed

.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

.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

.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

.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 }}

.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

.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_

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

build_system/build_sysroot/Cargo.lock

+54-45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)