From 016a77ce4006e1759393dfa12d7c00fcd18fbf19 Mon Sep 17 00:00:00 2001
From: Kathlene Magnus <kathlene.hurt@gmail.com>
Date: Wed, 13 Nov 2024 14:39:03 -0600
Subject: [PATCH] Fix build dependencies

---
 arch/CMakeLists.txt               | 7 +++----
 core/inst_handlers/CMakeLists.txt | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/CMakeLists.txt b/arch/CMakeLists.txt
index 7e3503d..7f69e5b 100644
--- a/arch/CMakeLists.txt
+++ b/arch/CMakeLists.txt
@@ -13,11 +13,10 @@ set(AUTOGEN_RV64_REG_JSON_FILES
 )
 
 set(AUTOGEN_CSR_HEADERS
-  ${SIM_BASE}/arch/rv32/CSRBitMasks32.hpp 
-  ${SIM_BASE}/arch/rv32/CSRNums.hpp
-  ${SIM_BASE}/arch/rv32/CSRFieldIdxs32.hpp
-  ${SIM_BASE}/include/CSRBitMasks64.hpp
   ${SIM_BASE}/include/CSRNums.hpp
+  ${SIM_BASE}/include/CSRBitMasks32.hpp
+  ${SIM_BASE}/include/CSRFieldIdxs32.hpp
+  ${SIM_BASE}/include/CSRBitMasks64.hpp
   ${SIM_BASE}/include/CSRFieldIdxs64.hpp
 )
 
diff --git a/core/inst_handlers/CMakeLists.txt b/core/inst_handlers/CMakeLists.txt
index 3e8de3d..2590fdc 100644
--- a/core/inst_handlers/CMakeLists.txt
+++ b/core/inst_handlers/CMakeLists.txt
@@ -12,3 +12,4 @@ target_link_libraries(atlasinsts
     rvzicsr
     rvzifencei
 )
+add_dependencies(atlasinsts AutogenArchFiles)