Skip to content

Commit b2a2e18

Browse files
committed
Merge branch 'master' into sync_from_rust_2026_02_13
2 parents 293e950 + 1920fb1 commit b2a2e18

35 files changed

+1813
-1676
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
],
1919
"ignorePaths": [
2020
"src/intrinsic/archs.rs",
21+
"src/intrinsic/old_archs.rs",
2122
"src/intrinsic/llvm.rs"
2223
],
2324
"ignoreRegExpList": [

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ jobs:
113113
git config --global user.name "User"
114114
./y.sh prepare
115115
116+
- name: Add more failing tests for GCC without 128-bit integers support
117+
if: ${{ matrix.libgccjit_version.gcc == 'gcc-15-without-int128.deb' }}
118+
run: cat tests/failing-ui-tests-without-128bit-integers.txt >> tests/failing-ui-tests.txt
119+
116120
- name: Run tests
117121
run: |
118122
./y.sh test --release --clean --build-sysroot ${{ matrix.commands }}

.github/workflows/m68k.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
./y.sh prepare --only-libcore --cross
8585
./y.sh build --sysroot --target-triple m68k-unknown-linux-gnu --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
86-
CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ./y.sh cargo build --manifest-path=./tests/hello-world/Cargo.toml --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
86+
CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ./y.sh cargo build -Zjson-target-spec --manifest-path=./tests/hello-world/Cargo.toml --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
8787
./y.sh clean all
8888
8989
- name: Build

Cargo.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ dependencies = [
5656

5757
[[package]]
5858
name = "gccjit"
59-
version = "3.1.1"
59+
version = "3.3.0"
6060
source = "registry+https://github.com/rust-lang/crates.io-index"
61-
checksum = "ff80f4d6d0749eab3a69122210b3a1fdd52edb6162781aadd7c4842e26983683"
61+
checksum = "26b73d18b642ce16378af78f89664841d7eeafa113682ff5d14573424eb0232a"
6262
dependencies = [
6363
"gccjit_sys",
6464
]
6565

6666
[[package]]
6767
name = "gccjit_sys"
68-
version = "1.1.2"
68+
version = "1.3.0"
6969
source = "registry+https://github.com/rust-lang/crates.io-index"
70-
checksum = "4f81d901767ddba371a619fa9bba657066a4d3c5607ee69bbb557c1c5ba9bf85"
70+
checksum = "ee689456c013616942d5aef9a84d613cefcc3b335340d036f3650fc1a7459e15"
7171
dependencies = [
7272
"libc",
7373
]

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ default = ["master"]
2424
[dependencies]
2525
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
2626
tempfile = "3.20"
27-
gccjit = { version = "3.1.1", features = ["dlopen"] }
27+
gccjit = { version = "3.3.0", features = ["dlopen"] }
2828
#gccjit = { git = "https://github.com/rust-lang/gccjit.rs", branch = "error-dlopen", features = ["dlopen"] }
2929

3030
# Local copy.

Readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ The default configuration (see below in the [Quick start](#quick-start) section)
4545
./y.sh test --release
4646
```
4747

48-
If don't need to test GCC patches you wrote in our GCC fork, then the default configuration should
48+
If you don't need to test GCC patches you wrote in our GCC fork, then the default configuration should
4949
be all you need. You can update the `rustc_codegen_gcc` without worrying about GCC.
5050

5151
### Building with your own GCC version
5252

53-
If you wrote a patch for GCC and want to test it without this backend, you will need
53+
If you wrote a patch for GCC and want to test it with this backend, you will need
5454
to do a few more things.
5555

5656
To build it (most of these instructions come from [here](https://gcc.gnu.org/onlinedocs/jit/internals/index.html), so don't hesitate to take a look there if you encounter an issue):
@@ -127,7 +127,7 @@ You have to run these commands, in the corresponding order:
127127
$ ./y.sh prepare
128128
$ ./y.sh build --sysroot
129129
```
130-
To check if all is working correctly, run:
130+
To check if all is working correctly, run:
131131

132132
```bash
133133
$ ./y.sh cargo build --manifest-path tests/hello-world/Cargo.toml

_typos.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ seh = "seh"
66
typ = "typ"
77

88
[files]
9-
extend-exclude = ["src/intrinsic/archs.rs"]
9+
extend-exclude = ["src/intrinsic/archs.rs", "src/intrinsic/old_archs.rs"]

build_system/src/build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
141141
}
142142

143143
let mut args: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &"build", &"--target", &config.target];
144+
if config.target.ends_with(".json") {
145+
args.push(&"-Zjson-target-spec");
146+
}
147+
144148
for feature in &config.features {
145149
args.push(&"--features");
146150
args.push(feature);

build_system/src/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,10 +679,10 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
679679
create_dir(projects_path)?;
680680

681681
let nb_parts = args.nb_parts.unwrap_or(0);
682-
if nb_parts > 0 {
682+
if let Some(count) = projects.len().checked_div(nb_parts) {
683683
// We increment the number of tests by one because if this is an odd number, we would skip
684684
// one test.
685-
let count = projects.len() / nb_parts + 1;
685+
let count = count + 1;
686686
let current_part = args.current_part.unwrap();
687687
let start = current_part * count;
688688
// We remove the projects we don't want to test.

doc/debugging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## How to debug GCC LTO
44

5-
Run do the command with `-v -save-temps` and then extract the `lto1` line from the output and run that under the debugger.
5+
Run the command with `-v -save-temps` and then extract the `lto1` line from the output and run that under the debugger.
66

7-
## How to debug stdarch tests that cannot be ran locally
7+
## How to debug stdarch tests that cannot be run locally
88

99
First, run the tests normally:
1010

0 commit comments

Comments
 (0)