From: Tonu Naks <n...@adacore.com>

gcc/ada/ChangeLog:

        * gnatls.adb: remove -l switch

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/gnatls.adb | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index 6fa2327e724..5f7e490c1c5 100644
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -117,7 +117,6 @@ procedure Gnatls is
 
    Also_Predef       : Boolean := False;  --  -a
    Dependable        : Boolean := False;  --  -d
-   License           : Boolean := False;  --  -l
    Very_Verbose_Mode : Boolean := False;  --  -V
    --  Command line flags
 
@@ -188,9 +187,6 @@ procedure Gnatls is
    procedure Usage;
    --  Print usage message
 
-   procedure Output_License_Information;
-   --  Output license statement, and if not found, output reference to COPYING
-
    function Image (Restriction : Restriction_Id) return String;
    --  Returns the capitalized image of Restriction
 
@@ -881,20 +877,6 @@ procedure Gnatls is
       return Normalize_Pathname (Path);
    end Normalize;
 
-   --------------------------------
-   -- Output_License_Information --
-   --------------------------------
-
-   procedure Output_License_Information is
-   begin
-      case Build_Type is
-         when others =>
-            Write_Str ("Please refer to file COPYING in your distribution"
-                     & " for license terms.");
-            Write_Eol;
-      end case;
-   end Output_License_Information;
-
    -------------------
    -- Output_Object --
    -------------------
@@ -1794,7 +1776,6 @@ procedure Gnatls is
                when 'o' => Reset_Print; Print_Object := True;
                when 'v' => Verbose_Mode              := True;
                when 'd' => Dependable                := True;
-               when 'l' => License                   := True;
                when 'V' => Very_Verbose_Mode         := True;
 
                when others => OK := False;
@@ -1948,11 +1929,6 @@ procedure Gnatls is
                                "depend");
       Write_Eol;
 
-      --  Line for -l
-
-      Write_Str ("  -l         output license information");
-      Write_Eol;
-
       --  Line for -v
 
       Write_Str ("  -v         verbose output, full path and unit " &
@@ -2048,21 +2024,6 @@ begin
       Next_Arg := Next_Arg + 1;
    end loop Scan_Args;
 
-   --  If -l (output license information) is given, it must be the only switch
-
-   if License then
-      if Arg_Count = 2 then
-         Output_License_Information;
-
-      else
-         Set_Standard_Error;
-         Write_Str ("Can't use -l with another switch");
-         Write_Eol;
-         Try_Help;
-         Exit_Program (E_Fatal);
-      end if;
-   end if;
-
    --  Handle --RTS switch
 
    if RTS_Specified /= null then
-- 
2.43.0

Reply via email to