updated for ghdl-0.20

4 files changed, 19 insertions, 13 deletions

diff --git a/translate/ghdldrv/ghdl_gcc.adb b/translate/ghdldrv/ghdl_gcc.adb
index 5edb6bf38..a93579ba6 100644
--- a/translate/ghdldrv/ghdl_gcc.adb
+++ b/translate/ghdldrv/ghdl_gcc.adb
@@ -24,7 +24,7 @@ procedure Ghdl_Gcc is
 begin
    --  Manual elaboration so that the order is known (because it is the order
    --  used to display help).
-   Ghdlmain.Version_String := new String'("(Use the GCC back-end.)");
+   Ghdlmain.Version_String := new String'("GCC back-end code generator");
    Ghdldrv.Register_Commands;
    Ghdllocal.Register_Commands;
    Ghdlprint.Register_Commands;
diff --git a/translate/ghdldrv/ghdl_mcode.adb b/translate/ghdldrv/ghdl_mcode.adb
index 3506856ce..56b23420c 100644
--- a/translate/ghdldrv/ghdl_mcode.adb
+++ b/translate/ghdldrv/ghdl_mcode.adb
@@ -24,7 +24,7 @@ procedure Ghdl_Mcode is
 begin
    --  Manual elaboration so that the order is known (because it is the order
    --  used to display help).
-   Ghdlmain.Version_String := new String'("(Use the mcode code generator.)");
+   Ghdlmain.Version_String := new String'("mcode code generator");
    Ghdlrun.Register_Commands;
    Ghdllocal.Register_Commands;
    Ghdlprint.Register_Commands;
diff --git a/translate/ghdldrv/ghdldrv.adb b/translate/ghdldrv/ghdldrv.adb
index d863f6189..6612fb3fe 100644
--- a/translate/ghdldrv/ghdldrv.adb
+++ b/translate/ghdldrv/ghdldrv.adb
@@ -637,12 +637,6 @@ package body Ghdldrv is
          Add_Argument (Compiler_Args, Str);
          Add_Argument (Linker_Args, Str);
          Res := Option_Ok;
-      elsif Option'Length >= 2
-        and then (Option (2) = 'O' or Option (2) = 'f')
-      then
-         --  Optimization option.
-         Add_Argument (Compiler_Args, new String'(Option));
-         Res := Option_Ok;
       elsif Option = "-Q" then
          Flag_Not_Quiet := True;
          Res := Option_Ok;
@@ -653,6 +647,14 @@ package body Ghdldrv is
       elsif Flags.Parse_Option (Option) then
          Add_Argument (Compiler_Args, new String'(Option));
          Res := Option_Ok;
+      elsif Option'Length >= 2
+        and then (Option (2) = 'O' or Option (2) = 'f')
+      then
+         --  Optimization option.
+         --  This is put after Flags.Parse_Option, since it may catch -fxxx
+         --  options.
+         Add_Argument (Compiler_Args, new String'(Option));
+         Res := Option_Ok;
       else
          Decode_Option (Command_Lib (Cmd), Option, Arg, Res);
       end if;
diff --git a/translate/ghdldrv/ghdlmain.adb b/translate/ghdldrv/ghdlmain.adb
index bd2462ff8..717e4fc4b 100644
--- a/translate/ghdldrv/ghdlmain.adb
+++ b/translate/ghdldrv/ghdlmain.adb
@@ -216,16 +216,20 @@ package body Ghdlmain is
       use Ada.Text_IO;
    begin
       Put_Line (Version.Ghdl_Version);
+      Put_Line (" Compiled with " & Bug.Get_Gnat_Version);
       if Version_String /= null then
-         Put_Line (Version_String.all);
+         Put (" ");
+         Put (Version_String.all);
       end if;
+      New_Line;
       Put_Line ("Written by Tristan Gingold.");
       New_Line;
+      --  Display copyright.  Assume 80 cols terminal.
       Put_Line ("Copyright (C) 2003, 2004, 2005 Tristan Gingold.");
-      Put_Line ("This is free software; see the source for copying conditions."
-                & " There is NO");
-      Put_Line ("warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-                & "PARTICULAR PURPOSE.");
+      Put_Line ("GHDL is free software, covered by the "
+                & "GNU General Public License.  There is NO");
+      Put_Line ("warranty; not even for MERCHANTABILITY or"
+                & " FITNESS FOR A PARTICULAR PURPOSE.");
       if Args'Length /= 0 then
          Error ("warning: command '--version' does not accept any argument");
       end if;