about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Weigand <ulrich.weigand@de.ibm.com>2022-08-12 13:46:31 +0200
committerUlrich Weigand <ulrich.weigand@de.ibm.com>2022-08-12 13:46:31 +0200
commit8bcab190183f2a1807ff3d10fcdf7ea74306cf2f (patch)
treecb4e721fbb9b9924d1875c4fc62f79256c9007b2
parent64c73d0b3c4b91fee0e9a840be30e1d6faac7957 (diff)
downloadrust-8bcab190183f2a1807ff3d10fcdf7ea74306cf2f.tar.gz
rust-8bcab190183f2a1807ff3d10fcdf7ea74306cf2f.zip
Ignore ptr_bitops_tagging test on s390x
This test requires dynamic stack re-alignment on s390x, which is
currently unsupported (see issue #1258).
-rw-r--r--patches/0023-sysroot-Ignore-failing-tests.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/patches/0023-sysroot-Ignore-failing-tests.patch b/patches/0023-sysroot-Ignore-failing-tests.patch
index 50ef0bd9418..f3cd7ee77e2 100644
--- a/patches/0023-sysroot-Ignore-failing-tests.patch
+++ b/patches/0023-sysroot-Ignore-failing-tests.patch
@@ -46,5 +46,17 @@ index 4bc44e9..8e3c7a4 100644
  
  #[test]
  fn cell_allows_array_cycle() {
+diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs
+index 13b12db..96fe4b9 100644
+--- a/library/core/tests/atomic.rs
++++ b/library/core/tests/atomic.rs
+@@ -185,6 +185,7 @@ fn ptr_bitops() {
+ }
+ 
+ #[test]
++#[cfg_attr(target_arch = "s390x", ignore)] // s390x backend doesn't support stack alignment >8 bytes
+ #[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
+ fn ptr_bitops_tagging() {
+     #[repr(align(16))]
 -- 
 2.21.0 (Apple Git-122)