mlib-tgt-tru64.adb, [...] (DLL_Prefix): New function

2005-11-14  Vincent Celier  <celier@adacore.com>

	* mlib-tgt-tru64.adb, mlib-tgt-aix.adb, mlib-tgt-irix.adb,
	mlib-tgt-hpux.adb, mlib-tgt-hpux.adb, mlib-tgt-linux.adb,
	mlib-tgt-solaris.adb, mlib-tgt-vms-alpha.adb, mlib-tgt-vms-alpha.adb,
	mlib-tgt-vms-ia64.adb, mlib-tgt-mingw.adb, mlib-tgt-vxworks.adb,
	mlib-tgt-darwin.adb, mlib-tgt.adb, mlib-tgt.ads,
	mlib-tgt-lynxos.adb (DLL_Prefix): New function

From-SVN: r106953

diff --git a/gcc/ada/mlib-tgt-aix.adb b/gcc/ada/mlib-tgt-aix.adb
index 80b3a4b7d645cfced3dd062ea25a31e16811eb24..86fd3934ffa8787b05cc98d2cb64a8050fd7f285 100644 (file)
--- a/gcc/ada/mlib-tgt-aix.adb
+++ b/gcc/ada/mlib-tgt-aix.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---           Copyright (C) 2003-2005, Ada Core Technologies, Inc.           --
+--                     Copyright (C) 2003-2005, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -28,15 +28,13 @@
 --  This package provides a set of target dependent routines to build
 --  static, dynamic or relocatable libraries.
 
---  This is the AIX version of the body.
+--  This is the AIX version of the body
 
 with Ada.Strings.Fixed; use Ada.Strings.Fixed;
-with GNAT.OS_Lib;       use GNAT.OS_Lib;
 
 with MLib.Fil;
 with MLib.Utl;
 with Namet;    use Namet;
-with Osint;    use Osint;
 with Opt;
 with Output;   use Output;
 with Prj.Com;
@@ -152,7 +150,7 @@ package body MLib.Tgt is
          Write_Line (Lib_File);
       end if;
 
-      --  Look for -lgnarl in Options. If found, set the thread options.
+      --  Look for -lgnarl in Options. If found, set the thread options
 
       for J in Options'Range loop
          if Options (J).all = "-lgnarl" then
@@ -219,6 +217,15 @@ package body MLib.Tgt is
       return "a";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-darwin.adb b/gcc/ada/mlib-tgt-darwin.adb
index a152ed322a87187677684f77b1a60ee7d9ba4370..651f9838d39761cb7d9d3a5eef2e7005dadc44ae 100644 (file)
--- a/gcc/ada/mlib-tgt-darwin.adb
+++ b/gcc/ada/mlib-tgt-darwin.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---              Copyright (C) 2001-2005, Free Software Foundation, Inc.     --
+--          Copyright (C) 2001-2005, 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- --
@@ -28,7 +28,7 @@
 --  This package provides a set of target dependent routines to build
 --  static, dynamic and shared libraries.
 
---  This is the Darwin version of the body.
+--  This is the Darwin version of the body
 
 with MLib.Fil;
 with MLib.Utl;
@@ -199,6 +199,15 @@ package body MLib.Tgt is
       return "dylib";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-hpux.adb b/gcc/ada/mlib-tgt-hpux.adb
index 62172c79eaeb173cd1a4a4d789171d8e47e281a7..85e756ce8df4d65aed14e1e599e4b63244812e80 100644 (file)
--- a/gcc/ada/mlib-tgt-hpux.adb
+++ b/gcc/ada/mlib-tgt-hpux.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---           Copyright (C) 2003-2005, Ada Core Technologies, Inc.           --
+--                     Copyright (C) 2003-2005, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -28,7 +28,7 @@
 --  This package provides a set of target dependent routines to build
 --  libraries (static only on HP-UX).
 
---  This is the HP-UX version of the body.
+--  This is the HP-UX version of the body
 
 with MLib.Fil;
 with MLib.Utl;
