diff options
| author | Tristan Gingold <tgingold@free.fr> | 2022-04-29 19:16:37 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2022-04-29 19:16:37 +0200 |
| commit | 514762e26ffef8c8fc4167bb4d29a7de338893d8 (patch) | |
| tree | acdc56120b2aa6fc763c1cbda81b07bfba3eaaab | |
| parent | ccf5be59b2367994f709a16491e0e0c354b0f700 (diff) | |
| download | ghdl-514762e26ffef8c8fc4167bb4d29a7de338893d8.tar.gz ghdl-514762e26ffef8c8fc4167bb4d29a7de338893d8.tar.bz2 ghdl-514762e26ffef8c8fc4167bb4d29a7de338893d8.zip | |
elab-vhdl_insts: use block configuration from configuration
| -rw-r--r-- | src/synth/elab-vhdl_insts.adb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/synth/elab-vhdl_insts.adb b/src/synth/elab-vhdl_insts.adb index 96272af7c..d02691de0 100644 --- a/src/synth/elab-vhdl_insts.adb +++ b/src/synth/elab-vhdl_insts.adb @@ -699,9 +699,12 @@ package body Elab.Vhdl_Insts is else Arch := Get_Named_Entity (Arch); end if; - Sub_Config := Get_Library_Unit - (Get_Default_Configuration_Declaration (Arch)); - Sub_Config := Get_Block_Configuration (Sub_Config); + Sub_Config := Get_Block_Configuration (Config); + if Sub_Config = Null_Node then + Sub_Config := Get_Library_Unit + (Get_Default_Configuration_Declaration (Arch)); + Sub_Config := Get_Block_Configuration (Sub_Config); + end if; Elab_Dependencies (Root_Instance, Get_Design_Unit (Ent)); Elab_Dependencies (Root_Instance, Get_Design_Unit (Arch)); |