diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 73c1b5062ec9a..70dc7d860d8f6 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -574,7 +574,7 @@ set(aarch64_SOURCES if (COMPILER_RT_HAS_AARCH64_SME) if (NOT COMPILER_RT_DISABLE_AARCH64_FMV 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-libc-mem-routines.S aarch64/sme-abi-init.c aarch64/sme-abi-vg.c aarch64/sme-libc-routines.c) + list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-libc-mem-routines.S aarch64/sme-abi-init.c aarch64/sme-libc-routines.c) message(STATUS "AArch64 SME ABI routines enabled") set_source_files_properties(aarch64/sme-libc-routines.c PROPERTIES COMPILE_FLAGS "-fno-builtin") else() diff --git a/compiler-rt/lib/builtins/aarch64/sme-abi-vg.c b/compiler-rt/lib/builtins/aarch64/sme-abi-vg.c deleted file mode 100644 index 4b9ee8c1d382d..0000000000000 --- a/compiler-rt/lib/builtins/aarch64/sme-abi-vg.c +++ /dev/null @@ -1,18 +0,0 @@ -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - -#include "../cpu_model/aarch64.h" - -struct FEATURES { - unsigned long long features; -}; - -extern struct FEATURES __aarch64_cpu_features; - -CONSTRUCTOR_ATTRIBUTE static void get_aarch64_cpu_features(void) { - if (__atomic_load_n(&__aarch64_cpu_features.features, __ATOMIC_RELAXED)) - return; - - __init_cpu_features(); -}