diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-03-01 21:05:02 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-03-02 07:37:58 +0100 |
| commit | f4cfdde434e6b8a22acaacac9e129c7dbd600c58 (patch) | |
| tree | 4fdf0b83ffb4a5ae451b4346d1ad33ba193b3638 /src | |
| parent | a15bec5d6628a05cbfa5f78a46f48ac55e8be52a (diff) | |
| download | ghdl-f4cfdde434e6b8a22acaacac9e129c7dbd600c58.tar.gz ghdl-f4cfdde434e6b8a22acaacac9e129c7dbd600c58.tar.bz2 ghdl-f4cfdde434e6b8a22acaacac9e129c7dbd600c58.zip | |
Remove --ieee=mentor and build of mentor libraries.
Diffstat (limited to 'src')
| -rw-r--r-- | src/errorout.ads | 4 | ||||
| -rw-r--r-- | src/ghdldrv/ghdllocal.adb | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/errorout.ads b/src/errorout.ads index 763a8344b..08d0c3fcd 100644 --- a/src/errorout.ads +++ b/src/errorout.ads @@ -36,6 +36,9 @@ package Errorout is -- Design unit redefines another design unit. Warnid_Library, + -- Option is deprecated. + Warnid_Deprecated_Option, + -- Missing Xref in pretty print. Warnid_Missing_Xref, @@ -302,6 +305,7 @@ private (Warnid_Library | Warnid_Binding | Warnid_Port | Warnid_Shared | Warnid_Runtime_Error | Warnid_Pure | Warnid_Specs | Warnid_Hide | Warnid_Pragma | Warnid_Analyze_Assert | Warnid_Attribute + | Warnid_Deprecated_Option | Msgid_Warning => (Enabled => True, Error => False), others => (Enabled => False, Error => False)); diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb index 72d95eb51..5745b2b50 100644 --- a/src/ghdldrv/ghdllocal.adb +++ b/src/ghdldrv/ghdllocal.adb @@ -36,7 +36,7 @@ with Vhdl.Prints; package body Ghdllocal is -- Version of the IEEE library to use. This just change paths. - type Ieee_Lib_Kind is (Lib_Standard, Lib_None, Lib_Synopsys, Lib_Mentor); + type Ieee_Lib_Kind is (Lib_Standard, Lib_None, Lib_Synopsys); Flag_Ieee : Ieee_Lib_Kind; -- If TRUE, generate 32bits code on 64bits machines. @@ -120,6 +120,7 @@ package body Ghdllocal is function Decode_Driver_Option (Opt : String) return Option_State is + use Errorout; pragma Assert (Opt'First = 1); begin if Opt = "-v" and then Flag_Verbose = False then @@ -129,7 +130,10 @@ package body Ghdllocal is elsif Opt = "--ieee=synopsys" then Flag_Ieee := Lib_Synopsys; elsif Opt = "--ieee=mentor" then - Flag_Ieee := Lib_Mentor; + Warning_Msg_Option + (Warnid_Deprecated_Option, + "option --ieee=mentor is deprecated, replaced by --ieee=synopsys"); + Flag_Ieee := Lib_Synopsys; elsif Opt = "--ieee=none" then Flag_Ieee := Lib_None; elsif Opt = "--ieee=standard" then @@ -174,7 +178,7 @@ package body Ghdllocal is P (" --PREFIX=DIR Specify installation prefix"); P (" --ieee=NAME Use NAME as ieee library, where name is:"); P (" standard: standard version (default)"); - P (" synopsys, mentor: vendor version (not advised)"); + P (" synopsys: vendor version (not advised)"); P (" none: do not use a predefined ieee library"); end Disp_Long_Help; @@ -441,12 +445,6 @@ package body Ghdllocal is Add_Library_Name ("ieee"); when Lib_Synopsys => Add_Library_Name ("synopsys"); - when Lib_Mentor => - if Vhdl_Std >= Vhdl_08 then - Warning ("--ieee=mentor is ignored for --std=08"); - else - Add_Library_Name ("mentor"); - end if; when Lib_None => null; end case; |