@@ -1149,8 +1149,7 @@ defvar WindowsExclusions = !listconcat(WindowsMathRemovals, MostPowI);
11491149
11501150// Targets which support windows should start with these as a base and
11511151// add in calls for other OSes
1152- defvar Win32DefaultLibcallImpls = !listremove(DefaultLibcallImpls32, WindowsExclusions);
1153- defvar Win64DefaultLibcallImpls = !listremove(DefaultLibcallImpls64, WindowsExclusions);
1152+ defvar WinDefaultLibcallImpls = !listremove(DefaultRuntimeLibcallImpls, WindowsExclusions);
11541153
11551154defvar LibmHasFrexpF32 = LibcallImpls<(add frexpf), isNotOSWindowsOrIsCygwinMinGW>;
11561155defvar LibmHasLdexpF32 = LibcallImpls<(add ldexpf), isNotOSWindowsOrIsCygwinMinGW>;
@@ -1234,7 +1233,7 @@ def isAArch64_ILP64 : RuntimeLibcallPredicate<"TT.isAArch64(64)">;
12341233
12351234def AArch64SystemLibrary : SystemRuntimeLibrary<
12361235 isAArch64_ExceptArm64EC,
1237- (add Win64DefaultLibcallImpls ,
1236+ (add WinDefaultLibcallImpls ,
12381237 LibcallImpls<(add __powisf2, __powidf2), isNotOSMSVCRT>,
12391238 LibmHasFrexpF32, LibmHasLdexpF32,
12401239 LibmHasFrexpF128, LibmHasLdexpF128,
@@ -1250,7 +1249,7 @@ def AArch64SystemLibrary : SystemRuntimeLibrary<
12501249
12511250// Prepend a # to every name
12521251defset list<RuntimeLibcallImpl> WinArm64ECDefaultRuntimeLibcallImpls = {
1253- foreach libcall = Win64DefaultLibcallImpls in {
1252+ foreach libcall = WinDefaultLibcallImpls in {
12541253 def arm64ec_#libcall : DuplicateLibcallImplWithPrefix<libcall, "#">;
12551254 }
12561255
@@ -1508,7 +1507,7 @@ def isARMOrThumb : RuntimeLibcallPredicate<"TT.isARM() || TT.isThumb()">;
15081507
15091508def ARMSystemLibrary
15101509 : SystemRuntimeLibrary<isARMOrThumb,
1511- (add Win32DefaultLibcallImpls ,
1510+ (add WinDefaultLibcallImpls ,
15121511 LibcallImpls<(add __powisf2, __powidf2), isNotOSMSVCRT>,
15131512 LibmHasFrexpF32, LibmHasLdexpF32,
15141513 LibmHasFrexpF128, LibmHasLdexpF128,
@@ -2164,7 +2163,8 @@ defvar X86_F128_Libcalls = LibcallImpls<(add LibmF128Libcalls, LibmF128FiniteLib
21642163defvar SinCosF32F64Libcalls = LibcallImpls<(add sincosf, sincos), hasSinCos_f32_f64>;
21652164
21662165defvar X86CommonLibcalls =
2167- (add DarwinSinCosStret, DarwinExp10,
2166+ (add WinDefaultLibcallImpls,
2167+ DarwinSinCosStret, DarwinExp10,
21682168 X86_F128_Libcalls,
21692169 LibmHasSinCosF80, // FIXME: Depends on long double
21702170 SinCosF32F64Libcalls,
@@ -2189,11 +2189,11 @@ defvar Windows32DivRemMulCalls =
21892189def X86_32SystemLibrary
21902190 : SystemRuntimeLibrary<isX86_32,
21912191 (add X86CommonLibcalls,
2192- Windows32DivRemMulCalls, Win32DefaultLibcallImpls )>;
2192+ Windows32DivRemMulCalls)>;
21932193
21942194def X86_64SystemLibrary
21952195 : SystemRuntimeLibrary<isX86_64,
2196- (add X86CommonLibcalls, Win64DefaultLibcallImpls, Int128RTLibcalls)>;
2196+ (add X86CommonLibcalls, Int128RTLibcalls)>;
21972197
21982198//===----------------------------------------------------------------------===//
21992199// XCore Runtime Libcalls
0 commit comments