Rollup merge of #127021 - thesummer:1-add-target-support-for-rtems-ar… · patricklam/verify-rust-std@3d2a91f (original) (raw)
20 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -43,6 +43,8 @@ check-cfg = [ | ||
| 43 | 43 | 'cfg(bootstrap)', |
| 44 | 44 | 'cfg(no_fp_fmt_parse)', |
| 45 | 45 | 'cfg(stdarch_intel_sde)', |
| 46 | +# #[cfg(bootstrap)] rtems | |
| 47 | +'cfg(target_os, values("rtems"))', | |
| 46 | 48 | # core use #[path] imports to portable-simd `core_simd` crate |
| 47 | 49 | # and to stdarch `core_arch` crate which messes-up with Cargo list |
| 48 | 50 | # of declared features, we therefor expect any feature cfg |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -110,7 +110,7 @@ mod c_char_definition { | ||
| 110 | 110 | all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), |
| 111 | 111 | all(target_os = "l4re", target_arch = "x86_64"), |
| 112 | 112 | all( |
| 113 | - any(target_os = "freebsd", target_os = "openbsd"), | |
| 113 | + any(target_os = "freebsd", target_os = "openbsd", target_os = "rtems"), | |
| 114 | 114 | any( |
| 115 | 115 | target_arch = "aarch64", |
| 116 | 116 | target_arch = "arm", |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -20,3 +20,10 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] } | ||
| 20 | 20 | |
| 21 | 21 | [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies] |
| 22 | 22 | libc = { version = "0.2", default-features = false } |
| 23 | + | |
| 24 | +[lints.rust.unexpected_cfgs] | |
| 25 | +level = "warn" | |
| 26 | +check-cfg = [ | |
| 27 | +# #[cfg(bootstrap)] rtems | |
| 28 | +'cfg(target_os, values("rtems"))', | |
| 29 | +] |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -48,7 +48,7 @@ cfg_if::cfg_if! { | ||
| 48 | 48 | target_os = "psp", |
| 49 | 49 | target_os = "xous", |
| 50 | 50 | target_os = "solid_asp3", |
| 51 | - all(target_family = "unix", not(target_os = "espidf")), | |
| 51 | + all(target_family = "unix", not(any(target_os = "espidf", target_os = "rtems"))), | |
| 52 | 52 | all(target_vendor = "fortanix", target_env = "sgx"), |
| 53 | 53 | target_family = "wasm", |
| 54 | 54 | ))] { |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -146,4 +146,6 @@ check-cfg = [ | ||
| 146 | 146 | # and to the `backtrace` crate which messes-up with Cargo list |
| 147 | 147 | # of declared features, we therefor expect any feature cfg |
| 148 | 148 | 'cfg(feature, values(any()))', |
| 149 | +# #[cfg(bootstrap)] rtems | |
| 150 | +'cfg(target_os, values("rtems"))', | |
| 149 | 151 | ] |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -53,6 +53,7 @@ fn main() { | ||
| 53 | 53 | | |
| 54 | 54 | | |
| 55 | 55 | | |
| 56 | + | | |
| 56 | 57 | |
| 57 | 58 | // See src/bootstrap/src/core/build_steps/synthetic_targets.rs |
| 58 | 59 | | |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -143,6 +143,8 @@ pub mod nto; | ||
| 143 | 143 | pub mod openbsd; |
| 144 | 144 | #[cfg(target_os = "redox")] |
| 145 | 145 | pub mod redox; |
| 146 | +#[cfg(target_os = "rtems")] | |
| 147 | +pub mod rtems; | |
| 146 | 148 | #[cfg(target_os = "solaris")] |
| 147 | 149 | pub mod solaris; |
| 148 | 150 | #[cfg(target_os = "solid_asp3")] |