diff --git a/compiler-rt/test/ubsan/TestCases/Misc/Linux/sigaction.cpp b/compiler-rt/test/ubsan/TestCases/Misc/Linux/sigaction.cpp
--- a/compiler-rt/test/ubsan/TestCases/Misc/Linux/sigaction.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/Linux/sigaction.cpp
@@ -1,11 +1,11 @@
-// RUN: %clangxx -fsanitize=undefined -shared-libsan %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx -shared-libsan %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Ensure ubsan runtime/interceptors are lazily initialized if called early.
 
 // The test seems to segfault on aarch64 with tsan:
 // https://lab.llvm.org/buildbot/#/builders/179/builds/6662
 // Reason unknown, needs debugging.
-// XFAIL: target=aarch64{{.*}} && ubsan-tsan
+// XFAIL: target=aarch64{{(aarch64|x86_64).*}} && ubsan-tsan
 
 #include <assert.h>
 #include <signal.h>