Revert "[builtins] Refactor cpu_model support to reduce #if nesting. …

…NFCI" This reverts commit 025d048. It broke one of the sanitizer bots: https://lab.llvm.org/buildbot/#/builders/240/builds/20666
llvm · Dec 19, 2023 · b72e160 · b72e160
1 parent b8b40e2
commit b72e160
Show file tree

Hide file tree

Showing 14 changed files with 618 additions and 745 deletions.
diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -271,7 +271,7 @@ endif()
 
 # These files are used on 32-bit and 64-bit x86.
 set(x86_ARCH_SOURCES
-  cpu_model/x86.c
+  cpu_model.c
   )
 
 if (NOT MSVC)
@@ -556,7 +556,7 @@ endif()
 set(aarch64_SOURCES
   ${GENERIC_TF_SOURCES}
   ${GENERIC_SOURCES}
-  cpu_model/aarch64.c
+  cpu_model.c
   aarch64/fp_mode.c
 )