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

[Martin Storsjö via llvm-commits]

https://github.com/mstorsjo updated https://github.com/llvm/llvm-project/pull/160687

>From d851e3130a4a8a47970baaa281f3394bd05d5b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
Date: Thu, 25 Sep 2025 14:16:02 +0300
Subject: [PATCH] [compiler-rt] Fix test ifdefs and XFAILs

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.
---
 compiler-rt/test/builtins/Unit/fixunstfdi_test.c | 5 ++---
 compiler-rt/test/builtins/Unit/multc3_test.c     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

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>