Skip to content

File tree

7 files changed

+5
-220
lines changed

7 files changed

+5
-220
lines changed

compiler-rt/cmake/builtin-config-ix.cmake

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ asm(\".arch armv8-a+lse\");
3535
asm(\"cas w0, w1, [x2]\");
3636
")
3737

38-
builtin_check_c_compiler_source(COMPILER_RT_HAS_AARCH64_SME
38+
builtin_check_c_compiler_source(COMPILER_RT_HAS_ASM_SME
3939
"
40-
void foo(void) __arm_streaming_compatible {
41-
asm(\".arch armv9-a+sme\");
42-
asm(\"smstart\");
43-
}
40+
asm(\".arch armv9-a+sme\");
41+
asm(\"smstart\");
4442
")
4543

4644
if(ANDROID)

compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,9 @@ set(aarch64_SOURCES
560560
aarch64/fp_mode.c
561561
)
562562

563-
if(COMPILER_RT_HAS_AARCH64_SME AND COMPILER_RT_HAS_FNO_BUILTIN_FLAG AND (COMPILER_RT_HAS_AUXV OR COMPILER_RT_BAREMETAL_BUILD))
564-
list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-abi-init.c aarch64/sme-libc-routines.c)
563+
if(COMPILER_RT_HAS_ASM_SME AND (COMPILER_RT_HAS_AUXV OR COMPILER_RT_BAREMETAL_BUILD))
564+
list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-abi-init.c)
565565
message(STATUS "AArch64 SME ABI routines enabled")
566-
set_source_files_properties(aarch64/sme-libc-routines.c PROPERTIES COMPILE_FLAGS "-fno-builtin")
567566
else()
568567
message(STATUS "AArch64 SME ABI routines disabled")
569568
endif()

compiler-rt/lib/builtins/aarch64/sme-libc-routines.c

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

compiler-rt/test/builtins/Unit/sme-string-test.cpp

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

compiler-rt/test/lit.common.cfg.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,6 @@ def get_ios_commands_dir():
454454
if config.has_lld:
455455
config.available_features.add("lld-available")
456456

457-
if config.aarch64_sme:
458-
config.available_features.add("aarch64-sme-available")
459-
460457
if config.use_lld:
461458
config.available_features.add("lld")
462459

compiler-rt/test/lit.common.configured.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ set_default("gwp_asan", @COMPILER_RT_HAS_GWP_ASAN_PYBOOL@)
5050
set_default("expensive_checks", @LLVM_ENABLE_EXPENSIVE_CHECKS_PYBOOL@)
5151
set_default("test_standalone_build_libs", @COMPILER_RT_TEST_STANDALONE_BUILD_LIBS_PYBOOL@)
5252
set_default("has_compiler_rt_libatomic", @COMPILER_RT_BUILD_STANDALONE_LIBATOMIC_PYBOOL@)
53-
set_default("aarch64_sme", @COMPILER_RT_HAS_AARCH64_SME@)
5453
# True iff the test suite supports ignoring the test compiler's runtime library path
5554
# and using `config.compiler_rt_libdir` instead. This only matters when the runtime
5655
# library paths differ.

compiler-rt/unittests/lit.common.unit.configured.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
77
config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
88
config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
99
config.compiler_rt_libdir = lit_config.substitute("@COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR@")
10-
config.aarch64_sme = "@COMPILER_RT_HAS_AARCH64_SME@"
1110
config.enable_per_target_runtime_dir = @LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_PYBOOL@
1211
config.llvm_build_mode = lit_config.substitute("@LLVM_BUILD_MODE@")
1312
config.host_arch = "@HOST_ARCH@"

0 commit comments

Comments
 (0)