[compiler-rt] 6567070 - [compiler-rt] Fix test ifdefs and XFAILs (#160687)

[via llvm-commits]

Author: Martin Storsjö
Date: 2025-09-26T11:49:33+03:00
New Revision: 656707086e5f6fccd2eb57f5aaf987c328c0f4f1

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

LOG: [compiler-rt] Fix test ifdefs and XFAILs (#160687)

This fixes the ifdefs added in
e9e166e54354330c474457711a8e7a7ca2efd731; we need to include int_lib.h
first before we can expect these defines to be set.

Also remove the XFAILs for aarch64 windows. As this test now became a
no-op on platforms that lack CRT_HAS_128BIT or CRT_HAS_F128 (aarch64
windows lacks the latter), it no longer fails.

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 cfe1a87b0a5df..0be80b36fc46f 100644
--- a/compiler-rt/test/builtins/Unit/fixunstfdi_test.c
+++ b/compiler-rt/test/builtins/Unit/fixunstfdi_test.c
@@ -1,13 +1,12 @@
-// XFAIL: target=aarch64-{{.*}}-windows-{{.*}}
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_fixunstfdi
 
 #include <stdio.h>
 
-#if defined(CRT_HAS_TF_MODE)
-
 #include "int_lib.h"
 
+#if defined(CRT_HAS_TF_MODE)
+
 // Returns: convert a to a unsigned long long, rounding toward zero.
 //          Negative values all become zero.
 

diff  --git a/compiler-rt/test/builtins/Unit/multc3_test.c b/compiler-rt/test/builtins/Unit/multc3_test.c
index 7ae4cb5b710a7..b5e1c84d4a313 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)
 
-#include "int_lib.h"
 #include <math.h>
 #include <complex.h>