OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnatlbr.adb: Removed. 

2010-09-09  Doug Rupp  <rupp@adacore.com>

	* gnatlbr.adb: Removed.
	* gnat_rm.texi, ug_words, gnat_ugn.texi: Remove mention of gnatlbr.

From-SVN: r164080
This commit is contained in:
Doug Rupp 2010-09-09 12:23:29 +00:00 committed by Arnaud Charlet
parent ae2aa10933
commit 48a54da312
5 changed files with 6 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2010-09-09 Doug Rupp <rupp@adacore.com>
* gnatlbr.adb: Removed.
* gnat_rm.texi, ug_words, gnat_ugn.texi: Remove mention of gnatlbr.
2010-09-09 Robert Dewar <dewar@adacore.com>
* sem_res.adb (Resolve_Type_Conversion): Catch more cases of redundant

7
gcc/ada/gnat_rm.texi
View File

@ -2428,9 +2428,7 @@ floating point types declared in the packages @code{Standard} and
be @code{IEEE_Float} and the pragma has no effect. On OpenVMS, the
argument may be @code{VAX_Float} to specify the use of the VAX float
format for the floating-point types in Standard. This requires that
the standard runtime libraries be recompiled. @xref{The GNAT Run-Time
Library Builder gnatlbr,,, gnat_ugn, @value{EDITION} User's Guide
OpenVMS}, for a description of the @code{GNAT LIBRARY} command.
the standard runtime libraries be recompiled.
The two argument form specifies the representation to be used for
the specified floating-point type. On all systems other than OpenVMS,
@ -3346,9 +3344,6 @@ type @code{Long_Float} and for floating point type representations with
For further details on this pragma, see the
@cite{DEC Ada Language Reference Manual}, section 3.5.7b. Note that to use
this pragma, the standard runtime libraries must be recompiled.
@xref{The GNAT Run-Time Library Builder gnatlbr,,, gnat_ugn,
@value{EDITION} User's Guide OpenVMS}, for a description of the
@code{GNAT LIBRARY} command.
@node Pragma Machine_Attribute
@unnumberedsec Pragma Machine_Attribute

88
gcc/ada/gnat_ugn.texi
View File

@ -182,9 +182,6 @@ AdaCore@*
* The GNAT Metric Tool gnatmetric::
* File Name Krunching Using gnatkr::
* Preprocessing Using gnatprep::
@ifset vms
* The GNAT Run-Time Library Builder gnatlbr::
@end ifset
* The GNAT Library Browser gnatls::
* Cleaning Up Using gnatclean::
@ifclear vms
@ -409,14 +406,6 @@ Preprocessing Using gnatprep
* Form of Definitions File::
* Form of Input Text for gnatprep::
@ifset vms
The GNAT Run-Time Library Builder gnatlbr
* Running gnatlbr::
* Switches for gnatlbr::
* Examples of gnatlbr Usage::
@end ifset
The GNAT Library Browser gnatls
* Running gnatls::
@ -792,13 +781,6 @@ preprocessor utility that allows a single source file to be used to
generate multiple or parameterized source files by means of macro
substitution.
@ifset vms
@item
@ref{The GNAT Run-Time Library Builder gnatlbr}, describes @command{gnatlbr},
a tool for rebuilding the GNAT run time with user-supplied
configuration pragmas.
@end ifset
@item
@ref{The GNAT Library Browser gnatls}, describes @code{gnatls}, a
utility that displays information about compiled units, including dependences
@ -14995,76 +14977,6 @@ Header : String := $XYZ;
@noindent
and then the substitution will occur as desired.
@ifset vms
@node The GNAT Run-Time Library Builder gnatlbr
@chapter The GNAT Run-Time Library Builder @code{gnatlbr}
@findex gnatlbr
@cindex Library builder
@noindent
@code{gnatlbr} is a tool for rebuilding the GNAT run time with user
supplied configuration pragmas.
@menu
* Running gnatlbr::
* Switches for gnatlbr::
* Examples of gnatlbr Usage::
@end menu
@node Running gnatlbr
@section Running @code{gnatlbr}
@noindent
The @code{gnatlbr} command has the form
@smallexample
$ GNAT LIBRARY /@r{[}CREATE@r{|}SET@r{|}DELETE@r{]}=directory @r{[}/CONFIG=file@r{]}
@end smallexample
@node Switches for gnatlbr
@section Switches for @code{gnatlbr}
@noindent
@code{gnatlbr} recognizes the following switches:
@table @option
@c !sort!
@item /CREATE=directory
@cindex @code{/CREATE} (@code{gnatlbr})
Create the new run-time library in the specified directory.
@item /SET=directory
@cindex @code{/SET} (@code{gnatlbr})
Make the library in the specified directory the current run-time library.
@item /DELETE=directory
@cindex @code{/DELETE} (@code{gnatlbr})
Delete the run-time library in the specified directory.
@item /CONFIG=file
@cindex @code{/CONFIG} (@code{gnatlbr})
With /CREATE: Use the configuration pragmas in the specified file when
building the library.
With /SET: Use the configuration pragmas in the specified file when
compiling.
@end table
@node Examples of gnatlbr Usage
@section Example of @code{gnatlbr} Usage
@smallexample
Contents of VAXFLOAT.ADC:
pragma Float_Representation (VAX_Float);
$ GNAT LIBRARY /CREATE=[.VAXFLOAT] /CONFIG=VAXFLOAT.ADC
GNAT LIBRARY rebuilds the run-time library in directory [.VAXFLOAT]
@end smallexample
@end ifset
@node The GNAT Library Browser gnatls
@chapter The GNAT Library Browser @code{gnatls}
@findex gnatls

345
gcc/ada/gnatlbr.adb
View File

@ -1,345 +0,0 @@
------------------------------------------------------------------------------
-- --
-- GNAT COMPILER COMPONENTS --
-- --
-- G N A T L B R --
-- --
-- B o d y --
-- --
-- Copyright (C) 1997-2010, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNAT; see file COPYING3. If not, go to --
-- http://www.gnu.org/licenses for a complete copy of the license. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
-- --
------------------------------------------------------------------------------
-- Program to create, set, or delete an alternate runtime library
-- Works by calling an appropriate target specific Makefile residing
-- in the default library object (e.g. adalib) directory from the context
-- of the new library objects directory.
-- Command line arguments are:
-- 1st: --[create | set | delete]=<directory_spec>
-- --create : Build a library
-- --set : Set environment variables to point to a library
-- --delete : Delete a library
-- 2nd: --config=<file_spec>
-- A -gnatg valid file containing desired configuration pragmas
-- This program is currently used only on Alpha/VMS
with Ada.Command_Line; use Ada.Command_Line;
with Ada.Text_IO; use Ada.Text_IO;
with GNAT.OS_Lib; use GNAT.OS_Lib;
with Gnatvsn; use Gnatvsn;
with Interfaces.C_Streams; use Interfaces.C_Streams;
with Osint; use Osint;
with System;
procedure GnatLbr is
pragma Ident (Gnat_Static_Version_String);
type Lib_Mode is (None, Create, Set, Delete);
Next_Arg : Integer;
Mode : Lib_Mode := None;
ADC_File : String_Access := null;
Lib_Dir : String_Access := null;
Make : constant String := "make";
Make_Path : String_Access;
procedure Create_Directory (Name : System.Address);
pragma Import (C, Create_Directory, "__gnat_mkdir");
begin
if Argument_Count = 0 then
Put ("Usage: ");
Put_Line
("gnatlbr --[create|set|delete]=<directory> [--config=<file>]");
Exit_Program (E_Fatal);
end if;
Next_Arg := 1;
loop
exit when Next_Arg > Argument_Count;
Process_One_Arg : declare
Arg : constant String := Argument (Next_Arg);
begin
if Arg'Length > 9 and then Arg (1 .. 9) = "--create=" then
if Mode = None then
Mode := Create;
Lib_Dir := new String'(Arg (10 .. Arg'Last));
else
Put_Line (Standard_Error, "Error: Multiple modes specified");
Exit_Program (E_Fatal);
end if;
elsif Arg'Length > 6 and then Arg (1 .. 6) = "--set=" then
if Mode = None then
Mode := Set;
Lib_Dir := new String'(Arg (7 .. Arg'Last));
else
Put_Line (Standard_Error, "Error: Multiple modes specified");
Exit_Program (E_Fatal);
end if;
elsif Arg'Length > 9 and then Arg (1 .. 9) = "--delete=" then
if Mode = None then
Mode := Delete;
Lib_Dir := new String'(Arg (10 .. Arg'Last));
else
Put_Line (Standard_Error, "Error: Multiple modes specified");
Exit_Program (E_Fatal);
end if;
elsif Arg'Length > 9 and then Arg (1 .. 9) = "--config=" then
if ADC_File /= null then
Put_Line (Standard_Error,
"Error: Multiple gnat.adc files specified");
Exit_Program (E_Fatal);
end if;
ADC_File := new String'(Arg (10 .. Arg'Last));
else
Put_Line (Standard_Error, "Error: Unrecognized option: " & Arg);
Exit_Program (E_Fatal);
end if;
end Process_One_Arg;
Next_Arg := Next_Arg + 1;
end loop;
case Mode is
when Create =>
-- Validate arguments
if Lib_Dir = null then
Put_Line (Standard_Error, "Error: No library directory specified");
Exit_Program (E_Fatal);
end if;
if Is_Directory (Lib_Dir.all) then
Put_Line (Standard_Error,
"Error:" & Lib_Dir.all & " already exists");
Exit_Program (E_Fatal);
end if;
if ADC_File = null then
Put_Line (Standard_Error,
"Error: No configuration file specified");
Exit_Program (E_Fatal);
end if;
if not Is_Regular_File (ADC_File.all) then
Put_Line (Standard_Error,
"Error: " & ADC_File.all & " doesn't exist");
Exit_Program (E_Fatal);
end if;
Create_Block : declare
Success : Boolean;
Make_Args : Argument_List (1 .. 9);
C_Lib_Dir : String := Lib_Dir.all & ASCII.NUL;
C_ADC_File : String := ADC_File.all & ASCII.NUL;
F_ADC_File : String (1 .. max_path_len);
F_ADC_File_Len : Integer := max_path_len;
Include_Dirs : Integer;
Object_Dirs : Integer;
Include_Dir : array (Integer range 1 .. 256) of String_Access;
Object_Dir : array (Integer range 1 .. 256) of String_Access;
Include_Dir_Name : String_Access;
Object_Dir_Name : String_Access;
begin
-- Create the new top level library directory
if not Is_Directory (Lib_Dir.all) then
Create_Directory (C_Lib_Dir'Address);
end if;
full_name (C_ADC_File'Address, F_ADC_File'Address);
for I in 1 .. max_path_len loop
if F_ADC_File (I) = ASCII.NUL then
F_ADC_File_Len := I - 1;
exit;
end if;
end loop;
--
-- Make a list of the default library source and object
-- directories. Usually only one, except on VMS where
-- there are two.
--
Include_Dirs := 0;
Include_Dir_Name := new String'(Include_Dir_Default_Prefix);
Get_Next_Dir_In_Path_Init (Include_Dir_Name);
loop
declare
Dir : constant String_Access :=
Get_Next_Dir_In_Path (Include_Dir_Name);
begin
exit when Dir = null;
Include_Dirs := Include_Dirs + 1;
Include_Dir (Include_Dirs) :=
String_Access (Normalize_Directory_Name (Dir.all));
end;
end loop;
Object_Dirs := 0;
Object_Dir_Name := new String'(Object_Dir_Default_Prefix);
Get_Next_Dir_In_Path_Init (Object_Dir_Name);
loop
declare
Dir : constant String_Access :=
Get_Next_Dir_In_Path (Object_Dir_Name);
begin
exit when Dir = null;
Object_Dirs := Object_Dirs + 1;
Object_Dir (Object_Dirs)
:= String_Access (Normalize_Directory_Name (Dir.all));
end;
end loop;
-- "Make" an alternate sublibrary for each default sublibrary
for Dirs in 1 .. Object_Dirs loop
Make_Args (1) :=
new String'("-C");
Make_Args (2) :=
new String'(Lib_Dir.all);
-- Resolve /gnu on VMS by converting to host format and then
-- convert resolved path back to canonical format for the
-- make program. This fixes the problem that can occur when
-- GNU: is a search path pointing to multiple versions of GNAT.
Make_Args (3) :=
new String'("ADA_INCLUDE_PATH=" &
To_Canonical_Dir_Spec
(To_Host_Dir_Spec
(Include_Dir (Dirs).all, True).all, True).all);
Make_Args (4) :=
new String'("ADA_OBJECTS_PATH=" &
To_Canonical_Dir_Spec
(To_Host_Dir_Spec
(Object_Dir (Dirs).all, True).all, True).all);
Make_Args (5) :=
new String'("GNAT_ADC_FILE="
& F_ADC_File (1 .. F_ADC_File_Len));
Make_Args (6) :=
new String'("LIBRARY_VERSION=" & '"' &
Verbose_Library_Version & '"');
Make_Args (7) :=
new String'("-f");
Make_Args (8) :=
new String'(Object_Dir (Dirs).all & "Makefile.lib");
Make_Args (9) :=
new String'("create");
Make_Path := Locate_Exec_On_Path (Make);
Put (Make);
for J in 1 .. Make_Args'Last loop
Put (" ");
Put (Make_Args (J).all);
end loop;
New_Line;
Spawn (Make_Path.all, Make_Args, Success);
if not Success then
Put_Line (Standard_Error, "Error: Make failed");
Exit_Program (E_Fatal);
end if;
end loop;
end Create_Block;
when Set =>
-- Validate arguments
if Lib_Dir = null then
Put_Line (Standard_Error,
"Error: No library directory specified");
Exit_Program (E_Fatal);
end if;
if not Is_Directory (Lib_Dir.all) then
Put_Line (Standard_Error,
"Error: " & Lib_Dir.all & " doesn't exist");
Exit_Program (E_Fatal);
end if;
if ADC_File = null then
Put_Line (Standard_Error,
"Error: No configuration file specified");
Exit_Program (E_Fatal);
end if;
if not Is_Regular_File (ADC_File.all) then
Put_Line (Standard_Error,
"Error: " & ADC_File.all & " doesn't exist");
Exit_Program (E_Fatal);
end if;
-- Give instructions
Put_Line ("Copy the contents of "
& ADC_File.all & " into your GNAT.ADC file");
Put_Line ("and use GNAT Make qualifier /OBJECT_SEARCH=("
& To_Host_Dir_Spec
(Lib_Dir (Lib_Dir'First .. Lib_Dir'Last) & "/declib", False).all
& ","
& To_Host_Dir_Spec
(Lib_Dir (Lib_Dir'First .. Lib_Dir'Last) & "/adalib", False).all
& ")");
Put_Line ("or else define ADA_OBJECTS_PATH as " & '"'
& To_Host_Dir_Spec
(Lib_Dir (Lib_Dir'First .. Lib_Dir'Last) & "/declib", False).all
& ','
& To_Host_Dir_Spec
(Lib_Dir (Lib_Dir'First .. Lib_Dir'Last) & "/adalib", False).all
& '"');
when Delete =>
-- Give instructions
Put_Line ("GNAT Librarian DELETE not yet implemented.");
Put_Line ("Use appropriate system tools to remove library");
when None =>
Put_Line (Standard_Error,
"Error: No mode (create|set|delete) specified");
Exit_Program (E_Fatal);
end case;
end GnatLbr;

2
gcc/ada/ug_words
View File

@ -24,8 +24,6 @@ gnatfind ^ GNAT FIND
Gnatfind ^ GNAT FIND
gnatkr ^ GNAT KRUNCH
Gnatkr ^ GNAT KRUNCH
gnatlbr ^ GNAT LIBRARY
Gnatlbr ^ GNAT LIBRARY
gnatlink ^ GNAT LINK
Gnatlink ^ GNAT LINK
gnatls ^ GNAT LIST