s-crtl.ads, [...]: Fix support for VMS

2009-11-30  Thomas Quinot  <quinot@adacore.com>

	* s-crtl.ads, s-oscons-tmplt.c: Fix support for VMS
	* make.adb, g-comlin.ads, exp_ch6.adb: Minor reformatting

From-SVN: r154767

6 files changed, 15 insertions, 33 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7bbbc06..69b0cb9 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Thomas Quinot  <quinot@adacore.com>
+
+	* s-crtl.ads, s-oscons-tmplt.c: Fix support for VMS
+	* make.adb, g-comlin.ads, exp_ch6.adb: Minor reformatting
+
 2009-11-30  Robert Dewar  <dewar@adacore.com>
 
 	* bcheck.adb, gnatlink.adb, make.adb, makeutl.adb, osint.adb,
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index 4a31187..c113540 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -2314,9 +2314,9 @@ package body Exp_Ch6 is
 
                      end case;
 
-                  --  For allocators we pass the level of the execution of
-                  --  the called subprogram, which is one greater than the
-                  --  current scope level.
+                  --  For allocators we pass the level of the execution of the
+                  --  called subprogram, which is one greater than the current
+                  --  scope level.
 
                   when N_Allocator =>
                      Add_Extra_Actual
diff --git a/gcc/ada/g-comlin.ads b/gcc/ada/g-comlin.ads
index 5e8f63f..8752ddc 100644
--- a/gcc/ada/g-comlin.ads
+++ b/gcc/ada/g-comlin.ads
@@ -622,8 +622,7 @@ package GNAT.Command_Line is
       Section    : String    := "";
       Add_Before : Boolean   := False;
       Success    : out Boolean);
-   --  Same as above, returning the status of
-   --  the operation
+   --  Same as above, returning the status of the operation
 
    procedure Remove_Switch
      (Cmd           : in out Command_Line;
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 89a4ad5..336d2ac 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -3405,7 +3405,7 @@ package body Make is
 
                      --  Compute where the ALI file must be generated in
                      --  In_Place_Mode (this does not require to know the
-                     --  location of the object directory)
+                     --  location of the object directory).
 
                      if In_Place_Mode then
                         if Full_Lib_File = No_File then
@@ -3426,9 +3426,9 @@ package body Make is
                         end if;
                      end if;
 
-                     --  Start the compilation and record it. We can do
-                     --  this because there is at least one free process.
-                     --  This might change the current directory
+                     --  Start the compilation and record it. We can do this
+                     --  because there is at least one free process. This
+                     --  might change the current directory.
 
                      Collect_Arguments_And_Compile
                        (Full_Source_File => Full_Source_File,
@@ -3481,7 +3481,7 @@ package body Make is
 
                      Lib_File_Attr := Unknown_Attributes;
 
-                     --  Make sure we could successfully start the Compilation
+                     --  Make sure we could successfully start the compilation
 
                      if Process_Created then
                         if Pid = Invalid_Pid then
diff --git a/gcc/ada/s-crtl.ads b/gcc/ada/s-crtl.ads
index e8bfd9b..4ad2cee 100644
--- a/gcc/ada/s-crtl.ads
+++ b/gcc/ada/s-crtl.ads
@@ -29,8 +29,7 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This package provides the low level interface to the C Run Time Library
---  on non-VMS systems.
+--  This package provides the low level interface to the C runtime library
 
 with System.Parameters;
 
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index 3771f4c..91c5a04 100644
--- a/gcc/ada/s-oscons-tmplt.c
+++ b/gcc/ada/s-oscons-tmplt.c
@@ -1275,27 +1275,6 @@ CST(Inet_Pton_Linkname, "")
 
 #endif /* HAVE_SOCKETS */
 
-/*
-
-   ---------------------------------
-   -- C runtime library interface --
-   ---------------------------------
-
-*/
-#if defined (__VMS)
-# define malloc32_Linkname  "_malloc32"
-# define realloc32_Linkname "_realloc32"
-# define strerror_Linkname  "DECC$STRERROR"
-#else
-# define malloc32_Linkname  "malloc"
-# define realloc32_Linkname "realloc"
-# define strerror_Linkname  "strerror"
-#endif
-
-CST(malloc32_Linkname, "")
-CST(realloc32_Linkname, "")
-CST(strerror_Linkname, "")
-
 /**
  **  System-specific constants follow
  **  Each section should be activated if compiling for the corresponding