From 6c6db94e93d4aeb9d6d6dce51b4e93c8ecd28cb4 Mon Sep 17 00:00:00 2001 From: Vincent Celier Date: Tue, 15 Nov 2005 14:51:50 +0100 Subject: [PATCH] mlib-tgt-tru64.adb, [...] (DLL_Prefix): New function 2005-11-14 Vincent Celier * 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 --- gcc/ada/mlib-tgt-aix.adb | 17 ++++++++++++----- gcc/ada/mlib-tgt-darwin.adb | 13 +++++++++++-- gcc/ada/mlib-tgt-hpux.adb | 13 +++++++++++-- gcc/ada/mlib-tgt-irix.adb | 13 +++++++++++-- gcc/ada/mlib-tgt-linux.adb | 13 +++++++++++-- gcc/ada/mlib-tgt-lynxos.adb | 9 +++++++++ gcc/ada/mlib-tgt-mingw.adb | 11 +++++++++-- gcc/ada/mlib-tgt-solaris.adb | 9 +++++++++ gcc/ada/mlib-tgt-tru64.adb | 13 +++++++++++-- gcc/ada/mlib-tgt-vms-alpha.adb | 10 +++++++++- gcc/ada/mlib-tgt-vms-ia64.adb | 10 +++++++++- gcc/ada/mlib-tgt-vxworks.adb | 9 +++++++++ gcc/ada/mlib-tgt.adb | 11 ++++++++++- gcc/ada/mlib-tgt.ads | 6 +++++- 14 files changed, 136 insertions(+), 21 deletions(-) diff --git a/gcc/ada/mlib-tgt-aix.adb b/gcc/ada/mlib-tgt-aix.adb index 80b3a4b7d645..86fd3934ffa8 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 a152ed322a87..651f9838d397 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 62172c79eaeb..85e756ce8df4 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 7a77bff74937..d7749a9cd970 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 70fde48500c7..ca205b68f65b 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 f1cab5f78ffa..98fac4359bd6 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 98a5de88012f..f350d2e01538 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 40d918edd137..c97d0b15f06f 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 b6d954902df2..33ed98b56aee 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 8c414b0a9e68..6dbc09e5e350 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 35c6c155fb92..f72b4b93e04a 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 659349a37a67..69ed03b372ca 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 adccc606840f..c1bca97ef2bb 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 4ae46ce62d67..5bc175e94a76 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 -- 2.47.2