aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/mdll.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2007-08-14 10:50:51 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2007-08-14 10:50:51 +0200
commit33c423c8b24c3f68cb92f95b6d2e1b9dde16ab5d (patch)
treebc637fac407ff7e642e0541a6da74fc5d842ee43 /gcc/ada/mdll.adb
parent6d64bc378c6d5f95f5f76ea3e42e8c009f4b9b4d (diff)
downloadgcc-33c423c8b24c3f68cb92f95b6d2e1b9dde16ab5d.zip
gcc-33c423c8b24c3f68cb92f95b6d2e1b9dde16ab5d.tar.gz
gcc-33c423c8b24c3f68cb92f95b6d2e1b9dde16ab5d.tar.bz2
[multiple changes]
2007-08-14 Geert Bosch <bosch@adacore.com> * i-forbla.ads, i-forbla.adb, a-ngcoar.adb, a-ngcoar.ads, i-forlap.ads, s-gearop.adb, s-gecobl.adb, s-gecobl.ads, s-gerela.adb, s-gerela.ads: Add required linker pragmas for automatically linking with the gnalasup linear algebra support library, and the systems math library. Rename cdot to cdotu and zdot to zdotu. Update header comment to describe purpose of package. 2007-08-14 Thomas Quinot <quinot@adacore.com> * exp_ch7.adb (Find_Final_List): For an anonymous access type that has an explicitly specified Associated_Final_Chain, use that list. (Expand_N_Package_Body): Build dispatch tables of library level tagged types. (Expand_N_Package_Declaration): Build dispatch tables of library level tagged types. Minor code cleanup. 2007-08-14 Vincent Celier <celier@adacore.com> * gnatchop.adb (Terminate_Program): Remove exception and use Types.Terminate_Program instead. * osint.ads, osint.adb (Current_Exit_Status): New global variable (Find_Program_Name): Added protection against empty name. (OS_Exit_Through_Exception): New procedure * s-os_lib.ads, s-os_lib.adb (OS_Exit): New procedure body (OS_Exit_Default): New procedure that contains the previous implementation of procedure OS_Exit. (Final_Value): Remove obsolete Interix stuff. 2007-08-14 Thomas Quinot <quinot@adacore.com> * g-socket.ads: Reorganize example code so that it also works on Windows XP. 2007-08-14 Tristan Gingold <gingold@adacore.com> * g-trasym.ads: AIX now supports symbolic backtraces. 2007-08-14 Ed Schonberg <schonberg@adacore.com> * lib-load.adb (From_Limited_With_Chain): Always scan the stack of units being loaded to detect circularities. A circularity may be present even if the current chain of pending units to load starts from a limited_with_clause. * lib-load.ads: Change profile of Load_Unit to use a with_clause rather than a boolean flag, in order to detect circularities in with_clauses. * par-load.adb: Use current with_clause in calls to Load_Unit, rather than propagating the From_Limited_With flag, in order to handle properly circularities involving with_clauses. 2007-08-14 Nicolas Setton <setton@adacore.com> * link.c (FreeBSD): Add "const" keyword where needed, to eliminate warnings. 2007-08-14 Arnaud Charlet <charlet@adacore.com> * Makefile.in: GNATRTL_LINEARALGEBRA_OBJS: New variable holding objects to build for libgnala. libgnat: Add rules to build libgnala.a (LIBGNAT_TARGET_PAIRS for VxWorks): Remove s-osinte-vxworks.adb from target pairs of the VxWorks 6 kernel runtime, use it only for VxWorks 5. Add s-osinte-vxworks-kernel.adb to the target pairs of the kernel run-time lib for VxWorks 6, which would provide a different implementation for Task_Cont and Task_Stop than the VxWorks 5 version. x86-solaris section (EH_MECHANISM): Set to -gcc, as this port is now running ZCX by default. Add g-sttsne-locking to LynxOS version. Remove g-sttsne-vxworks.ads; use g-sttsne-locking.ads instead. On x86/darwin, use a-numaux-x86.ad? and system-darwin-x86.ads. * system-darwin-x86.ads: New file. * Make-lang.in: Delete files before copying onto them, so if they are read-only, the copy won't fail. Update dependencies 2007-08-14 Pascal Obry <obry@adacore.com> * mdll-fil.adb, * mdll.adb: Implement a more consistent libraries naming scheme. 2007-08-14 Vincent Celier <celier@adacore.com> * mlib-utl.adb (Gcc_Name): Change from constant String to String_Access (Gcc): Initialize Gcc_Name at the first call 2007-08-14 Ed Schonberg <schonberg@adacore.com> * sem_ch7.adb (Analyze_Package_Specification): Do not install private with_clauses of the enclosing unit when analyzing the package specification of a nested instance. 2007-08-14 Hristian Kirtchev <kirtchev@adacore.com> * sinfo.ads, sinfo.adb (Is_Coextension, Set_Is_Coextension): Removed. (Is_Dynamic_Coextension, Set_Is_Dynamic_Coextension): New routines. Remove flag Is_Coextension. Add flag Is_Dynamic_Coextension. Update the layout of N_Allocator. 2007-08-14 Thomas Quinot <quinot@adacore.com> * rtsfind.adb (Check_RPC): Add PCS version check. * gnatvsn.ads, gnatvsn.adb: Add PCS version. (Gnat_Free_Software): New function. * sem_dist.ads, sem_dist.adb (Get_PCS_Version): New subprogram. Returns the PCS_Version value from s-parint, used to check that it is consistent with what exp_dist expects. * s-parint.ads (PCS_Version): New entity for checking consistency between exp_dist and PCS. * gen-soccon.c: (SO_REUSEPORT): New constant. 2007-08-14 Hristian Kirtchev <kirtchev@adacore.com> * a-calfor.adb (Image (Duration; Boolean)): Change type of local variable Sub_Second to Duration in order to accomodate a larger range of arithmetic operations. 2007-08-14 Bob Duff <duff@adacore.com> * g-sttsne-locking.ads: Move comments from spec to body. * g-sttsne-locking.adb: Move comments from spec to body. * g-sttsne-vxworks.ads: Removed. * g-sttsne-vxworks.adb: Removed. From-SVN: r127467
Diffstat (limited to 'gcc/ada/mdll.adb')
-rw-r--r--gcc/ada/mdll.adb51
1 files changed, 32 insertions, 19 deletions
diff --git a/gcc/ada/mdll.adb b/gcc/ada/mdll.adb
index a3188b3..71d27e0 100644
--- a/gcc/ada/mdll.adb
+++ b/gcc/ada/mdll.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, 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- --
@@ -25,7 +25,7 @@
------------------------------------------------------------------------------
-- This package provides the core high level routines used by GNATDLL
--- to build Windows DLL
+-- to build Windows DLL.
with Ada.Text_IO;
@@ -38,6 +38,10 @@ package body MDLL is
use Ada;
use GNAT;
+ -- Convention used for the library names on Windows:
+ -- DLL: <name>.dll
+ -- Import library: lib<name>.dll
+
function Get_Dll_Name (Lib_Filename : String) return String;
-- Returns <Lib_Filename> if it contains a file extension otherwise it
-- returns <Lib_Filename>.dll.
@@ -69,7 +73,7 @@ package body MDLL is
Bas_File : aliased constant String := Base_Filename & ".base";
Dll_File : aliased String := Get_Dll_Name (Lib_Filename);
Exp_File : aliased String := Base_Filename & ".exp";
- Lib_File : aliased constant String := "lib" & Base_Filename & ".a";
+ Lib_File : aliased constant String := "lib" & Base_Filename & ".dll.a";
Bas_Opt : aliased String := "-Wl,--base-file," & Bas_File;
Lib_Opt : aliased String := "-mdll";
@@ -450,10 +454,32 @@ package body MDLL is
--------------------------
procedure Build_Import_Library (Lib_Filename : String) is
+
+ function No_Lib_Prefix (Filename : String) return String;
+ -- Return Filename without the lib prefix if present
+
+ -------------------
+ -- No_Lib_Prefix --
+ -------------------
+
+ function No_Lib_Prefix (Filename : String) return String is
+ begin
+ if Filename (Filename'First .. Filename'First + 2) = "lib" then
+ return Filename (Filename'First + 3 .. Filename'Last);
+ else
+ return Filename;
+ end if;
+ end No_Lib_Prefix;
+
+ -- Local variables
+
Def_File : String renames Def_Filename;
Dll_File : constant String := Get_Dll_Name (Lib_Filename);
- Base_Filename : constant String := MDLL.Fil.Ext_To (Lib_Filename);
- Lib_File : constant String := "lib" & Base_Filename & ".a";
+ Base_Filename : constant String :=
+ MDLL.Fil.Ext_To (No_Lib_Prefix (Lib_Filename));
+ Lib_File : constant String := "lib" & Base_Filename & ".dll.a";
+
+ -- Start of processing for Build_Import_Library
begin
if not Quiet then
@@ -469,20 +495,7 @@ package body MDLL is
-- Start of processing for Build_Import_Library
begin
- -- If the library has the form lib<name>.a then the def file should be
- -- <name>.def and the DLL to link against <name>.dll. This is a Windows
- -- convention and we try as much as possible to follow the platform
- -- convention.
-
- if Lib_Filename'Length > 3
- and then
- Lib_Filename (Lib_Filename'First .. Lib_Filename'First + 2) = "lib"
- then
- Build_Import_Library
- (Lib_Filename (Lib_Filename'First + 3 .. Lib_Filename'Last));
- else
- Build_Import_Library (Lib_Filename);
- end if;
+ Build_Import_Library (Lib_Filename);
end Build_Import_Library;
------------------