diff options
| author | Jayasurya Maganuru <Maganuru.Jayasurya@windriver.com> | 2025-07-28 04:54:08 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-31 10:48:35 +0100 |
| commit | 006da8235633e05d4eb5da9f01b616f0bd934593 (patch) | |
| tree | f9e8fd83b5540421104e9d83a965f6e041ae4b47 /meta/recipes-devtools/rust/files | |
| parent | 03f7151e011693a7ce90107ffed4b3da9cdd4b56 (diff) | |
| download | poky-006da8235633e05d4eb5da9f01b616f0bd934593.tar.gz | |
rust: Upgrade 1.87.0 -> 1.88.0
Rust stable version updated to 1.88.0.
https://blog.rust-lang.org/2025/06/26/Rust-1.88.0/
* Rebase existing patches with v1.88.0
* Exclude tidy and coverage-dump from OE self-tests due to test failures
Although the build completes successfully, OE self-tests fail:
tools/coverage-dump panics during test execution.
tools/tidy fails due to a mismatched GCC submodule commit.
These tests are excluded to allow successful OE self-test runs.
* Two tests from the`codegen` modules now fail only on riscv64.
Enable them on arm32/64 and x86-32/64 targets, while restricting
them on riscv64 via `only-<target_arch>` tags.
Bugzilla link - https://bugzilla.yoctoproject.org/show_bug.cgi?id=15944
Test Results Summary:
+-----------+--------+---------+
| Machine | Passed | Ignored |
+-----------+--------+---------+
| arm-32 | 28,664 | 1,451 |
| arm-64 | 28,748 | 1,396 |
| x86-32 | 28,657 | 1,432 |
| x86-64 | 28,904 | 1,213 |
| riscv-64 | 28,722 | 1,421 |
+-----------+--------+---------+
(From OE-Core rev: 5afc9bdbabfdbcb784ceb637926111e6c7648f41)
Signed-off-by: Jayasurya Maganuru <Maganuru.Jayasurya@windriver.com>
Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust/files')
4 files changed, 50 insertions, 124 deletions
diff --git a/meta/recipes-devtools/rust/files/0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch b/meta/recipes-devtools/rust/files/0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch index a7da69dce3..1ff43d11c5 100644 --- a/meta/recipes-devtools/rust/files/0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch +++ b/meta/recipes-devtools/rust/files/0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch | |||
| @@ -24,10 +24,10 @@ diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core | |||
| 24 | index 087df2f8a..00790affb 100644 | 24 | index 087df2f8a..00790affb 100644 |
| 25 | --- a/src/bootstrap/src/core/build_steps/tool.rs | 25 | --- a/src/bootstrap/src/core/build_steps/tool.rs |
| 26 | +++ b/src/bootstrap/src/core/build_steps/tool.rs | 26 | +++ b/src/bootstrap/src/core/build_steps/tool.rs |
| 27 | @@ -15,14 +15,12 @@ | 27 | @@ -15,14 +15,12 @@ use std::{env, fs}; |
| 28 | #[cfg(feature = "tracing")] | 28 | #[cfg(feature = "tracing")] |
| 29 | use tracing::instrument; | 29 | use tracing::instrument; |
| 30 | 30 | ||
| 31 | -use crate::core::build_steps::compile::is_lto_stage; | 31 | -use crate::core::build_steps::compile::is_lto_stage; |
| 32 | use crate::core::build_steps::toolstate::ToolState; | 32 | use crate::core::build_steps::toolstate::ToolState; |
| 33 | use crate::core::build_steps::{compile, llvm}; | 33 | use crate::core::build_steps::{compile, llvm}; |
| @@ -42,14 +42,13 @@ index 087df2f8a..00790affb 100644 | |||
| 42 | use crate::utils::channel::GitInfo; | 42 | use crate::utils::channel::GitInfo; |
| 43 | use crate::utils::exec::{BootstrapCommand, command}; | 43 | use crate::utils::exec::{BootstrapCommand, command}; |
| 44 | use crate::utils::helpers::{add_dylib_path, exe, t}; | 44 | use crate::utils::helpers::{add_dylib_path, exe, t}; |
| 45 | @@ -148,20 +146,7 @@ | 45 | @@ -148,20 +146,7 @@ impl Step for ToolBuild { |
| 46 | &self.extra_features, | 46 | &self.extra_features, |
| 47 | ); | 47 | ); |
| 48 | 48 | ||
| 49 | - if path.ends_with("/rustdoc") && | 49 | - // Rustc tools (miri, clippy, cargo, rustfmt, rust-analyzer) |
| 50 | - // rustdoc is performance sensitive, so apply LTO to it. | 50 | - // could use the additional optimizations. |
| 51 | - is_lto_stage(&self.compiler) | 51 | - if self.mode == Mode::ToolRustc && is_lto_stage(&self.compiler) { |
| 52 | - { | ||
| 53 | - let lto = match builder.config.rust_lto { | 52 | - let lto = match builder.config.rust_lto { |
| 54 | - RustcLto::Off => Some("off"), | 53 | - RustcLto::Off => Some("off"), |
| 55 | - RustcLto::Thin => Some("thin"), | 54 | - RustcLto::Thin => Some("thin"), |
| @@ -60,10 +59,11 @@ index 087df2f8a..00790affb 100644 | |||
| 60 | - cargo.env(cargo_profile_var("LTO", &builder.config), lto); | 59 | - cargo.env(cargo_profile_var("LTO", &builder.config), lto); |
| 61 | - } | 60 | - } |
| 62 | - } | 61 | - } |
| 62 | - | ||
| 63 | + cargo.rustflag("-Clto=off"); | 63 | + cargo.rustflag("-Clto=off"); |
| 64 | |||
| 65 | if !self.allow_features.is_empty() { | 64 | if !self.allow_features.is_empty() { |
| 66 | cargo.allow_features(self.allow_features); | 65 | cargo.allow_features(self.allow_features); |
| 66 | } | ||
| 67 | diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs | 67 | diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs |
| 68 | --- a/src/bootstrap/src/core/builder/mod.rs | 68 | --- a/src/bootstrap/src/core/builder/mod.rs |
| 69 | +++ b/src/bootstrap/src/core/builder/mod.rs | 69 | +++ b/src/bootstrap/src/core/builder/mod.rs |
diff --git a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch index 911c5604b3..53b129057c 100644 --- a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch +++ b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch | |||
| @@ -64,105 +64,3 @@ index b070eeb322..ba768ff86f 100644 | |||
| 64 | -{"files":{"CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"b766a70e39b8ea7bb57afd288bcac205a23f6a26ac5619cb1d5b10f70c5dfdea","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} | 64 | -{"files":{"CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"b766a70e39b8ea7bb57afd288bcac205a23f6a26ac5619cb1d5b10f70c5dfdea","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} |
| 65 | \ No newline at end of file | 65 | \ No newline at end of file |
| 66 | +{"files":{"CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"174101852b2633a2478cef20d063fb9c2f1b092eac47913a6e708c85663b8404","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} | 66 | +{"files":{"CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"174101852b2633a2478cef20d063fb9c2f1b092eac47913a6e708c85663b8404","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} |
| 67 | diff --git a/vendor/cc-1.0.99/src/command_helpers.rs b/vendor/cc-1.0.99/src/command_helpers.rs | ||
| 68 | index fe919a5239..2b1f442019 100644 | ||
| 69 | --- a/vendor/cc-1.0.99/src/command_helpers.rs | ||
| 70 | +++ b/vendor/cc-1.0.99/src/command_helpers.rs | ||
| 71 | @@ -257,6 +257,7 @@ fn wait_on_child( | ||
| 72 | /// and store them in the output Object. | ||
| 73 | pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<Object>, Error> { | ||
| 74 | let mut objects = Vec::with_capacity(files.len()); | ||
| 75 | + let target_substring = ["rustc"]; | ||
| 76 | for file in files { | ||
| 77 | let basename = file | ||
| 78 | .file_name() | ||
| 79 | @@ -277,10 +278,29 @@ pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec< | ||
| 80 | })? | ||
| 81 | .to_string_lossy(); | ||
| 82 | |||
| 83 | + // Function to find the position of the first occurrence of the target substring | ||
| 84 | + fn find_target_position(s: &str, targets: &[&str]) -> Option<usize> { | ||
| 85 | + let mut pos = None; | ||
| 86 | + for target in targets { | ||
| 87 | + if let Some(index) = s.rfind(target) { | ||
| 88 | + //If a target is found and pos is None, set it | ||
| 89 | + if pos.is_none() || index < pos.unwrap() { | ||
| 90 | + pos = Some(index); | ||
| 91 | + } | ||
| 92 | + } | ||
| 93 | + } | ||
| 94 | + pos | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + let filtered_dirname = if let Some(pos) = find_target_position(&dirname, &target_substring) { | ||
| 98 | + dirname[pos..].to_string() //Keep everything from the target substring onwards | ||
| 99 | + } else { | ||
| 100 | + dirname.to_string() //If target substring is not found, keep the original dirname | ||
| 101 | + }; | ||
| 102 | // Hash the dirname. This should prevent conflicts if we have multiple | ||
| 103 | // object files with the same filename in different subfolders. | ||
| 104 | let mut hasher = hash_map::DefaultHasher::new(); | ||
| 105 | - hasher.write(dirname.to_string().as_bytes()); | ||
| 106 | + hasher.write(filtered_dirname.as_bytes()); | ||
| 107 | let obj = dst | ||
| 108 | .join(format!("{:016x}-{}", hasher.finish(), basename)) | ||
| 109 | .with_extension("o"); | ||
| 110 | diff --git a/vendor/cc-1.1.22/src/command_helpers.rs b/vendor/cc-1.1.22/src/command_helpers.rs | ||
| 111 | index 07dfb80412..e01b62fa39 100644 | ||
| 112 | --- a/vendor/cc-1.1.22/src/command_helpers.rs | ||
| 113 | +++ b/vendor/cc-1.1.22/src/command_helpers.rs | ||
| 114 | @@ -285,6 +285,7 @@ fn wait_on_child( | ||
| 115 | /// and store them in the output Object. | ||
| 116 | pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<Object>, Error> { | ||
| 117 | let mut objects = Vec::with_capacity(files.len()); | ||
| 118 | + let target_substring = ["rustc"]; | ||
| 119 | for file in files { | ||
| 120 | let basename = file | ||
| 121 | .file_name() | ||
| 122 | @@ -305,10 +306,29 @@ pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec< | ||
| 123 | })? | ||
| 124 | .to_string_lossy(); | ||
| 125 | |||
| 126 | + // Function to find the position of the first occurrence of the target substring | ||
| 127 | + fn find_target_position(s: &str, targets: &[&str]) -> Option<usize> { | ||
| 128 | + let mut pos = None; | ||
| 129 | + for target in targets { | ||
| 130 | + if let Some(index) = s.rfind(target) { | ||
| 131 | + //If a target is found and pos is None, set it | ||
| 132 | + if pos.is_none() || index < pos.unwrap() { | ||
| 133 | + pos = Some(index); | ||
| 134 | + } | ||
| 135 | + } | ||
| 136 | + } | ||
| 137 | + pos | ||
| 138 | + } | ||
| 139 | + | ||
| 140 | + let filtered_dirname = if let Some(pos) = find_target_position(&dirname, &target_substring) { | ||
| 141 | + dirname[pos..].to_string() //Keep everything from the target substring onwards | ||
| 142 | + } else { | ||
| 143 | + dirname.to_string() //If target substring is not found, keep the original dirname | ||
| 144 | + }; | ||
| 145 | // Hash the dirname. This should prevent conflicts if we have multiple | ||
| 146 | // object files with the same filename in different subfolders. | ||
| 147 | let mut hasher = hash_map::DefaultHasher::new(); | ||
| 148 | - hasher.write(dirname.to_string().as_bytes()); | ||
| 149 | + hasher.write(filtered_dirname.as_bytes()); | ||
| 150 | let obj = dst | ||
| 151 | .join(format!("{:016x}-{}", hasher.finish(), basename)) | ||
| 152 | .with_extension("o"); | ||
| 153 | diff --git a/vendor/cc-1.0.99/.cargo-checksum.json b/vendor/cc-1.0.99/.cargo-checksum.json | ||
| 154 | index b070eeb322..ba768ff86f 100644 | ||
| 155 | --- a/vendor/cc-1.0.99/.cargo-checksum.json | ||
| 156 | +++ b/vendor/cc-1.0.99/.cargo-checksum.json | ||
| 157 | @@ -1 +1 @@ | ||
| 158 | -{"files":{"Cargo.lock":"1dc698513383b70d5460f3f9668b670bc72ce51ff6be79d139acb515b39d35da","Cargo.toml":"3c555dbe1a698f12b66c8a5748ed52ff26ff7b8ebb12237c1a72a1cbe4b9392e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"15afbc35930a5a53f00d74a8910cff35caeb5511c26642cffe5630377aced901","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"92440d3adb5cb6ea05596d9ca860a205d3937dbf0fc959e524bac5f2b748c1af","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"352a0295c965c684904329d334f3b9889db3a9c3f201701f8db44e4d00e00515","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"342be00f6215e161d8163e272a2945bb9f52f171648e15e11d46800a73186955","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"e13c439a96d8311ba8d37b9d5522cd6997d94261cbb95517c82df70525acaa7f","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"4c350cddbce1557682b7f40cd917cc4f131ad89ff2e34c23d629014ed8d7203e","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"} | ||
| 159 | \ No newline at end of file | ||
| 160 | +{"files":{"Cargo.toml":"3c555dbe1a698f12b66c8a5748ed52ff26ff7b8ebb12237c1a72a1cbe4b9392e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"4c4a9ea55a109dbeada9e23d4ec963c257a56451b5fd16c7e4e8b97374f1a2ff","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"92440d3adb5cb6ea05596d9ca860a205d3937dbf0fc959e524bac5f2b748c1af","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"352a0295c965c684904329d334f3b9889db3a9c3f201701f8db44e4d00e00515","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"342be00f6215e161d8163e272a2945bb9f52f171648e15e11d46800a73186955","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"e13c439a96d8311ba8d37b9d5522cd6997d94261cbb95517c82df70525acaa7f","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"4c350cddbce1557682b7f40cd917cc4f131ad89ff2e34c23d629014ed8d7203e","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"} | ||
| 161 | diff --git a/vendor/cc-1.1.22/.cargo-checksum.json b/vendor/cc-1.1.22/.cargo-checksum.json | ||
| 162 | index 8c7be07836..473b5ad39c 100644 | ||
| 163 | --- a/vendor/cc-1.1.22/.cargo-checksum.json | ||
| 164 | +++ b/vendor/cc-1.1.22/.cargo-checksum.json | ||
| 165 | @@ -1 +1 @@ | ||
| 166 | -{"files":{"CHANGELOG.md":"92aeb6dec3e4b55e3951a4d00f6df20edc51545afca124d983454f7c05e37357","Cargo.lock":"565d86121026a1cade3014777f9a32c97dc76b843510f2c709cff3562ff04e1c","Cargo.toml":"1352b0476c28b89568e740579130ab017ad0f4b546083cf03ff61827d45361f3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"0b54800fe5c89cd102a5f872fe1a843c1a58e026bc4bbc611e207914b8c84dda","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"c80c94e82937980f711500cd3289842ab4bc42bcc4efd9febf64729e27410ecc","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"f4ed0a03d89a42bfd5527133d12b267af519b745f3f2b997ed293df15a2641b8","src/parallel/mod.rs":"55fb4c2d15e66677b2ed5ffa6d65ea161bcf1a1e1dc7910ee3bde06f2f67ab14","src/parallel/once_lock.rs":"d13e4cb82d6bca3297ca8671d83a40dd5affd7ac89191d733dd451867181bb02","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target_info.rs":"f939a570c99d897fdd37cd491a4ee0657e2c7480ec71acbd9cbee48732d4bfbc","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"a13bb0a351fcef72823485b1b5dc4f514c533fa4feac95deb66ed9e5fbfe7b53","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"dd6b2450909cd8334a2aa2ce856bcc72a9654d92422267d6345d5fabfcbf57c5","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"} | ||
| 167 | \ No newline at end of file | ||
| 168 | +{"files":{"CHANGELOG.md":"92aeb6dec3e4b55e3951a4d00f6df20edc51545afca124d983454f7c05e37357","Cargo.toml":"1352b0476c28b89568e740579130ab017ad0f4b546083cf03ff61827d45361f3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"a2ee7ae686b9cb186bebfdd597438251536bcaa9815699c95eab349385b4b949","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"c80c94e82937980f711500cd3289842ab4bc42bcc4efd9febf64729e27410ecc","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"f4ed0a03d89a42bfd5527133d12b267af519b745f3f2b997ed293df15a2641b8","src/parallel/mod.rs":"55fb4c2d15e66677b2ed5ffa6d65ea161bcf1a1e1dc7910ee3bde06f2f67ab14","src/parallel/once_lock.rs":"d13e4cb82d6bca3297ca8671d83a40dd5affd7ac89191d733dd451867181bb02","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target_info.rs":"f939a570c99d897fdd37cd491a4ee0657e2c7480ec71acbd9cbee48732d4bfbc","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"a13bb0a351fcef72823485b1b5dc4f514c533fa4feac95deb66ed9e5fbfe7b53","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"dd6b2450909cd8334a2aa2ce856bcc72a9654d92422267d6345d5fabfcbf57c5","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"} | ||
diff --git a/meta/recipes-devtools/rust/files/revert-link-std-statically-in-rustc_driver-feature.patch b/meta/recipes-devtools/rust/files/revert-link-std-statically-in-rustc_driver-feature.patch index 9bbbce0182..3f920142b6 100644 --- a/meta/recipes-devtools/rust/files/revert-link-std-statically-in-rustc_driver-feature.patch +++ b/meta/recipes-devtools/rust/files/revert-link-std-statically-in-rustc_driver-feature.patch | |||
| @@ -43,14 +43,16 @@ index 39fa23766b..51d86b4009 100644 | |||
| 43 | use rustc_hir::def_id::{CrateNum, LOCAL_CRATE}; | 43 | use rustc_hir::def_id::{CrateNum, LOCAL_CRATE}; |
| 44 | use rustc_index::IndexVec; | 44 | use rustc_index::IndexVec; |
| 45 | use rustc_middle::bug; | 45 | use rustc_middle::bug; |
| 46 | @@ -161,44 +161,19 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList { | 46 | @@ -159,46 +159,19 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList { |
| 47 | } | 47 | } |
| 48 | Linkage::Dynamic | Linkage::IncludedFromDylib => {} | 48 | Linkage::Dynamic | Linkage::IncludedFromDylib => {} |
| 49 | } | 49 | } |
| 50 | - | 50 | - |
| 51 | - let all_dylibs = || { | 51 | - let all_dylibs = || { |
| 52 | - tcx.crates(()).iter().filter(|&&cnum| { | 52 | - tcx.crates(()).iter().filter(|&&cnum| { |
| 53 | - !tcx.dep_kind(cnum).macros_only() && tcx.used_crate_source(cnum).dylib.is_some() | 53 | - !tcx.dep_kind(cnum).macros_only() |
| 54 | - && (tcx.used_crate_source(cnum).dylib.is_some() | ||
| 55 | - || tcx.used_crate_source(cnum).sdylib_interface.is_some()) | ||
| 54 | - }) | 56 | - }) |
| 55 | - }; | 57 | - }; |
| 56 | - | 58 | - |
diff --git a/meta/recipes-devtools/rust/files/rust-oe-selftest.patch b/meta/recipes-devtools/rust/files/rust-oe-selftest.patch index b7ef806e65..547807f94c 100644 --- a/meta/recipes-devtools/rust/files/rust-oe-selftest.patch +++ b/meta/recipes-devtools/rust/files/rust-oe-selftest.patch | |||
| @@ -119,7 +119,7 @@ index 1a9d3d3f12f..0a9cfc48806 100644 | |||
| 119 | fn test_get_mut_poison() { | 119 | fn test_get_mut_poison() { |
| 120 | let mut m = new_poisoned_rwlock(NonCopy(10)); | 120 | let mut m = new_poisoned_rwlock(NonCopy(10)); |
| 121 | 121 | ||
| 122 | @@ -567,6 +576,7 @@ | 122 | @@ -571,6 +571,7 @@ |
| 123 | 123 | ||
| 124 | #[test] | 124 | #[test] |
| 125 | #[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")] | 125 | #[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")] |
| @@ -130,7 +130,7 @@ index 1a9d3d3f12f..0a9cfc48806 100644 | |||
| 130 | diff --git a/library/test/src/tests.rs b/library/test/src/tests.rs | 130 | diff --git a/library/test/src/tests.rs b/library/test/src/tests.rs |
| 131 | --- a/library/test/src/tests.rs | 131 | --- a/library/test/src/tests.rs |
| 132 | +++ b/library/test/src/tests.rs | 132 | +++ b/library/test/src/tests.rs |
| 133 | @@ -424,6 +424,7 @@ | 133 | @@ -414,6 +414,7 @@ |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | #[test] | 136 | #[test] |
| @@ -173,7 +173,7 @@ diff --git a/compiler/rustc_data_structures/src/tagged_ptr/tests.rs b/compiler/r | |||
| 173 | index 160af8a65d..686f4607bb 100644 | 173 | index 160af8a65d..686f4607bb 100644 |
| 174 | --- a/compiler/rustc_data_structures/src/tagged_ptr/tests.rs | 174 | --- a/compiler/rustc_data_structures/src/tagged_ptr/tests.rs |
| 175 | +++ b/compiler/rustc_data_structures/src/tagged_ptr/tests.rs | 175 | +++ b/compiler/rustc_data_structures/src/tagged_ptr/tests.rs |
| 176 | @@ -5,6 +5,7 @@ use crate::stable_hasher::{HashStable, StableHasher}; | 176 | @@ -39,6 +39,7 @@ use crate::stable_hasher::{HashStable, StableHasher}; |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | #[test] | 179 | #[test] |
| @@ -185,19 +185,19 @@ diff --git a/library/std/tests/thread_local/tests.rs b/library/std/tests/thread_ | |||
| 185 | index 9d4f52a092..d425e5f7b7 100644 | 185 | index 9d4f52a092..d425e5f7b7 100644 |
| 186 | --- a/library/std/tests/thread_local/tests.rs | 186 | --- a/library/std/tests/thread_local/tests.rs |
| 187 | +++ b/library/std/tests/thread_local/tests.rs | 187 | +++ b/library/std/tests/thread_local/tests.rs |
| 188 | @@ -346,6 +346,7 @@ fn join_orders_after_tls_destructors() { | 188 | @@ -363,6 +363,7 @@ fn join_orders_after_tls_destructors() { |
| 189 | 189 | // ** musl: https://github.com/kraj/musl/blob/1880359b54ff7dd9f5016002bfdae4b136007dde/src/thread/pthread_key_create.c#L87 | |
| 190 | // Test that thread::current is still available in TLS destructors. | 190 | #[cfg(target_thread_local)] |
| 191 | #[test] | 191 | #[test] |
| 192 | +#[ignore] | 192 | +#[ignore] |
| 193 | fn thread_current_in_dtor() { | 193 | fn thread_current_in_dtor() { |
| 194 | // Go through one round of TLS destruction first. | 194 | use std::thread::Builder; |
| 195 | struct Defer; | 195 | |
| 196 | diff --git a/library/alloctests/tests/sort/tests.rs b/library/alloctests/tests/sort/tests.rs | 196 | diff --git a/library/alloctests/tests/sort/tests.rs b/library/alloctests/tests/sort/tests.rs |
| 197 | index 14e6013f96..b670f27ab4 100644 | 197 | index 14e6013f96..b670f27ab4 100644 |
| 198 | --- a/library/alloctests/tests/sort/tests.rs | 198 | --- a/library/alloctests/tests/sort/tests.rs |
| 199 | +++ b/library/alloctests/tests/sort/tests.rs | 199 | +++ b/library/alloctests/tests/sort/tests.rs |
| 200 | @@ -915,12 +915,14 @@ gen_sort_test_fns_with_default_patterns_3_ty!( | 200 | @@ -922,12 +922,14 @@ gen_sort_test_fns_with_default_patterns_3_ty!( |
| 201 | macro_rules! instantiate_sort_test_inner { | 201 | macro_rules! instantiate_sort_test_inner { |
| 202 | ($sort_impl:ty, miri_yes, $test_fn_name:ident) => { | 202 | ($sort_impl:ty, miri_yes, $test_fn_name:ident) => { |
| 203 | #[test] | 203 | #[test] |
| @@ -239,7 +239,7 @@ index 5b8e5ff4f4a..e558fbd7bd7 100644 | |||
| 239 | + | 239 | + |
| 240 | //@ only-linux | 240 | //@ only-linux |
| 241 | //@ aux-build:dwarf-mixed-versions-lto-aux.rs | 241 | //@ aux-build:dwarf-mixed-versions-lto-aux.rs |
| 242 | //@ compile-flags: -C lto -g -Zdwarf-version=5 | 242 | //@ compile-flags: -C lto -g -Cdwarf-version=5 |
| 243 | diff --git a/tests/codegen/dont-shuffle-bswaps.rs b/tests/codegen/dont-shuffle-bswaps.rs | 243 | diff --git a/tests/codegen/dont-shuffle-bswaps.rs b/tests/codegen/dont-shuffle-bswaps.rs |
| 244 | index 0e712bc3a4e..93965d990d0 100644 | 244 | index 0e712bc3a4e..93965d990d0 100644 |
| 245 | --- a/tests/codegen/dont-shuffle-bswaps.rs | 245 | --- a/tests/codegen/dont-shuffle-bswaps.rs |
| @@ -250,7 +250,7 @@ index 0e712bc3a4e..93965d990d0 100644 | |||
| 250 | +//@ only-arm | 250 | +//@ only-arm |
| 251 | +//@ only-aarch64 | 251 | +//@ only-aarch64 |
| 252 | + | 252 | + |
| 253 | //@ revisions: OPT2 OPT3 | 253 | //@ revisions: OPT2 OPT3 OPT3_S390X |
| 254 | //@[OPT2] compile-flags: -Copt-level=2 | 254 | //@[OPT2] compile-flags: -Copt-level=2 |
| 255 | //@[OPT3] compile-flags: -C opt-level=3 | 255 | //@[OPT3] compile-flags: -C opt-level=3 |
| 256 | diff --git a/tests/codegen/uninhabited-transparent-return-abi.rs b/tests/codegen/uninhabited-transparent-return-abi.rs | 256 | diff --git a/tests/codegen/uninhabited-transparent-return-abi.rs b/tests/codegen/uninhabited-transparent-return-abi.rs |
| @@ -280,3 +280,29 @@ index 57027364699..3faa7ea035e 100644 | |||
| 280 | // We used to not handle all "rustic" ABIs in a (relatively) uniform way, | 280 | // We used to not handle all "rustic" ABIs in a (relatively) uniform way, |
| 281 | // so we failed to fix up arguments for actually passing through the ABI... | 281 | // so we failed to fix up arguments for actually passing through the ABI... |
| 282 | #![feature(rust_cold_cc)] | 282 | #![feature(rust_cold_cc)] |
| 283 | diff --git a/tests/codegen/simd/extract-insert-dyn.rs b/tests/codegen/simd/extract-insert-dyn.rs | ||
| 284 | index 729f0145314..1b21356518e 100644 | ||
| 285 | --- a/tests/codegen/simd/extract-insert-dyn.rs | ||
| 286 | +++ b/tests/codegen/simd/extract-insert-dyn.rs | ||
| 287 | @@ -1,3 +1,8 @@ | ||
| 288 | +//@ only-x86 | ||
| 289 | +//@ only-x86_64 | ||
| 290 | +//@ only-arm | ||
| 291 | +//@ only-aarch64 | ||
| 292 | + | ||
| 293 | //@compile-flags: -C opt-level=3 -C no-prepopulate-passes | ||
| 294 | |||
| 295 | #![feature( | ||
| 296 | diff --git a/tests/codegen/const-vector.rs b/tests/codegen/const-vector.rs | ||
| 297 | index 42921442e03..af0edc2ee92 100644 | ||
| 298 | --- a/tests/codegen/const-vector.rs | ||
| 299 | +++ b/tests/codegen/const-vector.rs | ||
| 300 | @@ -1,3 +1,8 @@ | ||
| 301 | +//@ only-x86 | ||
| 302 | +//@ only-x86_64 | ||
| 303 | +//@ only-arm | ||
| 304 | +//@ only-aarch64 | ||
| 305 | + | ||
| 306 | //@ revisions: OPT0 OPT0_S390X | ||
| 307 | //@ [OPT0] ignore-s390x | ||
| 308 | //@ [OPT0_S390X] only-s390x | ||
