From f00e82b773d8e9783b59a72e95406ef8b2357dbf Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 10 Jun 2024 10:12:33 +0200
Subject: [PATCH] Cleanup

---
 frontends/verific/verific.cc | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 02178c70112..1321b30d3ac 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -84,10 +84,6 @@ USING_YOSYS_NAMESPACE
 #endif
 #endif
 
-#ifndef DB_PRESERVE_INITIAL_VALUE
-#error "Verific must have DB_PRESERVE_INITIAL_VALUE compile flag set on"
-#endif
-
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
@@ -2700,12 +2696,13 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
 
 	std::map<std::string,Netlist*> nl_todo, nl_done;
 	Array *netlists = NULL;
-	Array veri_libs, vhdl_libs;
 #ifdef VERIFIC_VHDL_SUPPORT
+	Array vhdl_libs;
 	VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary("work", 1);
 	if (vhdl_lib) vhdl_libs.InsertLast(vhdl_lib);
 #endif
 #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT
+	Array veri_libs;
 	VeriLibrary *veri_lib = veri_file::GetLibrary("work", 1);
 	if (veri_lib) veri_libs.InsertLast(veri_lib);
 #endif
@@ -3895,17 +3892,15 @@ struct VerificPass : public Pass {
 					verific_sva_fsm_limit = atoi(args[++argidx].c_str());
 					continue;
 				}
-#endif
-				if (args[argidx] == "-n") {
-					mode_names = true;
-					continue;
-				}
-#ifdef VERIFIC_SYSTEMVERILOG_SUPPORT
 				if (args[argidx] == "-autocover") {
 					mode_autocover = true;
 					continue;
 				}
 #endif
+				if (args[argidx] == "-n") {
+					mode_names = true;
+					continue;
+				}
 				if (args[argidx] == "-fullinit") {
 					mode_fullinit = true;
 					continue;