1 files changed, 2 insertions, 15 deletions
diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index 4e0b0b05b..722c1a26f 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -86,7 +86,6 @@ package body Ghdllocal is
       pragma Assert (Opt'First = 1);
       pragma Assert (Opt'Last >= 5);
       Eq_Pos : Natural;
-      Id : Name_Id;
    begin
       Eq_Pos := 0;
       for I in 3 .. Opt'Last loop
@@ -106,21 +105,9 @@ package body Ghdllocal is
          return Option_Err;
       end if;
 
-      declare
-         Res : String (1 .. Eq_Pos - 3) := Opt (3 .. Eq_Pos - 1);
-         Err : Boolean;
-      begin
-         Vhdl.Scanner.Convert_Identifier (Res, Err);
-         if Err then
-            Error_Msg_Option
-              ("incorrect generic name in generic override option");
-            return Option_Err;
-         end if;
-         Id := Name_Table.Get_Identifier (Res);
-      end;
-
       Vhdl.Configuration.Add_Generic_Override
-        (Id, Opt (Eq_Pos + 1 .. Opt'Last));
+        (Opt (3 .. Eq_Pos - 1), Opt (Eq_Pos + 1 .. Opt'Last));
+
       return Option_Ok;
    end Decode_Generic_Override_Option;