3 files changed, 6 insertions, 8 deletions
diff --git a/src/synth/elab-debugger.adb b/src/synth/elab-debugger.adb
index 0ff6a80e5..9d888cc95 100644
--- a/src/synth/elab-debugger.adb
+++ b/src/synth/elab-debugger.adb
@@ -33,8 +33,6 @@ with Elab.Vhdl_Context.Debug; use Elab.Vhdl_Context.Debug;
 with Elab.Vhdl_Debug; use Elab.Vhdl_Debug;
 
 package body Elab.Debugger is
-   Flag_Enabled : Boolean := False;
-
    Current_Instance : Synth_Instance_Acc;
    Current_Loc : Node;
 
@@ -923,7 +921,7 @@ package body Elab.Debugger is
 
    procedure Debug_Init (Top : Node) is
    begin
-      Flag_Enabled := True;
+      Flag_Debug_Enable := True;
 
       Current_Instance := null;
       Current_Loc := Top;
@@ -939,7 +937,7 @@ package body Elab.Debugger is
    begin
       Current_Instance := Top;
       Current_Loc := Get_Source_Scope (Top);
-      Flag_Enabled := True;
+      Flag_Debug_Enable := True;
 
       --  To avoid warnings.
       Exec_Statement := Null_Node;
@@ -985,7 +983,7 @@ package body Elab.Debugger is
 
    procedure Debug_Error (Inst : Synth_Instance_Acc; Expr : Node) is
    begin
-      if Flag_Enabled then
+      if Flag_Debug_Enable then
          Current_Instance := Inst;
          Current_Loc := Expr;
          Debug (Reason_Error);
diff --git a/src/synth/elab-debugger.ads b/src/synth/elab-debugger.ads
index 61b16fb97..02b37c2d0 100644
--- a/src/synth/elab-debugger.ads
+++ b/src/synth/elab-debugger.ads
@@ -23,6 +23,9 @@ with Vhdl.Nodes; use Vhdl.Nodes;
 with Elab.Vhdl_Context; use Elab.Vhdl_Context;
 
 package Elab.Debugger is
+   --  True to start debugger on error.
+   Flag_Debug_Enable : Boolean := False;
+
    --  If true, debugging is enabled:
    --  * call Debug_Break() before executing the next sequential statement
    --  * call Debug_Leave when a frame is destroyed.
diff --git a/src/synth/synth-flags.ads b/src/synth/synth-flags.ads
index a4034a073..fed17efc1 100644
--- a/src/synth/synth-flags.ads
+++ b/src/synth/synth-flags.ads
@@ -61,9 +61,6 @@ package Synth.Flags is
    --  True to start debugger at elaboration.
    Flag_Debug_Init : Boolean := False;
 
-   --  True to start debugger on error.
-   Flag_Debug_Enable : Boolean := False;
-
    --  Maximum number of iterations for (while)/loop.  0 means unlimited.
    Flag_Max_Loop : Natural := 1000;