user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from rust-lang/master

Browse source 
updates from main
This commit is contained in:
Lokathor 2022-07-28 09:36:02 -06:00 • committed by GitHub
commit 1070134a56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/compiler-builtins/src/math.rs
View file

@ -72,6 +72,7 @@ no_mangle! {
not(target_env = "wasi")
),
target_os = "xous",
all(target_arch = "x86_64", target_os = "uefi"),
all(target_arch = "xtensa", target_os = "none"),
all(target_vendor = "fortanix", target_env = "sgx")
))]
@ -95,7 +96,7 @@ no_mangle! {
fn tanf(n: f32) -> f32;
}
#[cfg(target_os = "xous")]
#[cfg(any(target_os = "xous", target_os = "uefi"))]
no_mangle! {
fn sqrtf(x: f32) -> f32;
fn sqrt(x: f64) -> f64;
@ -103,7 +104,8 @@ no_mangle! {
#[cfg(any(
all(target_vendor = "fortanix", target_env = "sgx"),
target_os = "xous"
target_os = "xous",
target_os = "uefi"
))]
no_mangle! {
fn ceil(x: f64) -> f64;

6
library/compiler-builtins/testcrate/tests/mem.rs
View file

@ -230,6 +230,8 @@ fn memmove_backward_aligned() {
}
}
// PowerPC tests are failing: https://github.com/rust-lang/rust/issues/99853
#[cfg(not(target_arch = "powerpc64"))]
#[test]
fn memset_backward_misaligned_nonaligned_start() {
let mut arr = gen_arr::<32>();
@ -242,6 +244,8 @@ fn memset_backward_misaligned_nonaligned_start() {
}
}
// PowerPC tests are failing: https://github.com/rust-lang/rust/issues/99853
#[cfg(not(target_arch = "powerpc64"))]
#[test]
fn memset_backward_misaligned_aligned_start() {
let mut arr = gen_arr::<32>();
@ -254,6 +258,8 @@ fn memset_backward_misaligned_aligned_start() {
}
}
// PowerPC tests are failing: https://github.com/rust-lang/rust/issues/99853
#[cfg(not(target_arch = "powerpc64"))]
#[test]
fn memset_backward_aligned() {
let mut arr = gen_arr::<32>();