diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 17:45:59 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 17:45:59 +0000 |
| commit | 68da6840912f5172d3d4ac860ef72e2406dc885f (patch) | |
| tree | 9eefa1d8fa112714d0415cc8df0ba158cd0c34c3 /gcc/ada/mlib-tgt-solaris.adb | |
| parent | 46dada5c28c04a5793be597987787f83dc62131c (diff) | |
| download | gcc-68da6840912f5172d3d4ac860ef72e2406dc885f.tar.gz | |
2006-10-31 Vincent Celier <celier@adacore.com>
Eric Botcazou <ebotcazou@adacore.com>
* mlib-tgt-lynxos.adb, mlib-tgt-mingw.adb, mlib-tgt-tru64.adb,
mlib-tgt-aix.adb, mlib-tgt-irix.adb, mlib-tgt-hpux.adb,
mlib-tgt-linux.adb, mlib-tgt-solaris.adb: Use Append_To, instead of
Ext_To, when building the library file name
* mlib-tgt-vxworks.adb: ditto.
(Get_Target_Suffix): Add support for x86 targets.
* mlib-fil.ads, mlib-fil.adb: (Append_To): New function
* mlib-tgt-darwin.adb:
Use Append_To, instead of Ext_To, when building the library file name
(Flat_Namespace): New global variable.
(No_Shared_Libgcc_Switch): Rename to No_Shared_Libgcc_Options.
(Shared_Libgcc_Switch): Rename to With_Shared_Libgcc_Options.
(Link_Shared_Libgcc): Delete.
(Build_Dynamic_Library): Adjust for above changes.
Use Opt package.
(Build_Dynamic_Library): Pass -shared-libgcc if GCC 4 or later.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118237 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/mlib-tgt-solaris.adb')
| -rw-r--r-- | gcc/ada/mlib-tgt-solaris.adb | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/gcc/ada/mlib-tgt-solaris.adb b/gcc/ada/mlib-tgt-solaris.adb index c97d0b15f06..a66753e2c6c 100644 --- a/gcc/ada/mlib-tgt-solaris.adb +++ b/gcc/ada/mlib-tgt-solaris.adb @@ -7,7 +7,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2002-2005 Free Software Foundation, Inc. -- +-- Copyright (C) 2002-2006 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- -- @@ -111,7 +111,7 @@ package body MLib.Tgt is Lib_File : constant String := Lib_Dir & Directory_Separator & "lib" & - Fil.Ext_To (Lib_Filename, DLL_Ext); + Fil.Append_To (Lib_Filename, DLL_Ext); Version_Arg : String_Access; Symbolic_Link_Needed : Boolean := False; @@ -250,7 +250,8 @@ package body MLib.Tgt is ------------------------ function Library_Exists_For - (Project : Project_Id; In_Tree : Project_Tree_Ref) return Boolean + (Project : Project_Id; + In_Tree : Project_Tree_Ref) return Boolean is begin if not In_Tree.Projects.Table (Project).Library then @@ -260,25 +261,23 @@ package body MLib.Tgt is else declare - Lib_Dir : constant String := - Get_Name_String - (In_Tree.Projects.Table (Project).Library_Dir); + Lib_Dir : constant String := + Get_Name_String + (In_Tree.Projects.Table (Project).Library_Dir); Lib_Name : constant String := - Get_Name_String - (In_Tree.Projects.Table (Project).Library_Name); + Get_Name_String + (In_Tree.Projects.Table (Project).Library_Name); begin - if In_Tree.Projects.Table (Project).Library_Kind = - Static - then + if In_Tree.Projects.Table (Project).Library_Kind = Static then return Is_Regular_File (Lib_Dir & Directory_Separator & "lib" & - Fil.Ext_To (Lib_Name, Archive_Ext)); + Fil.Append_To (Lib_Name, Archive_Ext)); else return Is_Regular_File (Lib_Dir & Directory_Separator & "lib" & - Fil.Ext_To (Lib_Name, DLL_Ext)); + Fil.Append_To (Lib_Name, DLL_Ext)); end if; end; end if; @@ -301,8 +300,8 @@ package body MLib.Tgt is else declare Lib_Name : constant String := - Get_Name_String - (In_Tree.Projects.Table (Project).Library_Name); + Get_Name_String + (In_Tree.Projects.Table (Project).Library_Name); begin Name_Len := 3; @@ -311,10 +310,9 @@ package body MLib.Tgt is if In_Tree.Projects.Table (Project).Library_Kind = Static then - Add_Str_To_Name_Buffer (Fil.Ext_To (Lib_Name, Archive_Ext)); - + Add_Str_To_Name_Buffer (Fil.Append_To (Lib_Name, Archive_Ext)); else - Add_Str_To_Name_Buffer (Fil.Ext_To (Lib_Name, DLL_Ext)); + Add_Str_To_Name_Buffer (Fil.Append_To (Lib_Name, DLL_Ext)); end if; return Name_Find; |