@@ -197,6 +197,15 @@ package body MLib.Tgt is
       return "sl";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-irix.adb b/gcc/ada/mlib-tgt-irix.adb
index 7a77bff749377716086f2b3f8cd2f07d36695f7f..d7749a9cd97083ad06c9dfd8db8cd5fd152476cb 100644 (file)
--- a/gcc/ada/mlib-tgt-irix.adb
+++ b/gcc/ada/mlib-tgt-irix.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---           Copyright (C) 2003-2005, Ada Core Technologies, Inc.           --
+--                     Copyright (C) 2003-2005, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -28,7 +28,7 @@
 --  This package provides a set of target dependent routines to build
 --  static, dynamic and shared libraries.
 
---  This is the IRIX version of the body.
+--  This is the IRIX version of the body
 
 with MLib.Fil;
 with MLib.Utl;
@@ -235,6 +235,15 @@ package body MLib.Tgt is
       return "so";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-linux.adb b/gcc/ada/mlib-tgt-linux.adb
index 70fde48500c7ecbfbddf2bd4323b5b0dfde51fdd..ca205b68f65b4ebf62b0064f645a4d434b47ab13 100644 (file)
--- a/gcc/ada/mlib-tgt-linux.adb
+++ b/gcc/ada/mlib-tgt-linux.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---              Copyright (C) 2001-2005, Free Software Foundation, Inc.     --
+--          Copyright (C) 2001-2005, 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- --
@@ -28,7 +28,7 @@
 --  This package provides a set of target dependent routines to build
 --  static, dynamic and shared libraries.
 
---  This is the GNU/Linux version of the body.
+--  This is the GNU/Linux version of the body
 
 with MLib.Fil;
 with MLib.Utl;
@@ -194,6 +194,15 @@ package body MLib.Tgt is
       return "so";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-lynxos.adb b/gcc/ada/mlib-tgt-lynxos.adb
index f1cab5f78ffab73cafaa1670450f3046796a9cb4..98fac4359bd6dea5d7fa69ab0a73963ee98b3bba 100644 (file)
--- a/gcc/ada/mlib-tgt-lynxos.adb
+++ b/gcc/ada/mlib-tgt-lynxos.adb
@@ -125,6 +125,15 @@ package body MLib.Tgt is
       return "";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-mingw.adb b/gcc/ada/mlib-tgt-mingw.adb
index 98a5de88012f851003ffa18e14b8a7f66ac1ef12..f350d2e01538880d0b4b3f01df84ed342549c2ad 100644 (file)
--- a/gcc/ada/mlib-tgt-mingw.adb
+++ b/gcc/ada/mlib-tgt-mingw.adb
@@ -31,8 +31,6 @@
 --  This is the Windows version of the body. Works only with GCC versions
 --  supporting the "-shared" option.
 
-with GNAT.OS_Lib;             use GNAT.OS_Lib;
-
 with Namet;  use Namet;
 with Opt;
 with Output; use Output;
@@ -148,6 +146,15 @@ package body MLib.Tgt is
       return "dll";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-solaris.adb b/gcc/ada/mlib-tgt-solaris.adb
index 40d918edd137777268f757c75419912692d89fc0..c97d0b15f06f1102669b3937429f973a9ddb95b3 100644 (file)
--- a/gcc/ada/mlib-tgt-solaris.adb
+++ b/gcc/ada/mlib-tgt-solaris.adb
@@ -191,6 +191,15 @@ package body MLib.Tgt is
       return "so";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-tru64.adb b/gcc/ada/mlib-tgt-tru64.adb
index b6d954902df236b6c3358591917aa36fc2663a21..33ed98b56aee527eda3296bc7d7278821de03ba6 100644 (file)
--- a/gcc/ada/mlib-tgt-tru64.adb
+++ b/gcc/ada/mlib-tgt-tru64.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---              Copyright (C) 2002-2005 Free Software Foundation, Inc.      --
+--          Copyright (C) 2002-2005 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- --
@@ -28,7 +28,7 @@
 --  This package provides a set of target dependent routines to build
 --  static, dynamic and shared libraries.
 
