[multiple changes]

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

	* g-expect.adb: Minor reformatting.

2011-08-05  Bob Duff  <duff@adacore.com>

	* a-fihema.adb: Comment out OS_Lib.

2011-08-05  Matthew Heaney  <heaney@adacore.com>

	* Makefile.rtl, impunit.adb: Added a-c[oi]mutr.ad[sb]
	(unbounded multiway tree containers) and a-iteint.ads.
	* a-comutr.ads, a-comutr.adb:
	This is the new Ada 2012 unit for unbounded multiway tree containers
	* a-cimutr.ads, a-cimutr.adb
	This is the new Ada 2012 unit for indefinite multiway tree containers
	* a-iteint.ads: New file.

From-SVN: r177449

gcc/ada/ChangeLog

+2011-08-05  Thomas Quinot  <quinot@adacore.com>
+
+	* g-expect.adb: Minor reformatting.
+
+2011-08-05  Bob Duff  <duff@adacore.com>
+
+	* a-fihema.adb: Comment out OS_Lib.
+
+2011-08-05  Matthew Heaney  <heaney@adacore.com>
+
+	* Makefile.rtl, impunit.adb: Added a-c[oi]mutr.ad[sb]
+	(unbounded multiway tree containers) and a-iteint.ads.
+	* a-comutr.ads, a-comutr.adb:
+	This is the new Ada 2012 unit for unbounded multiway tree containers
+	* a-cimutr.ads, a-cimutr.adb
+	This is the new Ada 2012 unit for indefinite multiway tree containers
+	* a-iteint.ads: New file.
+
 2011-08-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* gcc-interface/Makefile.in (raise-gcc.o): Search

gcc/ada/Makefile.rtl

@@ -139,6 +139,8 @@ GNATRTL_NONTASKING_OBJS= \
   a-crbtgk$(objext) \
   a-crbtgo$(objext) \
   a-crdlli$(objext) \
+  a-comutr$(objext) \
+  a-cimutr$(objext) \
   a-cwila1$(objext) \
   a-cwila9$(objext) \
   a-decima$(objext) \

gcc/ada/a-fihema.adb

@@ -35,7 +35,8 @@ with Ada.Unchecked_Conversion;
 with System;                  use System;
 with System.Address_Image;
 with System.IO;               use System.IO;
-with System.OS_Lib;
+--  ???with System.OS_Lib;
+--  Breaks ravenscar runtimes
 with System.Soft_Links;       use System.Soft_Links;
 with System.Storage_Elements; use System.Storage_Elements;
 with System.Storage_Pools;    use System.Storage_Pools;
@@ -88,7 +89,8 @@ package body Ada.Finalization.Heap_Management is
       procedure Fail is
       begin
          Put_Line ("Heap_Management: Fin_Assert failed: " & Message);
-         OS_Lib.OS_Abort;
+         --  ???OS_Lib.OS_Abort;
+         --  Breaks ravenscar runtimes
       end Fail;
 
    --  Start of processing for Fin_Assert

gcc/ada/a-iteint.ads

+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT LIBRARY COMPONENTS                          --
+--                                                                          --
+--               A D A . I T E R A T O R . I N T E R F A C E S              --
+--                                                                          --
+--                                 S p e c                                  --
+--                                                                          --
+--          Copyright (C) 2004-2011, Free Software Foundation, Inc.         --
+--                                                                          --
+-- This specification is derived from the Ada Reference Manual for use with --
+-- GNAT. The copyright notice above, and the license provisions that follow --
+-- apply solely to the  contents of the part following the private keyword. --
+--                                                                          --
+-- 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/>.                                          --
+--                                                                          --
+------------------------------------------------------------------------------
+
+generic
+   type Cursor is private;
+   No_Element : Cursor;
+   pragma Unreferenced (No_Element);
+package Ada.Iterator_Interfaces is
+   type Forward_Iterator is limited interface;
+   function First (Object : Forward_Iterator) return Cursor is abstract;
+   function Next (Object : Forward_Iterator; Position : Cursor) return Cursor
+     is abstract;
+   type Reversible_Iterator is limited interface and Forward_Iterator;
+   function Last (Object : Reversible_Iterator) return Cursor is abstract;
+   function Previous (Object : Reversible_Iterator; Position : Cursor)
+     return Cursor is abstract;
+end Ada.Iterator_Interfaces;

gcc/ada/g-expect.adb

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2000-2010, AdaCore                     --
+--                     Copyright (C) 2000-2011, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -926,7 +926,7 @@ package body GNAT.Expect is
                   NOutput (Output'Range) := Output.all;
                   Free (Output);
 
-                  --  Here if current buffer size is OK
+               --  Here if current buffer size is OK
 
                else
                   NOutput := Output;

gcc/ada/impunit.adb

@@ -515,7 +515,10 @@ package body Impunit is
      "a-cbhase",    -- Ada.Containers.Bounded_Hashed_Sets
      "a-cbhama",    -- Ada.Containers.Bounded_Hashed_Maps
      "a-coinho",    -- Ada.Containers.Indefinite_Holders
+     "a-comutr",    -- Ada.Containers.Multiway_Trees
+     "a-cimutr",    -- Ada.Containers.Indefinite_Multiway_Trees
      "a-extiin",    -- Ada.Execution_Time.Interrupts
+     "a-iteint",    -- Ada.Iterator_Interfaces
 
    -----------------------------------------
    -- GNAT Defined Additions to Ada 20012 --