Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 791ed33

Browse files
Rollup merge of rust-lang#118068 - antoyo:subtree-update_cg_gcc_2023-11-17, r=cjgillot
subtree update cg_gcc 2023/11/17
2 parents 6388c0e + 326f241 commit 791ed33

File tree

14 files changed

+104
-41
lines changed

14 files changed

+104
-41
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ jobs:
9999
- name: Build
100100
run: |
101101
./y.sh prepare --only-libcore
102-
./y.sh build
103-
cargo test
102+
# TODO: remove --features master when it is back to the default.
103+
./y.sh build --features master
104+
# TODO: remove --features master when it is back to the default.
105+
cargo test --features master
104106
./clean_all.sh
105107
106108
- name: Prepare dependencies
@@ -121,7 +123,8 @@ jobs:
121123

122124
- name: Run tests
123125
run: |
124-
./test.sh --release --clean --build-sysroot ${{ matrix.commands }}
126+
# TODO: remove --features master when it is back to the default.
127+
./test.sh --features master --release --clean --build-sysroot ${{ matrix.commands }}
125128
126129
duplicates:
127130
runs-on: ubuntu-latest

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ jobs:
2121
libgccjit_version:
2222
- gcc: "libgccjit.so"
2323
artifacts_branch: "master"
24+
# TODO: switch back to --no-default-features in the case of libgccjit 12 when the default is to enable
25+
# master again.
26+
extra: "--features master"
2427
- gcc: "libgccjit_without_int128.so"
2528
artifacts_branch: "master-without-128bit-integers"
29+
extra: "--features master"
2630
- gcc: "libgccjit12.so"
2731
artifacts_branch: "gcc12"
28-
extra: "--no-default-features"
2932
# FIXME(antoyo): we need to set GCC_EXEC_PREFIX so that the linker can find the linker plugin.
3033
# Not sure why it's not found otherwise.
3134
env_extra: "TEST_FLAGS='-Cpanic=abort -Zpanic-abort-tests' GCC_EXEC_PREFIX=/usr/lib/gcc/"

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,10 @@ jobs:
114114
- name: Build
115115
run: |
116116
./y.sh prepare --only-libcore --cross
117-
./y.sh build --target-triple m68k-unknown-linux-gnu
118-
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test
117+
# TODO: remove --features master when it is back to the default.
118+
./y.sh build --target-triple m68k-unknown-linux-gnu --features master
119+
# TODO: remove --features master when it is back to the default.
120+
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test --features master
119121
./clean_all.sh
120122
121123
- name: Prepare dependencies
@@ -136,4 +138,5 @@ jobs:
136138

137139
- name: Run tests
138140
run: |
139-
./test.sh --release --clean --build-sysroot ${{ matrix.commands }}
141+
# TODO: remove --features master when it is back to the default.
142+
./test.sh --release --features master --clean --build-sysroot ${{ matrix.commands }}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ jobs:
7878
- name: Build
7979
run: |
8080
./y.sh prepare --only-libcore
81-
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot
82-
cargo test
81+
# TODO: remove --features master when it is back to the default.
82+
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot --features master
83+
# TODO: remove --features master when it is back to the default.
84+
cargo test --features master
8385
./clean_all.sh
8486
8587
- name: Prepare dependencies
@@ -102,4 +104,5 @@ jobs:
102104

103105
- name: Run tests
104106
run: |
105-
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }}
107+
# TODO: remove --features master when it is back to the default.
108+
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }} --features master

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ jobs:
9292
- name: Build
9393
run: |
9494
./y.sh prepare --only-libcore
95-
./y.sh build --release --release-sysroot
96-
cargo test
95+
# TODO: remove `--features master` when it is back to the default.
96+
./y.sh build --release --release-sysroot --features master
97+
# TODO: remove --features master when it is back to the default.
98+
cargo test --features master
9799
98100
- name: Clean
99101
if: ${{ !matrix.cargo_runner }}
@@ -111,12 +113,14 @@ jobs:
111113
uses: actions-rs/cargo@v1.0.3
112114
with:
113115
command: build
114-
args: --release
116+
# TODO: remove `--features master` when it is back to the default.
117+
args: --release --features master
115118

