[compiler-rt] f7e8350 - Revert "[compiler-rt] Disable tests for unavailable builtins (#158664)"

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2025-09-26T20:35:32+03:00
New Revision: f7e8350f0bcbe46a046cbedfef1e6e56928ea87b

URL: https://github.com/llvm/llvm-project/commit/f7e8350f0bcbe46a046cbedfef1e6e56928ea87b
DIFF: https://github.com/llvm/llvm-project/commit/f7e8350f0bcbe46a046cbedfef1e6e56928ea87b.diff

LOG: Revert "[compiler-rt] Disable tests for unavailable builtins (#158664)"

This reverts commit e9e166e54354330c474457711a8e7a7ca2efd731,
and the follow-up fix 656707086e5f6fccd2eb57f5aaf987c328c0f4f1.

These changes unlocked tests to run on architectures where they
didn't run before, showing up as test failures like in
https://lab.llvm.org/buildbot/#/builders/66/builds/19787.

Added: 
    

Modified: 
    compiler-rt/test/builtins/Unit/fixunstfdi_test.c
    compiler-rt/test/builtins/Unit/multc3_test.c

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/builtins/Unit/fixunstfdi_test.c b/compiler-rt/test/builtins/Unit/fixunstfdi_test.c
index 0be80b36fc46f..982f3a4629dbd 100644
--- a/compiler-rt/test/builtins/Unit/fixunstfdi_test.c
+++ b/compiler-rt/test/builtins/Unit/fixunstfdi_test.c
@@ -1,11 +1,12 @@
+// XFAIL: target=aarch64-{{.*}}-windows-{{.*}}
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_fixunstfdi
 
 #include <stdio.h>
 
-#include "int_lib.h"
+#if _ARCH_PPC || __aarch64__ || __arm64ec__
 
-#if defined(CRT_HAS_TF_MODE)
+#include "int_lib.h"
 
 // Returns: convert a to a unsigned long long, rounding toward zero.
 //          Negative values all become zero.
@@ -34,7 +35,7 @@ char assumption_3[sizeof(long double)*CHAR_BIT == 128] = {0};
 
 int main()
 {
-#if defined(CRT_HAS_TF_MODE)
+#if _ARCH_PPC || __aarch64__ || __arm64ec__
     if (test__fixunstfdi(0.0, 0))
         return 1;
 

diff  --git a/compiler-rt/test/builtins/Unit/multc3_test.c b/compiler-rt/test/builtins/Unit/multc3_test.c
index b5e1c84d4a313..e9c99a72be35e 100644
--- a/compiler-rt/test/builtins/Unit/multc3_test.c
+++ b/compiler-rt/test/builtins/Unit/multc3_test.c
@@ -1,12 +1,12 @@
+// XFAIL: target=aarch64-{{.*}}-windows-{{.*}}
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_multc3
 
 #include <stdio.h>
 
-#include "int_lib.h"
-
-#if defined(CRT_HAS_128BIT) && defined(CRT_HAS_F128)
+#if _ARCH_PPC || __aarch64__ || __arm64ec__
 
+#include "int_lib.h"
 #include <math.h>
 #include <complex.h>
 
@@ -348,7 +348,7 @@ long double x[][2] =
 
 int main()
 {
-#if defined(CRT_HAS_128BIT) && defined(CRT_HAS_F128)
+#if _ARCH_PPC || __aarch64__ || __arm64ec__
     const unsigned N = sizeof(x) / sizeof(x[0]);
     unsigned i, j;
     for (i = 0; i < N; ++i)