From c0edef4e9bd10b54932f972d9496679dd8a60614 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Tue, 26 Apr 2022 10:28:23 +0200
Subject: ghdldrv: call elab.vhdl_objtypes.init in options

---
 src/ghdldrv/ghdlsynth.adb | 3 ---
 src/options.adb           | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb
index 19b8cf9ff..581c536d9 100644
--- a/src/ghdldrv/ghdlsynth.adb
+++ b/src/ghdldrv/ghdlsynth.adb
@@ -47,7 +47,6 @@ with Netlists.Inference;
 
 with Elab.Vhdl_Context; use Elab.Vhdl_Context;
 with Elab.Vhdl_Insts;
-with Elab.Vhdl_Objtypes;
 
 with Synthesis;
 with Synth.Disp_Vhdl;
@@ -286,8 +285,6 @@ package body Ghdlsynth is
          --  association.  They are handled directly.
          Vhdl.Canon.Canon_Flag_Inertial_Associations := False;
 
-         Elab.Vhdl_Objtypes.Init;
-
          if Ghdlcomp.Init_Verilog_Options /= null then
             Ghdlcomp.Init_Verilog_Options.all (False);
          end if;
diff --git a/src/options.adb b/src/options.adb
index 5e34609d6..4bafa33fc 100644
--- a/src/options.adb
+++ b/src/options.adb
@@ -34,6 +34,8 @@ with Vhdl.Parse;
 with Vhdl.Errors;
 with Vhdl.Back_End; use Vhdl.Back_End;
 
+with Elab.Vhdl_Objtypes;
+
 package body Options is
    procedure Initialize is
    begin
@@ -42,6 +44,7 @@ package body Options is
       Str_Table.Initialize;
       Vhdl.Lists.Initialize;
       Vhdl.Nodes.Initialize;
+      Elab.Vhdl_Objtypes.Init;
       Files_Map.Initialize;
       Libraries.Initialize;
       PSL.Nodes.Init (Libraries.Library_Location);
-- 
cgit v1.2.3