116119
- name: Run tests
117120
if: ${{ !matrix.cargo_runner }}
118121
run: |
119-
./test.sh --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore
122+
# TODO: remove `--features master` when it is back to the default.
123+
./test.sh --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore --features master
120124
121125
- name: Run stdarch tests
122126
if: ${{ !matrix.cargo_runner }}

compiler/rustc_codegen_gcc/Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ dependencies = [
7474
[[package]]
7575
name = "gccjit"
7676
version = "1.0.0"
77-
source = "git+https://github.com/antoyo/gccjit.rs#c52a218f5529321285b4489e5562a00e5428e033"
77+
source = "git+https://github.com/antoyo/gccjit.rs#6e290f25b1d1edab5ae9ace486fd2dc8c08d6421"
7878
dependencies = [
7979
"gccjit_sys",
8080
]
8181

8282
[[package]]
8383
name = "gccjit_sys"
8484
version = "0.0.1"
85-
source = "git+https://github.com/antoyo/gccjit.rs#c52a218f5529321285b4489e5562a00e5428e033"
85+
source = "git+https://github.com/antoyo/gccjit.rs#6e290f25b1d1edab5ae9ace486fd2dc8c08d6421"
8686
dependencies = [
8787
"libc",
8888
]

compiler/rustc_codegen_gcc/build_sysroot/build_sysroot.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ fi
2828
# Copy files to sysroot
2929
mkdir -p sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
3030
cp -r target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
31+
# Copy the source files to the sysroot (Rust for Linux needs this).
32+
source_dir=sysroot/lib/rustlib/src/rust
33+
mkdir -p $source_dir
34+
cp -r sysroot_src/library/ $source_dir

compiler/rustc_codegen_gcc/build_system/src/build.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ fn build_sysroot(
194194
copier,
195195
)?;
196196

197+
// Copy the source files to the sysroot (Rust for Linux needs this).
198+
let sysroot_src_path = "sysroot/lib/rustlib/src/rust";
199+
fs::create_dir_all(&sysroot_src_path)
200+
.map_err(|error| format!("Failed to create directory `{}`: {:?}", sysroot_src_path, error))?;
201+
run_command(&[&"cp", &"-r", &"sysroot_src/library/", &sysroot_src_path], None)?;
202+
197203
Ok(())
198204
}
199205

compiler/rustc_codegen_gcc/failing-ui-tests12.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ tests/ui/target-feature/missing-plusminus.rs
3838
tests/ui/sse2.rs
3939
tests/ui/codegen/issue-79865-llvm-miscompile.rs
4040
tests/ui/intrinsics/intrinsics-integer.rs
41+
tests/ui/std-backtrace.rs
42+
tests/ui/mir/alignment/packed.rs
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
From 7bcd24ec6d4a96121874cb1ae5a23ea274aeff34 Mon Sep 17 00:00:00 2001
1+
From a5663265f797a43c502915c356fe7899c16cee92 Mon Sep 17 00:00:00 2001
22
From: None <none@example.com>
3-
Date: Thu, 19 Oct 2023 13:12:51 -0400
3+
Date: Sat, 18 Nov 2023 10:50:36 -0500
44
Subject: [PATCH] [core] Disable portable-simd test
55

66
---
77
library/core/tests/lib.rs | 2 --
88
1 file changed, 2 deletions(-)
99

1010
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
11-
index 5814ed4..194ad4c 100644
11+
index d0a119c..76fdece 100644
1212
--- a/library/core/tests/lib.rs
1313
+++ b/library/core/tests/lib.rs
14-
@@ -90,7 +90,6 @@
14+
@@ -89,7 +89,6 @@
15+
#![feature(never_type)]
1516
#![feature(unwrap_infallible)]
16-
#![feature(pointer_byte_offsets)]
1717
#![feature(pointer_is_aligned)]
1818
-#![feature(portable_simd)]
1919
#![feature(ptr_metadata)]
2020
#![feature(lazy_cell)]
2121
#![feature(unsized_tuple_coercion)]
22-
@@ -157,7 +156,6 @@ mod pin;
22+
@@ -155,7 +154,6 @@ mod pin;
2323
mod pin_macro;
2424
mod ptr;
2525
mod result;
@@ -28,5 +28,5 @@ index 5814ed4..194ad4c 100644
2828
mod str;
2929
mod str_lossy;
3030
--
31-
2.42.0
31+
2.42.1
3232

0 commit comments

Comments
 (0)