Skip to content

Commit

Permalink
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 220 deletions.
8 changes: 3 additions & 5 deletions compiler-rt/cmake/builtin-config-ix.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@ asm(\".arch armv8-a+lse\");
asm(\"cas w0, w1, [x2]\");
")

builtin_check_c_compiler_source(COMPILER_RT_HAS_AARCH64_SME
builtin_check_c_compiler_source(COMPILER_RT_HAS_ASM_SME
"
void foo(void) __arm_streaming_compatible {
asm(\".arch armv9-a+sme\");
asm(\"smstart\");
}
asm(\".arch armv9-a+sme\");
asm(\"smstart\");
")

if(ANDROID)
Expand Down
5 changes: 2 additions & 3 deletions compiler-rt/lib/builtins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,9 @@ set(aarch64_SOURCES
aarch64/fp_mode.c
)

if(COMPILER_RT_HAS_AARCH64_SME AND COMPILER_RT_HAS_FNO_BUILTIN_FLAG AND (COMPILER_RT_HAS_AUXV OR COMPILER_RT_BAREMETAL_BUILD))
list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-abi-init.c aarch64/sme-libc-routines.c)
if(COMPILER_RT_HAS_ASM_SME AND (COMPILER_RT_HAS_AUXV OR COMPILER_RT_BAREMETAL_BUILD))
list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-abi-init.c)
message(STATUS "AArch64 SME ABI routines enabled")
set_source_files_properties(aarch64/sme-libc-routines.c PROPERTIES COMPILE_FLAGS "-fno-builtin")
else()
message(STATUS "AArch64 SME ABI routines disabled")
endif()
Expand Down
87 changes: 0 additions & 87 deletions compiler-rt/lib/builtins/aarch64/sme-libc-routines.c

This file was deleted.

120 changes: 0 additions & 120 deletions compiler-rt/test/builtins/Unit/sme-string-test.cpp

This file was deleted.

3 changes: 0 additions & 3 deletions compiler-rt/test/lit.common.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,6 @@ def get_ios_commands_dir():
if config.has_lld:
config.available_features.add("lld-available")

if config.aarch64_sme:
config.available_features.add("aarch64-sme-available")

if config.use_lld:
config.available_features.add("lld")

Expand Down
1 change: 0 additions & 1 deletion compiler-rt/test/lit.common.configured.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ set_default("gwp_asan", @COMPILER_RT_HAS_GWP_ASAN_PYBOOL@)
set_default("expensive_checks", @LLVM_ENABLE_EXPENSIVE_CHECKS_PYBOOL@)
set_default("test_standalone_build_libs", @COMPILER_RT_TEST_STANDALONE_BUILD_LIBS_PYBOOL@)
set_default("has_compiler_rt_libatomic", @COMPILER_RT_BUILD_STANDALONE_LIBATOMIC_PYBOOL@)
set_default("aarch64_sme", @COMPILER_RT_HAS_AARCH64_SME@)
# True iff the test suite supports ignoring the test compiler's runtime library path
# and using `config.compiler_rt_libdir` instead. This only matters when the runtime
# library paths differ.
Expand Down
1 change: 0 additions & 1 deletion compiler-rt/unittests/lit.common.unit.configured.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
config.compiler_rt_libdir = lit_config.substitute("@COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR@")
config.aarch64_sme = "@COMPILER_RT_HAS_AARCH64_SME@"
config.enable_per_target_runtime_dir = @LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_PYBOOL@
config.llvm_build_mode = lit_config.substitute("@LLVM_BUILD_MODE@")
config.host_arch = "@HOST_ARCH@"
Expand Down

0 comments on commit bffd80d

Please sign in to comment.