aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2010-06-14 11:17:14 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2010-06-14 11:17:14 +0200
commit49d140bba45474cb8153c4fdc56db0387261d3b1 (patch)
tree39555a32d97d8aa76cd5dfed85f43175bb185629
parent7415029d47f49954c09bd16c1b7d948dfc67c127 (diff)
downloadgcc-49d140bba45474cb8153c4fdc56db0387261d3b1.zip
gcc-49d140bba45474cb8153c4fdc56db0387261d3b1.tar.gz
gcc-49d140bba45474cb8153c4fdc56db0387261d3b1.tar.bz2
[multiple changes]
2010-06-14 Gary Dismukes <dismukes@adacore.com> * sem_ch4.adb: Fix typo. 2010-06-14 Vasiliy Fofanov <fofanov@adacore.com> * s-oscons-tmplt.c (IOV_MAX): redefine on Tru64 and VMS since the vector IO doesn't work at default value properly. 2010-06-14 Doug Rupp <rupp@adacore.com> * s-stoele.adb: Remove unnecessary qualification of To_Address for VMS. 2010-06-14 Vincent Celier <celier@adacore.com> * gnatcmd.adb (Check_Files): Do not invoke the tool with all the sources of the project if a switch -files= is used. 2010-06-14 Thomas Quinot <quinot@adacore.com> * exp_attr.adb: Minor reformatting From-SVN: r160714
-rw-r--r--gcc/ada/ChangeLog21
-rw-r--r--gcc/ada/exp_attr.adb9
-rw-r--r--gcc/ada/gnatcmd.adb21
-rw-r--r--gcc/ada/s-oscons-tmplt.c16
-rw-r--r--gcc/ada/s-stoele.adb10
-rw-r--r--gcc/ada/sem_ch4.adb2
6 files changed, 60 insertions, 19 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6f7d87c6..926c7af 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,26 @@
2010-06-14 Gary Dismukes <dismukes@adacore.com>
+ * sem_ch4.adb: Fix typo.
+
+2010-06-14 Vasiliy Fofanov <fofanov@adacore.com>
+
+ * s-oscons-tmplt.c (IOV_MAX): redefine on Tru64 and VMS since the
+ vector IO doesn't work at default value properly.
+
+2010-06-14 Doug Rupp <rupp@adacore.com>
+
+ * s-stoele.adb: Remove unnecessary qualification of To_Address for VMS.
+
+2010-06-14 Vincent Celier <celier@adacore.com>
+
+ * gnatcmd.adb (Check_Files): Do not invoke the tool with all the
+ sources of the project if a switch -files= is used.
+
+2010-06-14 Thomas Quinot <quinot@adacore.com>
+
+ * exp_attr.adb: Minor reformatting
+2010-06-14 Gary Dismukes <dismukes@adacore.com>
+
* gnat_ugn.texi: Minor typo fixes and wording changes
2010-06-14 Ed Schonberg <schonberg@adacore.com>
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 48bd566..7f7e1d1 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -3586,8 +3586,7 @@ package body Exp_Attr is
Attribute_Name => Name_First,
Prefix => New_Occurrence_Of (Ptyp, Loc))))),
- Right_Opnd =>
- Make_Integer_Literal (Loc, 1)));
+ Right_Opnd => Make_Integer_Literal (Loc, 1)));
Analyze_And_Resolve (N, Typ);
@@ -3707,7 +3706,7 @@ package body Exp_Attr is
Rewrite (N,
Make_Assignment_Statement (Loc,
- Name => Lhs,
+ Name => Lhs,
Expression => Rhs));
Analyze (N);
@@ -3785,9 +3784,7 @@ package body Exp_Attr is
-- the context of a _Postcondition function with a _Result parameter.
when Attribute_Result =>
- Rewrite (N,
- Make_Identifier (Loc,
- Chars => Name_uResult));
+ Rewrite (N, Make_Identifier (Loc, Chars => Name_uResult));
Analyze_And_Resolve (N, Typ);
-----------
diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb
index 6ab6821..c462806 100644
--- a/gcc/ada/gnatcmd.adb
+++ b/gcc/ada/gnatcmd.adb
@@ -209,9 +209,9 @@ procedure GNATCmd is
procedure Check_Files;
-- For GNAT LIST, GNAT PRETTY, GNAT METRIC, and GNAT STACK, check if a
- -- project file is specified, without any file arguments. If it is the
- -- case, invoke the GNAT tool with the proper list of files, derived from
- -- the sources of the project.
+ -- project file is specified, without any file arguments and without a
+ -- switch -files=. If it is the case, invoke the GNAT tool with the proper
+ -- list of files, derived from the sources of the project.
function Check_Project
(Project : Project_Id;
@@ -314,10 +314,17 @@ procedure GNATCmd is
Success : Boolean;
begin
- -- Check if there is at least one argument that is not a switch
+ -- Check if there is at least one argument that is not a switch or if
+ -- there is a -files= switch.
for Index in 1 .. Last_Switches.Last loop
- if Last_Switches.Table (Index) (1) /= '-' then
+ if Last_Switches.Table (Index).all'Length > 7 and then
+ Last_Switches.Table (Index) (1 .. 7) = "-files="
+ then
+ Add_Sources := False;
+ exit;
+
+ elsif Last_Switches.Table (Index) (1) /= '-' then
if Index = 1
or else
(The_Command = Check
@@ -346,8 +353,8 @@ procedure GNATCmd is
end if;
end loop;
- -- If all arguments were switches, add the path names of all the sources
- -- of the main project.
+ -- If all arguments are switchesand there is no switch -files=, add the
+ -- path names of all the sources of the main project.
if Add_Sources then
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index 1e8bd52..a7ca809 100644
--- a/gcc/ada/s-oscons-tmplt.c
+++ b/gcc/ada/s-oscons-tmplt.c
@@ -98,6 +98,22 @@ pragma Style_Checks ("M32766");
#include <limits.h>
#include <fcntl.h>
+#if defined (__alpha__) && defined (__osf__)
+/** Tru64 is unable to do vector IO operations with default value of IOV_MAX,
+ ** so its value is redefined to a small one which is known to work properly.
+ **/
+#undef IOV_MAX
+#define IOV_MAX 16
+#endif
+
+#if defined (__VMS)
+/** VMS is unable to do vector IO operations with default value of IOV_MAX,
+ ** so its value is redefined to a small one which is known to work properly.
+ **/
+#undef IOV_MAX
+#define IOV_MAX 16
+#endif
+
#if ! (defined (__vxworks) || defined (__VMS) || defined (__MINGW32__) || \
defined (__nucleus__))
# define HAVE_TERMIOS
diff --git a/gcc/ada/s-stoele.adb b/gcc/ada/s-stoele.adb
index dfd7810..776aacb 100644
--- a/gcc/ada/s-stoele.adb
+++ b/gcc/ada/s-stoele.adb
@@ -39,7 +39,7 @@ package body System.Storage_Elements is
-- Conversion to/from address
- -- Note full qualification below of To_Address to avoid ambiguities on VMS.
+ -- Note qualification below of To_Address to avoid ambiguities on VMS.
function To_Address is
new Ada.Unchecked_Conversion (Storage_Offset, Address);
@@ -65,25 +65,25 @@ package body System.Storage_Elements is
function "+" (Left : Address; Right : Storage_Offset) return Address is
begin
- return System.Storage_Elements.To_Address
+ return Storage_Elements.To_Address
(To_Integer (Left) + To_Integer (To_Address (Right)));
end "+";
function "+" (Left : Storage_Offset; Right : Address) return Address is
begin
- return System.Storage_Elements.To_Address
+ return Storage_Elements.To_Address
(To_Integer (To_Address (Left)) + To_Integer (Right));
end "+";
function "-" (Left : Address; Right : Storage_Offset) return Address is
begin
- return System.Storage_Elements.To_Address
+ return Storage_Elements.To_Address
(To_Integer (Left) - To_Integer (To_Address (Right)));
end "-";
function "-" (Left, Right : Address) return Storage_Offset is
begin
- return To_Offset (System.Storage_Elements.To_Address
+ return To_Offset (Storage_Elements.To_Address
(To_Integer (Left) - To_Integer (Right)));
end "-";
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 3010183..126b003 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -6094,7 +6094,7 @@ package body Sem_Ch4 is
First_Actual : Node_Id;
begin
- -- Place the name of the operation, with its innterpretations,
+ -- Place the name of the operation, with its interpretations,
-- on the rewritten call.
Set_Name (Call_Node, Subprog);