[multiple changes]

2011-08-04  Jerome Lambourg  <lambourg@adacore.com>

	* g-comlin.adb (For_Each_Simple_Switch.Is_In_Config): Remove the
	invalid checks of the Parameter, making Remove_Switch not working
	correctly.

2011-08-04  Arnaud Charlet  <charlet@adacore.com>

	* targparm.ads: Update header: no run-time exception is needed on this
	file.

2011-08-04  Vincent Celier  <celier@adacore.com>

	* a-fihema.adb: Use System.IO instead of GNAT.IO

2011-08-04  Thomas Quinot  <quinot@adacore.com>

	* sem_ch3.adb (Access_Definition): Anonymous access to subprogram types
	are forbidden in Compiler_Unit mode.

From-SVN: r177323

5 files changed, 42 insertions, 28 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 22f51fa..3289f77 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,23 @@
+2011-08-04  Jerome Lambourg  <lambourg@adacore.com>
+
+	* g-comlin.adb (For_Each_Simple_Switch.Is_In_Config): Remove the
+	invalid checks of the Parameter, making Remove_Switch not working
+	correctly.
+
+2011-08-04  Arnaud Charlet  <charlet@adacore.com>
+
+	* targparm.ads: Update header: no run-time exception is needed on this
+	file.
+
+2011-08-04  Vincent Celier  <celier@adacore.com>
+
+	* a-fihema.adb: Use System.IO instead of GNAT.IO
+
+2011-08-04  Thomas Quinot  <quinot@adacore.com>
+
+	* sem_ch3.adb (Access_Definition): Anonymous access to subprogram types
+	are forbidden in Compiler_Unit mode.
+
 2011-08-04  Robert Dewar  <dewar@adacore.com>
 
 	* sem_util.adb: Minor reformatting.
diff --git a/gcc/ada/a-fihema.adb b/gcc/ada/a-fihema.adb
index d44d1db..0383de0 100644
--- a/gcc/ada/a-fihema.adb
+++ b/gcc/ada/a-fihema.adb
@@ -33,10 +33,9 @@ with Ada.Exceptions;          use Ada.Exceptions;
 with Ada.Unchecked_Conversion;
 with Ada.Unchecked_Deallocation;
 
-with GNAT.IO;                 use GNAT.IO;
-
 with System;                  use System;
 with System.Address_Image;
+with System.IO;               use System.IO;
 with System.Soft_Links;       use System.Soft_Links;
 with System.Storage_Elements; use System.Storage_Elements;
 with System.Storage_Pools;    use System.Storage_Pools;
diff --git a/gcc/ada/g-comlin.adb b/gcc/ada/g-comlin.adb
index b4d322c..b39c57a 100644
--- a/gcc/ada/g-comlin.adb
+++ b/gcc/ada/g-comlin.adb
@@ -1917,25 +1917,19 @@ package body GNAT.Command_Line is
                   end if;
 
                when Parameter_With_Optional_Space =>
-                  if Parameter /= "" then
-                     Callback (Switch, " ", Parameter, Index => Index);
-                     Found_In_Config := True;
-                     return False;
-                  end if;
+                  Callback (Switch, " ", Parameter, Index => Index);
+                  Found_In_Config := True;
+                  return False;
 
                when Parameter_With_Space_Or_Equal =>
-                  if Parameter /= "" then
-                     Callback (Switch, "=", Parameter, Index => Index);
-                     Found_In_Config := True;
-                     return False;
-                  end if;
+                  Callback (Switch, "=", Parameter, Index => Index);
+                  Found_In_Config := True;
+                  return False;
 
                when Parameter_No_Space =>
-                  if Parameter /= "" then
-                     Callback (Switch, "", Parameter, Index);
-                     Found_In_Config := True;
-                     return False;
-                  end if;
+                  Callback (Switch, "", Parameter, Index);
+                  Found_In_Config := True;
+                  return False;
 
                when Parameter_Optional =>
                   Callback (Switch, "", Parameter, Index);
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 1851f93..283f840 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -793,6 +793,13 @@ package body Sem_Ch3 is
       --  the corresponding semantic routine
 
       if Present (Access_To_Subprogram_Definition (N)) then
+
+         --  Compiler runtime units are compiled in Ada 2005 mode when building
+         --  the runtime library but must also be compilable in Ada 95 mode
+         --  (when bootstrapping the compiler).
+
+         Check_Compiler_Unit (N);
+
          Access_Subprogram_Declaration
            (T_Name => Anon_Type,
             T_Def  => Access_To_Subprogram_Definition (N));
diff --git a/gcc/ada/targparm.ads b/gcc/ada/targparm.ads
index 726e305..7db350b 100644
--- a/gcc/ada/targparm.ads
+++ b/gcc/ada/targparm.ads
@@ -6,23 +6,17 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1999-2009, Free Software Foundation, Inc.         --
+--          Copyright (C) 1999-2011, 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- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
---                                                                          --
--- As a special exception under Section 7 of GPL version 3, you are granted --
--- additional permissions described in the GCC Runtime Library Exception,   --
--- version 3.1, as published by the Free Software Foundation.               --
---                                                                          --
--- You should have received a copy of the GNU General Public License and    --
--- a copy of the GCC Runtime Library Exception along with this program;     --
--- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
--- <http://www.gnu.org/licenses/>.                                          --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT; see file COPYING3.  If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license.          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --