diff options
Diffstat (limited to 'gcc/ada/gnatlink.adb')
| -rw-r--r-- | gcc/ada/gnatlink.adb | 613 |
1 files changed, 452 insertions, 161 deletions
diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb index 6fa413a19d9..1a3407e55f2 100644 --- a/gcc/ada/gnatlink.adb +++ b/gcc/ada/gnatlink.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1996-2002 Free Software Foundation, Inc. -- +-- Copyright (C) 1996-2003 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- -- @@ -31,6 +31,7 @@ with ALI; use ALI; with Gnatvsn; use Gnatvsn; with Hostparm; with Namet; use Namet; +with Opt; with Osint; use Osint; with Output; use Output; with Switch; use Switch; @@ -124,8 +125,8 @@ procedure Gnatlink is Read_Mode : constant String := "r" & ASCII.Nul; - Begin_Info : String := "-- BEGIN Object file/option list"; - End_Info : String := "-- END Object file/option list "; + Begin_Info : String := "-- BEGIN Object file/option list"; + End_Info : String := "-- END Object file/option list "; -- Note: above lines are modified in C mode, see option processing Gcc_Path : String_Access; @@ -184,6 +185,9 @@ procedure Gnatlink is function Value (chars : chars_ptr) return String; -- Return NUL-terminated string chars as an Ada string. + procedure Write_Header; + -- Show user the program name, version and copyright. + procedure Write_Usage; -- Show user the program options. @@ -260,7 +264,10 @@ procedure Gnatlink is ------------------ procedure Process_Args is - Next_Arg : Integer; + Next_Arg : Integer; + Skip_Next : Boolean := False; + -- Set to true if the next argument is to be added into the list of + -- linker's argument without parsing it. begin -- Loop through arguments of gnatlink command @@ -270,14 +277,25 @@ procedure Gnatlink is exit when Next_Arg > Argument_Count; Process_One_Arg : declare - Arg : String := Argument (Next_Arg); + Arg : constant String := Argument (Next_Arg); begin -- Case of argument which is a switch -- We definitely need section by section comments here ??? - if Arg'Length /= 0 and then Arg (1) = '-' then + if Skip_Next then + + -- This argument must not be parsed, just add it to the + -- list of linker's options. + + Skip_Next := False; + + Linker_Options.Increment_Last; + Linker_Options.Table (Linker_Options.Last) := + new String'(Arg); + + elsif Arg'Length /= 0 and then Arg (1) = '-' then if Arg'Length > 4 and then Arg (2 .. 5) = "gnat" then @@ -285,7 +303,18 @@ procedure Gnatlink is ("invalid switch: """ & Arg & """ (gnat not needed here)"); end if; - if Arg (2) = 'g' + if Arg = "-Xlinker" then + + -- Next argument should be sent directly to the linker. + -- We do not want to parse it here. + + Skip_Next := True; + + Linker_Options.Increment_Last; + Linker_Options.Table (Linker_Options.Last) := + new String'(Arg); + + elsif Arg (2) = 'g' and then (Arg'Length < 5 or else Arg (2 .. 5) /= "gnat") then Debug_Flag_Present := True; @@ -302,8 +331,8 @@ procedure Gnatlink is case Arg (2) is when 'A' => Ada_Bind_File := True; - Begin_Info := "-- BEGIN Object file/option list"; - End_Info := "-- END Object file/option list "; + Begin_Info := "-- BEGIN Object file/option list"; + End_Info := "-- END Object file/option list "; when 'b' => Linker_Options.Increment_Last; @@ -321,7 +350,7 @@ procedure Gnatlink is end if; Get_Machine_Name : declare - Name_Arg : String_Access := + Name_Arg : constant String_Access := new String'(Argument (Next_Arg)); begin @@ -337,8 +366,8 @@ procedure Gnatlink is when 'C' => Ada_Bind_File := False; - Begin_Info := "/* BEGIN Object file/option list"; - End_Info := " END Object file/option list */"; + Begin_Info := "/* BEGIN Object file/option list"; + End_Info := " END Object file/option list */"; when 'f' => if Object_List_File_Supported then @@ -368,6 +397,9 @@ procedure Gnatlink is Linker_Options.Table (Linker_Options.Last) := Output_File_Name; + when 'R' => + Opt.Run_Path_Option := False; + when 'v' => -- Support "double" verbose mode. Second -v @@ -399,7 +431,7 @@ procedure Gnatlink is elsif Arg (2) = 'B' then Linker_Options.Increment_Last; Linker_Options.Table (Linker_Options.Last) := - new String'(Arg); + new String'(Arg); Binder_Options.Increment_Last; Binder_Options.Table (Binder_Options.Last) := @@ -421,7 +453,7 @@ procedure Gnatlink is elsif Arg'Length > 6 and then Arg (1 .. 6) = "--GCC=" then declare - Program_Args : Argument_List_Access := + Program_Args : constant Argument_List_Access := Argument_String_To_List (Arg (7 .. Arg'Last)); @@ -433,8 +465,8 @@ procedure Gnatlink is for J in 2 .. Program_Args.all'Last loop declare - Arg : String := Program_Args.all (J).all; - AF : Integer := Arg'First; + Arg : constant String := Program_Args.all (J).all; + AF : constant Integer := Arg'First; begin if Arg'Length /= 0 and then Arg (AF) = '-' then @@ -480,6 +512,8 @@ procedure Gnatlink is -- Here if argument is a file name rather than a switch else + -- If explicit ali file, capture it + if Arg'Length > 4 and then Arg (Arg'Last - 3 .. Arg'Last) = ".ali" then @@ -489,10 +523,7 @@ procedure Gnatlink is Exit_With_Error ("cannot handle more than one ALI file"); end if; - elsif Is_Regular_File (Arg & ".ali") - and then Ali_File_Name = null - then - Ali_File_Name := new String'(Arg & ".ali"); + -- If object file, record object file elsif Arg'Length > Get_Object_Suffix.all'Length and then Arg @@ -503,14 +534,22 @@ procedure Gnatlink is Linker_Objects.Table (Linker_Objects.Last) := new String'(Arg); + -- If corresponding ali file exists, capture it + + elsif Ali_File_Name = null + and then Is_Regular_File (Arg & ".ali") + then + Ali_File_Name := new String'(Arg & ".ali"); + + -- Otherwise assume this is a linker options entry, but + -- see below for interesting adjustment to this assumption. + else Linker_Options.Increment_Last; Linker_Options.Table (Linker_Options.Last) := new String'(Arg); end if; - end if; - end Process_One_Arg; Next_Arg := Next_Arg + 1; @@ -523,6 +562,18 @@ procedure Gnatlink is Binder_Options.Increment_Last; Binder_Options.Table (Binder_Options.Last) := new String'("-gnatws"); end if; + + -- If we did not get an ali file at all, and we had at least one + -- linker option, then assume that was the intended ali file after + -- all, so that we get a nicer message later on. + + if Ali_File_Name = null + and then Linker_Options.Last >= Linker_Options.First + then + Ali_File_Name := + new String'(Linker_Options.Table (Linker_Options.First).all & + ".ali"); + end if; end Process_Args; ------------------------- @@ -530,26 +581,67 @@ procedure Gnatlink is ------------------------- procedure Process_Binder_File (Name : in String) is - Fd : FILEs; - Link_Bytes : Integer := 0; - Link_Max : Integer; + Fd : FILEs; + -- Binder file's descriptor + + Link_Bytes : Integer := 0; + -- Projected number of bytes for the linker command line + + Link_Max : Integer; pragma Import (C, Link_Max, "link_max"); + -- Maximum number of bytes on the command line supported by the OS + -- linker. Passed this limit the response file mechanism must be used + -- if supported. + + Next_Line : String (1 .. 1000); + -- Current line value - Next_Line : String (1 .. 1000); - Nlast : Integer; - Nfirst : Integer; - Objs_Begin : Integer := 0; - Objs_End : Integer := 0; + Nlast : Integer; + Nfirst : Integer; + -- Current line slice (the slice does not contain line terminator) - Status : int; - N : Integer; + Objs_Begin : Integer := 0; + -- First object file index in Linker_Objects table - GNAT_Static : Boolean := False; + Objs_End : Integer := 0; + -- Last object file index in Linker_Objects table + + Status : int; + -- Used for various Interfaces.C_Streams calls + + Closing_Status : Boolean; + -- For call to Close + + GNAT_Static : Boolean := False; -- Save state of -static option. - GNAT_Shared : Boolean := False; + GNAT_Shared : Boolean := False; -- Save state of -shared option. + -- Rollback data + + -- These data items are used to store current binder file context. + -- The context is composed of the file descriptor position and the + -- current line together with the slice indexes (first and last + -- position) for this line. The rollback data are used by the + -- Store_File_Context and Rollback_File_Context routines below. + -- The file context mechanism interact only with the Get_Next_Line + -- call. For example: + + -- Store_File_Context; + -- Get_Next_Line; + -- Rollback_File_Context; + -- Get_Next_Line; + + -- Both Get_Next_Line calls above will read the exact same data from + -- the file. In other words, Next_Line, Nfirst and Nlast variables + -- will be set with the exact same values. + + RB_File_Pos : long; -- File position + RB_Next_Line : String (1 .. 1000); -- Current line content + RB_Nlast : Integer; -- Slice last index + RB_Nfirst : Integer; -- Slice first index + Run_Path_Option_Ptr : Address; pragma Import (C, Run_Path_Option_Ptr, "run_path_option"); -- Pointer to string representing the native linker option which @@ -575,10 +667,28 @@ procedure Gnatlink is -- Read the next line from the binder file without the line -- terminator. + function Index (S, Pattern : String) return Natural; + -- Return the first occurrence of Pattern in S, or 0 if none. + function Is_Option_Present (Opt : in String) return Boolean; -- Return true if the option Opt is already present in -- Linker_Options table. + procedure Store_File_Context; + -- Store current file context, Fd position and current line data. + -- The file context is stored into the rollback data above (RB_*). + -- Store_File_Context can be called at any time, only the last call + -- will be used (i.e. this routine overwrites the file context). + + procedure Rollback_File_Context; + -- Restore file context from rollback data. This routine must be called + -- after Store_File_Context. The binder file context will be restored + -- with the data stored by the last Store_File_Context call. + + ------------------- + -- Get_Next_Line -- + ------------------- + procedure Get_Next_Line is Fchars : chars; @@ -601,6 +711,26 @@ procedure Gnatlink is Nlast := Nlast - 1; end Get_Next_Line; + ----------- + -- Index -- + ----------- + + function Index (S, Pattern : String) return Natural is + Len : constant Natural := Pattern'Length; + begin + for J in S'First .. S'Last - Len + 1 loop + if Pattern = S (J .. J + Len - 1) then + return J; + end if; + end loop; + + return 0; + end Index; + + ----------------------- + -- Is_Option_Present -- + ----------------------- + function Is_Option_Present (Opt : in String) return Boolean is begin for I in 1 .. Linker_Options.Last loop @@ -614,6 +744,38 @@ procedure Gnatlink is return False; end Is_Option_Present; + --------------------------- + -- Rollback_File_Context -- + --------------------------- + + procedure Rollback_File_Context is + begin + Next_Line := RB_Next_Line; + Nfirst := RB_Nfirst; + Nlast := RB_Nlast; + Status := fseek (Fd, RB_File_Pos, Interfaces.C_Streams.SEEK_SET); + + if Status = -1 then + Exit_With_Error ("Error setting file position"); + end if; + end Rollback_File_Context; + + ------------------------ + -- Store_File_Context -- + ------------------------ + + procedure Store_File_Context is + begin + RB_Next_Line := Next_Line; + RB_Nfirst := Nfirst; + RB_Nlast := Nlast; + RB_File_Pos := ftell (Fd); + + if RB_File_Pos = -1 then + Exit_With_Error ("Error getting file position"); + end if; + end Store_File_Context; + -- Start of processing for Process_Binder_File begin @@ -634,7 +796,7 @@ procedure Gnatlink is Get_Next_Line; -- Go to end when end line is reached (this will happen in - -- No_Run_Time mode where no -L switches are generated) + -- High_Integrity_Mode where no -L switches are generated) exit when Next_Line (Nfirst .. Nlast) = End_Info; @@ -663,11 +825,26 @@ procedure Gnatlink is Linker_Objects.Table (Linker_Objects.Last) := new String'(Next_Line (Nfirst .. Nlast)); - Link_Bytes := Link_Bytes + Nlast - Nfirst; + Link_Bytes := Link_Bytes + Nlast - Nfirst + 2; + -- Nlast - Nfirst + 1, for the size, plus one for the space between + -- each arguments. end loop; Objs_End := Linker_Objects.Last; + -- Let's continue to compute the Link_Bytes, the linker options are + -- part of command line length. + + Store_File_Context; + + while Next_Line (Nfirst .. Nlast) /= End_Info loop + Link_Bytes := Link_Bytes + Nlast - Nfirst + 2; + -- See comment above + Get_Next_Line; + end loop; + + Rollback_File_Context; + -- On systems that have limitations on handling very long linker lines -- we make use of the system linker option which takes a list of object -- file names from a file instead of the command line itself. What we do @@ -687,6 +864,10 @@ procedure Gnatlink is Create_Temp_File (Tname_FD, Tname); + -- ??? File descriptor should be checked to not be Invalid_FD. + -- ??? Status of Write and Close operations should be checked, and + -- failure should occur if a status is wrong. + -- If target is using the GNU linker we must add a special header -- and footer in the response file. -- The syntax is : INPUT (object1.o object2.o ... ) @@ -723,7 +904,7 @@ procedure Gnatlink is end; end if; - Close (Tname_FD); + Close (Tname_FD, Closing_Status); -- Add the special objects list file option together with the name -- of the temporary file (removing the null character) to the objects @@ -738,12 +919,17 @@ procedure Gnatlink is -- are removed by moving up the linker options and non-Ada object -- files appearing after the Ada object list in the table. - N := Objs_End - Objs_Begin + 1; - for J in Objs_End + 1 .. Linker_Objects.Last loop - Linker_Objects.Table (J - N + 1) := Linker_Objects.Table (J); - end loop; + declare + N : Integer; + begin + N := Objs_End - Objs_Begin + 1; - Linker_Objects.Set_Last (Linker_Objects.Last - N + 1); + for J in Objs_End + 1 .. Linker_Objects.Last loop + Linker_Objects.Table (J - N + 1) := Linker_Objects.Table (J); + end loop; + + Linker_Objects.Set_Last (Linker_Objects.Last - N + 1); + end; end if; -- Process switches and options @@ -759,7 +945,9 @@ procedure Gnatlink is -- Add binder options only if not already set on the command -- line. This rule is a way to control the linker options order. - elsif not Is_Option_Present (Next_Line (Nfirst .. Nlast)) then + elsif not Is_Option_Present (Next_Line (Nfirst .. Nlast)) + or else Next_Line (Nfirst .. Nlast) = "-Xlinker" + then if Nlast > Nfirst + 2 and then Next_Line (Nfirst .. Nfirst + 1) = "-L" then @@ -792,9 +980,13 @@ procedure Gnatlink is File_Path : String_Access; Object_Lib_Extension : constant String := Value (Object_Library_Ext_Ptr); - - File_Name : String := "lib" & - Next_Line (Nfirst + 2 .. Nlast) & Object_Lib_Extension; + File_Name : constant String := "lib" & + Next_Line (Nfirst + 2 .. Nlast) & + Object_Lib_Extension; + Run_Path_Opt : constant String := + Value (Run_Path_Option_Ptr); + GCC_Index : Natural; + Run_Path_Opt_Index : Natural := 0; begin File_Path := @@ -814,36 +1006,105 @@ procedure Gnatlink is new String'(File_Path.all); elsif GNAT_Shared then + if Opt.Run_Path_Option then + -- If shared gnatlib desired, add the + -- appropriate system specific switch + -- so that it can be located at runtime. - -- If shared gnatlib desired, add the - -- appropriate system specific switch - -- so that it can be located at runtime. - - declare - Run_Path_Opt : constant String := - Value (Run_Path_Option_Ptr); - - begin if Run_Path_Opt'Length /= 0 then - - -- Output the system specific linker - -- command that allows the image - -- activator to find the shared library - -- at runtime. - - Linker_Options.Increment_Last; - - Linker_Options.Table (Linker_Options.Last) - := new String'(Run_Path_Opt - & File_Path - (1 .. File_Path'Length - - File_Name'Length)); + -- Output the system specific linker command + -- that allows the image activator to find + -- the shared library at runtime. + -- Also add path to find libgcc_s.so, if + -- relevant. + + GCC_Index := Index (File_Path.all, "gcc-lib"); + + -- Look for an eventual run_path_option in + -- the linker switches. + + for J in reverse 1 .. Linker_Options.Last loop + if Linker_Options.Table (J) /= null + and then + Linker_Options.Table (J)'Length + > Run_Path_Opt'Length + and then + Linker_Options.Table (J) + (1 .. Run_Path_Opt'Length) = + Run_Path_Opt + then + -- We have found a already specified + -- run_path_option: we will add to this + -- switch, because only one + -- run_path_option should be specified. + + Run_Path_Opt_Index := J; + exit; + end if; + end loop; + + -- If there is no run_path_option, we need + -- to add one. + + if Run_Path_Opt_Index = 0 then + Linker_Options.Increment_Last; + end if; + + if GCC_Index = 0 then + if Run_Path_Opt_Index = 0 then + Linker_Options.Table + (Linker_Options.Last) := + new String' + (Run_Path_Opt + & File_Path + (1 .. File_Path'Length + - File_Name'Length)); + + else + Linker_Options.Table + (Run_Path_Opt_Index) := + new String' + (Linker_Options.Table + (Run_Path_Opt_Index).all + & Path_Separator + & File_Path + (1 .. File_Path'Length + - File_Name'Length)); + end if; + + else + if Run_Path_Opt_Index = 0 then + Linker_Options.Table + (Linker_Options.Last) := + new String'(Run_Path_Opt + & File_Path + (1 .. File_Path'Length + - File_Name'Length) + & Path_Separator + & File_Path (1 .. GCC_Index - 1)); + + else + Linker_Options.Table + (Run_Path_Opt_Index) := + new String' + (Linker_Options.Table + (Run_Path_Opt_Index).all + & Path_Separator + & File_Path + (1 .. File_Path'Length + - File_Name'Length) + & Path_Separator + & File_Path (1 .. GCC_Index - 1)); + end if; + end if; end if; + end if; + + -- Then we add the appropriate -l switch - Linker_Options.Increment_Last; - Linker_Options.Table (Linker_Options.Last) - := new String'(Next_Line (Nfirst .. Nlast)); - end; + Linker_Options.Increment_Last; + Linker_Options.Table (Linker_Options.Last) := + new String'(Next_Line (Nfirst .. Nlast)); end if; else @@ -852,14 +1113,14 @@ procedure Gnatlink is -- mechanimsm may find it. Linker_Options.Increment_Last; - Linker_Options.Table (Linker_Options.Last) - := new String'(Next_Line (Nfirst .. Nlast)); + Linker_Options.Table (Linker_Options.Last) := + new String'(Next_Line (Nfirst .. Nlast)); end if; end; else Linker_Options.Increment_Last; - Linker_Options.Table (Linker_Options.Last) - := new String'(Next_Line (Nfirst .. Nlast)); + Linker_Options.Table (Linker_Options.Last) := + new String'(Next_Line (Nfirst .. Nlast)); end if; end if; @@ -867,8 +1128,8 @@ procedure Gnatlink is exit when Next_Line (Nfirst .. Nlast) = End_Info; if Ada_Bind_File then - Next_Line (Nfirst .. Nlast - 8) - := Next_Line (Nfirst + 8 .. Nlast); + Next_Line (Nfirst .. Nlast - 8) := + Next_Line (Nfirst + 8 .. Nlast); Nlast := Nlast - 8; end if; end loop; @@ -902,12 +1163,29 @@ procedure Gnatlink is end if; end Value; + ------------------ + -- Write_Header -- + ------------------ + + procedure Write_Header is + begin + if Verbose_Mode then + Write_Eol; + Write_Str ("GNATLINK "); + Write_Str (Gnat_Version_String); + Write_Str (" Copyright 1995-2003 Free Software Foundation, Inc"); + Write_Eol; + end if; + end Write_Header; + ----------------- -- Write_Usage -- ----------------- procedure Write_Usage is begin + Write_Header; + Write_Str ("Usage: "); Write_Str (Base_Name (Command_Name)); Write_Str (" switches mainprog.ali [non-Ada-objects] [linker-options]"); @@ -920,6 +1198,7 @@ procedure Gnatlink is Write_Line (" -f force object file list to be generated"); Write_Line (" -g Compile binder source file with debug information"); Write_Line (" -n Do not compile the binder source file"); + Write_Line (" -R Do not use a run_path_option"); Write_Line (" -v verbose mode"); Write_Line (" -v -v very verbose mode"); Write_Eol; @@ -936,7 +1215,12 @@ procedure Gnatlink is -- Start of processing for Gnatlink begin - if Argument_Count = 0 then + Process_Args; + + if Argument_Count = 0 + or else + (Verbose_Mode and then Argument_Count = 1) + then Write_Usage; Exit_Program (E_Fatal); end if; @@ -944,12 +1228,10 @@ begin if Hostparm.Java_VM then Gcc := new String'("jgnat"); Ada_Bind_File := True; - Begin_Info := "-- BEGIN Object file/option list"; - End_Info := "-- END Object file/option list "; + Begin_Info := "-- BEGIN Object file/option list"; + End_Info := "-- END Object file/option list "; end if; - Process_Args; - -- We always compile with -c Binder_Options_From_ALI.Increment_Last; @@ -993,21 +1275,18 @@ begin end if; if Ali_File_Name = null then - Exit_With_Error ("Required 'name'.ali not present."); + Exit_With_Error ("no ali file given for link"); end if; if not Is_Regular_File (Ali_File_Name.all) then - Exit_With_Error (Ali_File_Name.all & " not found."); + Exit_With_Error (Ali_File_Name.all & " not found"); -- Read the ALI file of the main subprogram if the binder generated - -- file is in Ada, it need to be compiled and no --GCC= switch has - -- been specified. Fetch the back end switches from this ALI file and use - -- these switches to compile the binder generated file + -- file needs to be compiled and no --GCC= switch has been specified. + -- Fetch the back end switches from this ALI file and use these switches + -- to compile the binder generated file - elsif Ada_Bind_File - and then Compile_Bind_File - and then Standard_Gcc - then + elsif Compile_Bind_File and then Standard_Gcc then -- Do some initializations Initialize_ALI; @@ -1029,35 +1308,34 @@ begin -- Read it - A := Scan_ALI (F, T, False, False, False); + A := Scan_ALI (F, T, Ignore_ED => False, Err => False); if A /= No_ALI_Id then for - Index in Units.Table (ALIs.Table (A).First_Unit).First_Arg - .. Units.Table (ALIs.Table (A).First_Unit).Last_Arg + Index in Units.Table (ALIs.Table (A).First_Unit).First_Arg .. + Units.Table (ALIs.Table (A).First_Unit).Last_Arg loop - -- Do not compile with the front end switches - - if not Is_Front_End_Switch (Args.Table (Index).all) then - Binder_Options_From_ALI.Increment_Last; - Binder_Options_From_ALI.Table (Binder_Options_From_ALI.Last) - := String_Access (Args.Table (Index)); - end if; + -- Do not compile with the front end switches except for --RTS + + declare + Arg : String_Ptr renames Args.Table (Index); + begin + if not Is_Front_End_Switch (Arg.all) + or else Arg (Arg'First + 2 .. Arg'First + 5) = "RTS=" + then + Binder_Options_From_ALI.Increment_Last; + Binder_Options_From_ALI.Table + (Binder_Options_From_ALI.Last) := String_Access (Arg); + end if; + end; end loop; end if; end; end if; - if Verbose_Mode then - Write_Eol; - Write_Str ("GNATLINK "); - Write_Str (Gnat_Version_String); - Write_Str (" Copyright 1996-2002 Free Software Foundation, Inc."); - Write_Eol; - end if; + Write_Header; - -- If there wasn't an output specified, then use the base name of - -- the .ali file name. + -- If no output name specified, then use the base name of .ali file name if Output_File_Name = null then @@ -1094,14 +1372,15 @@ begin -- Transform the .ali file name into the binder output file name. Make_Binder_File_Names : declare - Fname : String := Base_Name (Ali_File_Name.all); + Fname : constant String := Base_Name (Ali_File_Name.all); Fname_Len : Integer := Fname'Length; function Get_Maximum_File_Name_Length return Integer; pragma Import (C, Get_Maximum_File_Name_Length, "__gnat_get_maximum_file_name_length"); - Maximum_File_Name_Length : Integer := Get_Maximum_File_Name_Length; + Maximum_File_Name_Length : constant Integer := + Get_Maximum_File_Name_Length; Second_Char : Character; -- Second character of name of files @@ -1239,62 +1518,74 @@ begin -- the stack size for tasking programs by a pragma in the NT -- specific tasking package System.Task_Primitives.Oparations. - for J in Linker_Options.First .. Linker_Options.Last loop - if Linker_Options.Table (J).all = "-Xlinker" - and then J < Linker_Options.Last - and then Linker_Options.Table (J + 1)'Length > 8 - and then Linker_Options.Table (J + 1) (1 .. 8) = "--stack=" - then - if Stack_Op then - Linker_Options.Table (J .. Linker_Options.Last - 2) := - Linker_Options.Table (J + 2 .. Linker_Options.Last); - Linker_Options.Decrement_Last; - Linker_Options.Decrement_Last; - Num_Args := Num_Args - 2; + -- Note: This is not a FOR loop that runs from Linker_Options.First + -- to Linker_Options.Last, since operations within the loop can + -- modify the length of the table. - else - Stack_Op := True; + Clean_Link_Option_Set : declare + J : Natural := Linker_Options.First; + + begin + while J <= Linker_Options.Last loop + + if Linker_Options.Table (J).all = "-Xlinker" + and then J < Linker_Options.Last + and then Linker_Options.Table (J + 1)'Length > 8 + and then Linker_Options.Table (J + 1) (1 .. 8) = "--stack=" + then + if Stack_Op then + Linker_Options.Table (J .. Linker_Options.Last - 2) := + Linker_Options.Table (J + 2 .. Linker_Options.Last); + Linker_Options.Decrement_Last; + Linker_Options.Decrement_Last; + Num_Args := Num_Args - 2; + + else + Stack_Op := True; + end if; end if; - end if; - -- Here we just check for a canonical form that matches the - -- pragma Linker_Options set in the NT runtime. + -- Here we just check for a canonical form that matches the + -- pragma Linker_Options set in the NT runtime. - if (Linker_Options.Table (J)'Length > 17 - and then Linker_Options.Table (J) (1 .. 17) - = "-Xlinker --stack=") - or else - (Linker_Options.Table (J)'Length > 12 - and then Linker_Options.Table (J) (1 .. 12) - = "-Wl,--stack=") - then - if Stack_Op then - Linker_Options.Table (J .. Linker_Options.Last - 1) := - Linker_Options.Table (J + 1 .. Linker_Options.Last); - Linker_Options.Decrement_Last; - Num_Args := Num_Args - 1; + if (Linker_Options.Table (J)'Length > 17 + and then Linker_Options.Table (J) (1 .. 17) + = "-Xlinker --stack=") + or else + (Linker_Options.Table (J)'Length > 12 + and then Linker_Options.Table (J) (1 .. 12) + = "-Wl,--stack=") + then + if Stack_Op then + Linker_Options.Table (J .. Linker_Options.Last - 1) := + Linker_Options.Table (J + 1 .. Linker_Options.Last); + Linker_Options.Decrement_Last; + Num_Args := Num_Args - 1; - else - Stack_Op := True; + else + Stack_Op := True; + end if; end if; - end if; - -- Remove duplicate IDENTIFICATION directives (VMS) + -- Remove duplicate IDENTIFICATION directives (VMS) - if Linker_Options.Table (J)'Length > 27 - and then Linker_Options.Table (J) (1 .. 27) - = "--for-linker=IDENTIFICATION=" - then - if IDENT_Op then - Linker_Options.Table (J .. Linker_Options.Last - 1) := - Linker_Options.Table (J + 1 .. Linker_Options.Last); - Linker_Options.Decrement_Last; - Num_Args := Num_Args - 1; - else - IDENT_Op := True; + if Linker_Options.Table (J)'Length > 27 + and then Linker_Options.Table (J) (1 .. 27) + = "--for-linker=IDENTIFICATION=" + then + if IDENT_Op then + Linker_Options.Table (J .. Linker_Options.Last - 1) := + Linker_Options.Table (J + 1 .. Linker_Options.Last); + Linker_Options.Decrement_Last; + Num_Args := Num_Args - 1; + else + IDENT_Op := True; + end if; end if; - end if; - end loop; + + J := J + 1; + end loop; + end Clean_Link_Option_Set; -- Prepare arguments for call to linker @@ -1401,5 +1692,5 @@ begin exception when X : others => Write_Line (Exception_Information (X)); - Exit_With_Error ("INTERNAL ERROR. Please report."); + Exit_With_Error ("INTERNAL ERROR. Please report"); end Gnatlink; |