aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/osint-b.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2014-08-01 11:38:48 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2014-08-01 11:38:48 +0200
commit7a5b62b0c751de386bc4faf8648503b48d1d3c9b (patch)
treef82c18553ae17d64cbb6e00de68fc79cfbdbd657 /gcc/ada/osint-b.adb
parent935a9145c69ce92e228e32427d91044407118eea (diff)
downloadgcc-7a5b62b0c751de386bc4faf8648503b48d1d3c9b.zip
gcc-7a5b62b0c751de386bc4faf8648503b48d1d3c9b.tar.gz
gcc-7a5b62b0c751de386bc4faf8648503b48d1d3c9b.tar.bz2
[multiple changes]
2014-08-01 Vincent Celier <celier@adacore.com> * make.adb (Await_Compile): Remove loop that was only needed for VMS. 2014-08-01 Robert Dewar <dewar@adacore.com> * a-calcon.ads, a-direct.adb, a-dirval-mingw.adb, a-dirval.adb, a-dirval.ads, a-except-2005.adb, a-excpol-abort.adb, a-numaux-darwin.ads, a-numaux.ads, bindgen.adb, bindusg.adb, einfo.adb, einfo.ads, err_vars.ads, errout.ads, errutil.adb, exp_ch3.adb, exp_ch4.adb, exp_ch7.adb, exp_ch7.ads, fname-uf.adb, fname.adb, fname.ads, freeze.adb, g-debpoo.adb, g-dirope.ads, g-excact.ads, g-expect.ads, g-socket.adb, g-socket.ads, g-sothco.ads, g-traceb.ads, gnat_rm.texi, gnatlink.adb, gnatls.adb, i-cstrea.adb, krunch.adb, krunch.ads, layout.adb, lib-util.adb, make.adb, mlib.adb, osint-b.adb, osint-b.ads, osint-c.adb, osint.adb, osint.ads, output.ads, par.adb, prj-conf.adb, prj-env.adb, prj-makr.adb, prj-nmsc.adb, prj.adb, prj.ads, repinfo.adb, rtsfind.adb, rtsfind.ads, s-excmac-gcc.ads, s-fatgen.adb, s-mastop.ads, s-parame-ae653.ads, s-parame-hpux.ads, s-parame-vxworks.ads, s-parame.ads, s-soflin.ads, s-stoele.adb, s-tasini.adb, s-taspri-dummy.ads, s-taspri-hpux-dce.ads, s-taspri-mingw.ads, s-taspri-posix-noaltstack.ads, s-taspri-posix.ads, s-taspri-solaris.ads, s-taspri-vxworks.ads, s-trasym.ads, sem_ch12.adb, sem_ch4.adb, sem_eval.adb, sem_intr.adb, sem_mech.adb, sem_mech.ads, sem_prag.adb, sem_res.adb, sem_util.adb, sem_util.ads, sinfo.adb, sinfo.ads, sinput-c.adb, symbols.ads, targparm.adb, treepr.adb, types.ads, xr_tabls.adb, xr_tabls.ads: Remove VMS specific code and comments. 2014-08-01 Ed Schonberg <schonberg@adacore.com> * sem_ch5.adb (Analyze_Iterator_Specification): New procedure Check_Reverse_Iteration, to verify the legality of the Reverse indicator on various container types, and to detect illegal reverse iterations on containers that only supoort forward iteration. From-SVN: r213431
Diffstat (limited to 'gcc/ada/osint-b.adb')
-rw-r--r--gcc/ada/osint-b.adb42
1 files changed, 10 insertions, 32 deletions
diff --git a/gcc/ada/osint-b.adb b/gcc/ada/osint-b.adb
index 39b7a99..554d804 100644
--- a/gcc/ada/osint-b.adb
+++ b/gcc/ada/osint-b.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2001-2010, Free Software Foundation, Inc. --
+-- Copyright (C) 2001-2014, 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,6 @@
with Opt; use Opt;
with Output; use Output;
-with Targparm; use Targparm;
package body Osint.B is
@@ -75,9 +74,8 @@ package body Osint.B is
Findex2 : Natural;
Flength : Natural;
- Bind_File_Prefix_Len : Natural := 2;
- -- Length of binder file prefix (normally set to 2 for b~, but gets
- -- reset to 3 for VMS for b__).
+ Bind_File_Prefix_Len : constant Natural := 2;
+ -- Length of binder file prefix (2 for b~)
begin
if Output_File_Name /= "" then
@@ -120,10 +118,6 @@ package body Osint.B is
if Maximum_File_Name_Length > 0 then
- if OpenVMS_On_Target and then Typ /= 'c' then
- Bind_File_Prefix_Len := 3;
- end if;
-
-- Make room for the extra two characters in "b?"
while Int (Flength) >
@@ -139,31 +133,15 @@ package body Osint.B is
File_Name (Findex1 .. Findex2 - 1);
Name_Buffer (Flength + Bind_File_Prefix_Len + 1) := '.';
- -- C bind file, name is b_xxx.c
-
- if Typ = 'c' then
- Name_Buffer (2) := '_';
- Name_Buffer (Flength + 4) := 'c';
- Name_Buffer (Flength + 5) := ASCII.NUL;
- Name_Len := Flength + 4;
-
-- Ada bind file, name is b~xxx.adb or b~xxx.ads
- -- (with __ instead of ~ in VMS)
-
- else
- if OpenVMS_On_Target then
- Name_Buffer (2) := '_';
- Name_Buffer (3) := '_';
- else
- Name_Buffer (2) := '~';
- end if;
- Name_Buffer (Flength + Bind_File_Prefix_Len + 2) := 'a';
- Name_Buffer (Flength + Bind_File_Prefix_Len + 3) := 'd';
- Name_Buffer (Flength + Bind_File_Prefix_Len + 4) := Typ;
- Name_Buffer (Flength + Bind_File_Prefix_Len + 5) := ASCII.NUL;
- Name_Len := Flength + Bind_File_Prefix_Len + 4;
- end if;
+ Name_Buffer (2) := '~';
+
+ Name_Buffer (Flength + Bind_File_Prefix_Len + 2) := 'a';
+ Name_Buffer (Flength + Bind_File_Prefix_Len + 3) := 'd';
+ Name_Buffer (Flength + Bind_File_Prefix_Len + 4) := Typ;
+ Name_Buffer (Flength + Bind_File_Prefix_Len + 5) := ASCII.NUL;
+ Name_Len := Flength + Bind_File_Prefix_Len + 4;
end if;
Bfile := Name_Find;