Index: lib/builtins/CMakeLists.txt =================================================================== --- lib/builtins/CMakeLists.txt +++ lib/builtins/CMakeLists.txt @@ -255,9 +255,7 @@ set(i686_SOURCES ${i386_SOURCES}) endif () # if (NOT MSVC) -set(arm_SOURCES - arm/adddf3vfp.S - arm/addsf3vfp.S +set(arm_aeabi_SOURCES arm/aeabi_cdcmp.S arm/aeabi_cdcmpeq_check_nan.c arm/aeabi_cfcmp.S @@ -274,7 +272,11 @@ arm/aeabi_memmove.S arm/aeabi_memset.S arm/aeabi_uidivmod.S - arm/aeabi_uldivmod.S + arm/aeabi_uldivmod.S) + +set(arm_SOURCES + arm/adddf3vfp.S + arm/addsf3vfp.S arm/bswapdi2.S arm/bswapsi2.S arm/clzdi2.S @@ -347,6 +349,12 @@ arm/unordsf2vfp.S ${GENERIC_SOURCES}) +if(NOT WIN32) + set(arm_SOURCES + ${arm_aeabi_SOURCES} + ${arm_SOURCES}) +endif() + set(aarch64_SOURCES comparetf2.c extenddftf2.c