Skip to content

Commit 1c19645

Browse files
authored
Revert "[compiler-rt][ARM] Optimized mulsf3 and divsf3" (#167906)
Reverts #161546 One of the buildbots reported a cmake error I don't understand, and which I didn't get in my own test builds: ``` CMake Error at /var/lib/buildbot/fuchsia-x86_64-linux/llvm-project/compiler-rt/cmake/Modules/CheckAssemblerFlag.cmake:23 (try_compile): COMPILE_DEFINITIONS specified on a srcdir type TRY_COMPILE ``` My best guess is that the thing I did in `CheckAssemblerFlag.cmake` only works on some versions of cmake. But I don't understand the problem well enough to fix it quickly, so I'm reverting the whole patch and will reland it later.
1 parent 39fbec0 commit 1c19645

File tree

11 files changed

+95
-2461
lines changed

11 files changed

+95
-2461
lines changed

compiler-rt/cmake/Modules/CheckAssemblerFlag.cmake

Lines changed: 0 additions & 38 deletions
This file was deleted.

compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ endif()
6060
include(builtin-config-ix)
6161
include(CMakeDependentOption)
6262
include(CMakePushCheckState)
63-
include(CheckAssemblerFlag)
6463

6564
option(COMPILER_RT_BUILTINS_HIDE_SYMBOLS
6665
"Do not export any symbols from the static library." ON)
@@ -424,40 +423,6 @@ set(arm_or_thumb2_base_SOURCES
424423
${GENERIC_SOURCES}
425424
)
426425

427-
option(COMPILER_RT_ARM_OPTIMIZED_FP
428-
"On 32-bit Arm, use optimized assembly implementations of FP arithmetic. Likely to increase code size, but be faster." ON)
429-
430-
if(COMPILER_RT_ARM_OPTIMIZED_FP AND BUILTIN_SUPPORTED_ARCH MATCHES "arm")
431-
check_assembler_flag(COMPILER_RT_HAS_MIMPLICIT_IT -mimplicit-it=always)
432-
if(COMPILER_RT_HAS_MIMPLICIT_IT)
433-
set(implicit_it_flag -mimplicit-it=always)
434-
else()
435-
check_assembler_flag(
436-
COMPILER_RT_HAS_WA_MIMPLICIT_IT -Wa,-mimplicit-it=always)
437-
if(COMPILER_RT_HAS_WA_MIMPLICIT_IT)
438-
set(implicit_it_flag -Wa,-mimplicit-it=always)
439-
else()
440-
message(WARNING "Don't know how to set the -mimplicit-it=always flag in this assembler; not including Arm optimized implementations")
441-
set(implicit_it_flag "")
442-
endif()
443-
endif()
444-
445-
if(implicit_it_flag)
446-
set(assembly_files
447-
arm/mulsf3.S
448-
arm/divsf3.S)
449-
set_source_files_properties(${assembly_files}
450-
PROPERTIES COMPILE_OPTIONS ${implicit_it_flag})
451-
set(arm_or_thumb2_base_SOURCES
452-
${assembly_files}
453-
arm/fnan2.c
454-
arm/fnorm2.c
455-
arm/funder.c
456-
${arm_or_thumb2_base_SOURCES}
457-
)
458-
endif()
459-
endif()
460-
461426
set(arm_sync_SOURCES
462427
arm/sync_fetch_and_add_4.S
463428
arm/sync_fetch_and_add_8.S
@@ -491,16 +456,6 @@ set(thumb1_base_SOURCES
491456
${GENERIC_SOURCES}
492457
)
493458

494-
if(COMPILER_RT_ARM_OPTIMIZED_FP)
495-
set(thumb1_base_SOURCES
496-
arm/thumb1/mulsf3.S
497-
arm/fnan2.c
498-
arm/fnorm2.c
499-
arm/funder.c
500-
${thumb1_base_SOURCES}
501-
)
502-
endif()
503-
504459
set(arm_EABI_RT_SOURCES
505460
arm/aeabi_cdcmp.S
506461
arm/aeabi_cdcmpeq_check_nan.c

compiler-rt/lib/builtins/arm/divsf3.S

Lines changed: 0 additions & 608 deletions
This file was deleted.

compiler-rt/lib/builtins/arm/fnan2.c

Lines changed: 0 additions & 42 deletions
This file was deleted.

compiler-rt/lib/builtins/arm/fnorm2.c

Lines changed: 0 additions & 62 deletions
This file was deleted.

compiler-rt/lib/builtins/arm/funder.c

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)