---  This is the True64 version of the body.
+--  This is the True64 version of the body
 
 with MLib.Fil;
 with MLib.Utl;
@@ -201,6 +201,15 @@ package body MLib.Tgt is
       return "so";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-vms-alpha.adb b/gcc/ada/mlib-tgt-vms-alpha.adb
index 8c414b0a9e68264389907b817f6fd987f52ad358..6dbc09e5e3502603ddc566f7933725b0156af9f5 100644 (file)
--- a/gcc/ada/mlib-tgt-vms-alpha.adb
+++ b/gcc/ada/mlib-tgt-vms-alpha.adb
@@ -30,7 +30,6 @@
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
-with GNAT.OS_Lib;               use GNAT.OS_Lib;
 
 with MLib.Fil;
 with MLib.Utl;
@@ -540,6 +539,15 @@ package body MLib.Tgt is
       return "exe";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-vms-ia64.adb b/gcc/ada/mlib-tgt-vms-ia64.adb
index 35c6c155fb922fd3c0bb28135eb736068d0bcb00..f72b4b93e04a3214c9c82f91e1ede943abab3c5c 100644 (file)
--- a/gcc/ada/mlib-tgt-vms-ia64.adb
+++ b/gcc/ada/mlib-tgt-vms-ia64.adb
@@ -30,7 +30,6 @@
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
-with GNAT.OS_Lib;               use GNAT.OS_Lib;
 
 with MLib.Fil;
 with MLib.Utl;
@@ -573,6 +572,15 @@ package body MLib.Tgt is
       return "exe";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt-vxworks.adb b/gcc/ada/mlib-tgt-vxworks.adb
index 659349a37a67f0da48c486219d4709087006ffb5..69ed03b372ca169af636d286a421ca32490f3f6c 100644 (file)
--- a/gcc/ada/mlib-tgt-vxworks.adb
+++ b/gcc/ada/mlib-tgt-vxworks.adb
@@ -134,6 +134,15 @@ package body MLib.Tgt is
       return "";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt.adb b/gcc/ada/mlib-tgt.adb
index adccc606840f39585a2dc4ab616edad9118f20bc..c1bca97ef2bb791ef59025524332ca08107a5f16 100644 (file)
--- a/gcc/ada/mlib-tgt.adb
+++ b/gcc/ada/mlib-tgt.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---              Copyright (C) 2001-2005, Ada Core Technologies, Inc.        --
+--                     Copyright (C) 2001-2005, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -120,6 +120,15 @@ package body MLib.Tgt is
       return "";
    end DLL_Ext;
 
+   ----------------
+   -- DLL_Prefix --
+   ----------------
+
+   function DLL_Prefix return String is
+   begin
+      return "lib";
+   end DLL_Prefix;
+
    --------------------
    -- Dynamic_Option --
    --------------------

diff --git a/gcc/ada/mlib-tgt.ads b/gcc/ada/mlib-tgt.ads
index 4ae46ce62d67a70a6c2145af837902f62b1bedb8..5bc175e94a762868795eb0fe05f0795e96fe50b2 100644 (file)
--- a/gcc/ada/mlib-tgt.ads
+++ b/gcc/ada/mlib-tgt.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---              Copyright (C) 2001-2005, Ada Core Technologies, Inc.        --
+--                     Copyright (C) 2001-2005, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -82,6 +82,10 @@ package MLib.Tgt is
    --  System dependent object extension, without leadien dot.
    --  On Unix, returns "o".
 
+   function DLL_Prefix return String;
+   --  System dependent dynamic library prefix.
+   --  On Windows, returns "". On other platforms, returns "lib".
+
    function DLL_Ext return String;
    --  System dependent dynamic library extension, without leading dot.
    --  On Windows, returns "dll". On Unix, usually returns "so", but not