2009-04-27 Basile Starynkevitch <basile@starynkevitch.net>

	MERGED WITH TRUNK r146824::
	* gcc/basilys.h: all GTY goes before the identifiers.
	* gcc/basilys.c: removed errors.h include.
	* gcc/run-basilys.h: ditto.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@146839 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 78 insertions, 0 deletions

diff --git a/gcc/ada/s-conca3.adb b/gcc/ada/s-conca3.adb
new file mode 100644
index 00000000000..48e4d86512b
--- /dev/null
+++ b/gcc/ada/s-conca3.adb
@@ -0,0 +1,78 @@
+------------------------------------------------------------------------------
+--                                                                          --
+--                 GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS                 --
+--                                                                          --
+--                      S Y S T E M . C O N C A T _ 3                       --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--            Copyright (C) 2008-2009, 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/>.                                          --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+pragma Compiler_Unit;
+
+with System.Concat_2;
+
+package body System.Concat_3 is
+
+   pragma Suppress (All_Checks);
+
+   ------------------
+   -- Str_Concat_3 --
+   ------------------
+
+   procedure Str_Concat_3 (R : out String; S1, S2, S3 : String) is
+      F, L : Natural;
+
+   begin
+      F := R'First;
+      L := F + S1'Length - 1;
+      R (F .. L) := S1;
+
+      F := L + 1;
+      L := F + S2'Length - 1;
+      R (F .. L) := S2;
+
+      F := L + 1;
+      L := R'Last;
+      R (F .. L) := S3;
+   end Str_Concat_3;
+
+   -------------------------
+   -- Str_Concat_Bounds_3 --
+   -------------------------
+
+   procedure Str_Concat_Bounds_3
+     (Lo, Hi     : out Natural;
+      S1, S2, S3 : String)
+   is
+   begin
+      System.Concat_2.Str_Concat_Bounds_2 (Lo, Hi, S2, S3);
+
+      if S1 /= "" then
+         Hi := S1'Last + Hi - Lo + 1;
+         Lo := S1'First;
+      end if;
+   end Str_Concat_Bounds_3;
+
+end System.Concat_3;