[multiple changes]

2010-06-22  Thomas Quinot  <quinot@adacore.com>

	* exp_attr.adb, lib-writ.ads, bindgen.adb: Minor reformatting.
	* einfo.adb (Related_Expression, Set_Related_Expression): Add
	assertions.

2010-06-22  Javier Miranda  <miranda@adacore.com>

	* sem_ch3.adb (Add_Internal_Interface_Entities): Minor code
	reorganization to properly check if the operation has been inherited as
	an abstract operation.

2010-06-22  Ed Falis  <falis@adacore.com>

	* s-osinte-vxworks.ads: Complete previous change.

From-SVN: r161159

gcc/ada/ChangeLog

 2010-06-22  Thomas Quinot  <quinot@adacore.com>
 
+	* exp_attr.adb, lib-writ.ads, bindgen.adb: Minor reformatting.
+	* einfo.adb (Related_Expression, Set_Related_Expression): Add
+	assertions.
+
+2010-06-22  Javier Miranda  <miranda@adacore.com>
+
+	* sem_ch3.adb (Add_Internal_Interface_Entities): Minor code
+	reorganization to properly check if the operation has been inherited as
+	an abstract operation.
+
+2010-06-22  Ed Falis  <falis@adacore.com>
+
+	* s-osinte-vxworks.ads: Complete previous change.
+
+2010-06-22  Thomas Quinot  <quinot@adacore.com>
+
 	* sem_res.adb: Add comment.
 	* projects.texi, gnat_ugn.texi: Remove macro.
 

gcc/ada/einfo.adb

@@ -2434,7 +2434,7 @@ package body Einfo is
 
    function Related_Expression (Id : E) return N is
    begin
-      pragma Assert (Is_Type (Id)
+      pragma Assert (Ekind (Id) in Type_Kind
                        or else Ekind_In (Id, E_Constant, E_Variable));
       return Node24 (Id);
    end Related_Expression;
@@ -4893,6 +4893,8 @@ package body Einfo is
 
    procedure Set_Related_Expression (Id : E; V : N) is
    begin
+      pragma Assert (Ekind (Id) in Type_Kind
+                       or else Ekind_In (Id, E_Constant, E_Variable, E_Void));
       Set_Node24 (Id, V);
    end Set_Related_Expression;
 

gcc/ada/exp_attr.adb

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2010, 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- --
@@ -1257,8 +1257,8 @@ package body Exp_Attr is
       --  subprogram spec or package. This sequence of code references the
       --  the unsigned constant created in the main program by the binder.
 
-      --  A special exception occurs for Standard, where the string
-      --  returned is a copy of the library string in gnatvsn.ads.
+      --  A special exception occurs for Standard, where the string returned
+      --  is a copy of the library string in gnatvsn.ads.
 
       when Attribute_Body_Version | Attribute_Version => Version : declare
          E    : constant Entity_Id := Make_Temporary (Loc, 'V');

gcc/ada/lib-writ.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2010, 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- --
@@ -610,8 +610,8 @@ package Lib.Writ is
    ---------------------
 
    --  The reference lines contain information about references from any of the
-   --  units in the compilation (including, body version and version
-   --  attributes, linker options pragmas and source dependencies.
+   --  units in the compilation (including body version and version attributes,
+   --  linker options pragmas and source dependencies).
 
    --  ------------------------------------
    --  -- E  External Version References --
@@ -696,7 +696,7 @@ package Lib.Writ is
    --  reference data. See the spec of Par_SCO for full details of the format.
 
    ----------------------
-   -- Global_Variables --
+   -- Global variables --
    ----------------------
 
    --  The table structure defined here stores one entry for each

gcc/ada/s-osinte-vxworks.ads

@@ -155,7 +155,7 @@ package System.OS_Interface is
    SIG_DFL : constant := 0;
    SIG_IGN : constant := 1;
 
-   subtype sigset_t is System.VxWorks.Ext.sigset_t;
+   type sigset_t is private;
 
    type struct_sigaction is record
       sa_handler : System.Address;
@@ -497,4 +497,5 @@ private
    type clockid_t is new int;
    CLOCK_REALTIME : constant clockid_t := 0;
 
+   type sigset_t is new System.VxWorks.Ext.sigset_t;
 end System.OS_Interface;

gcc/ada/sem_ch3.adb

@@ -1567,15 +1567,15 @@ package body Sem_Ch3 is
                              and then Alias (Prim) = Iface_Prim;
                            Next_Elmt (El);
                         end loop;
-                     end;
-                  end if;
 
-                  --  If the operation was not explicitly overridden, it should
-                  --  have been inherited as an abstract operation so Prim can
-                  --  not be Empty at this stage.
+                        --  If the operation was not explicitly overridden, it
+                        --  should have been inherited as an abstract operation
+                        --  so Prim can not be Empty at this stage.
 
-                  if No (Prim) then
-                     raise Program_Error;
+                        if No (El) then
+                           raise Program_Error;
+                        end if;
+                     end;
                   end if;
 
                   Derive_Subprogram