diff options
| -rwxr-xr-x | library/stdarch/ci/run-docker.sh | 2 | ||||
| -rw-r--r-- | library/stdarch/crates/stdarch-test/src/disassembly.rs | 2 | ||||
| -rw-r--r-- | library/stdarch/crates/stdarch-test/src/lib.rs | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/library/stdarch/ci/run-docker.sh b/library/stdarch/ci/run-docker.sh index bfba70b84f5..183daf666cb 100755 --- a/library/stdarch/ci/run-docker.sh +++ b/library/stdarch/ci/run-docker.sh @@ -23,12 +23,10 @@ run() { --env CARGO_TARGET_DIR=/checkout/target \ --env TARGET="${1}" \ --env STDARCH_TEST_EVERYTHING \ - --env STDARCH_ASSERT_INSTR_IGNORE \ --env STDARCH_DISABLE_ASSERT_INSTR \ --env NOSTD \ --env NORUN \ --env RUSTFLAGS \ - --env STDARCH_TEST_NORUN \ --volume "${HOME}/.cargo":/cargo \ --volume "$(rustc --print sysroot)":/rust:ro \ --volume "$(pwd)":/checkout:ro \ diff --git a/library/stdarch/crates/stdarch-test/src/disassembly.rs b/library/stdarch/crates/stdarch-test/src/disassembly.rs index 802b2c2ba9d..49043eea80b 100644 --- a/library/stdarch/crates/stdarch-test/src/disassembly.rs +++ b/library/stdarch/crates/stdarch-test/src/disassembly.rs @@ -29,7 +29,7 @@ fn normalize(mut symbol: &str) -> String { // Normalize to no leading underscore to handle platforms that may // inject extra ones in symbol names. - while symbol.starts_with('_') { + while symbol.starts_with('_') || symbol.starts_with('.') { symbol.remove(0); } // Windows/x86 has a suffix such as @@4. diff --git a/library/stdarch/crates/stdarch-test/src/lib.rs b/library/stdarch/crates/stdarch-test/src/lib.rs index e5ce79b1dce..827a402e3a0 100644 --- a/library/stdarch/crates/stdarch-test/src/lib.rs +++ b/library/stdarch/crates/stdarch-test/src/lib.rs @@ -104,7 +104,12 @@ pub fn assert(shim_addr: usize, fnname: &str, expected: &str) { // failed inlining something. s[0].starts_with("call ") && s[1].starts_with("pop") // FIXME: original logic but does not match comment }) - } else if cfg!(any(target_arch = "aarch64", target_arch = "arm64ec")) { + } else if cfg!(any( + target_arch = "aarch64", + target_arch = "arm64ec", + target_arch = "powerpc", + target_arch = "powerpc64" + )) { instrs.iter().any(|s| s.starts_with("bl ")) } else { // FIXME: Add detection for other archs |