aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Celier <celier@adacore.com>2005-11-15 14:51:50 +0100
committerArnaud Charlet <charlet@gcc.gnu.org>2005-11-15 14:51:50 +0100
commit6c6db94e93d4aeb9d6d6dce51b4e93c8ecd28cb4 (patch)
tree3cb88ddcae1367e452594cd4e77e101a7ea7f001
parent9ea6535410ea5c0b17579975fdb34472202332d2 (diff)
downloadgcc-6c6db94e93d4aeb9d6d6dce51b4e93c8ecd28cb4.zip
gcc-6c6db94e93d4aeb9d6d6dce51b4e93c8ecd28cb4.tar.gz
gcc-6c6db94e93d4aeb9d6d6dce51b4e93c8ecd28cb4.tar.bz2
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
-rw-r--r--gcc/ada/mlib-tgt-aix.adb17
-rw-r--r--gcc/ada/mlib-tgt-darwin.adb13
-rw-r--r--gcc/ada/mlib-tgt-hpux.adb13
-rw-r--r--gcc/ada/mlib-tgt-irix.adb13
-rw-r--r--gcc/ada/mlib-tgt-linux.adb13
-rw-r--r--gcc/ada/mlib-tgt-lynxos.adb9
-rw-r--r--gcc/ada/mlib-tgt-mingw.adb11
-rw-r--r--gcc/ada/mlib-tgt-solaris.adb9
-rw-r--r--gcc/ada/mlib-tgt-tru64.adb13
-rw-r--r--gcc/ada/mlib-tgt-vms-alpha.adb10
-rw-r--r--gcc/ada/mlib-tgt-vms-ia64.adb10
-rw-r--r--gcc/ada/mlib-tgt-vxworks.adb9
-rw-r--r--gcc/ada/mlib-tgt.adb11
-rw-r--r--gcc/ada/mlib-tgt.ads6
14 files changed, 136 insertions, 21 deletions
diff --git a/gcc/ada/mlib-tgt-aix.adb b/gcc/ada/mlib-tgt-aix.adb
index 80b3a4b..86fd393 100644
--- 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 a152ed3..651f983 100644
--- 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 62172c7..85e756c 100644
--- 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 7a77bff..d7749a9 100644
--- 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 70fde48..ca205b6 100644
--- 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 f1cab5f..98fac43 100644
--- 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 98a5de8..f350d2e 100644
--- 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 40d918e..c97d0b1 100644
--- 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 b6d9549..33ed98b 100644
--- 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 8c414b0..6dbc09e 100644
--- 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 35c6c15..f72b4b9 100644
--- 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 659349a..69ed03b 100644
--- 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 adccc60..c1bca97 100644
--- 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 4ae46ce..5bc175e 100644
--- 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