[multiple changes]

2009-04-20  Robert Dewar  <dewar@adacore.com>

	* s-conca5.adb, s-conca5.ads, s-conca7.adb, s-conca7.ads, s-conca9.adb,
	s-conca9.ads, rtsfind.ads, s-conca2.adb, s-conca2.ads, s-conca4.adb,
	s-conca4.ads, s-conca6.adb, s-conca6.ads, s-conca8.adb, s-conca8.ads,
	s-conca3.adb, s-conca3.ads (Str_Concat_Bounds_x): New functions.

	* exp_ch4.adb (Expand_Concatenate): Minor code reorganization

2009-04-20  Pascal Obry  <obry@adacore.com>

	* initialize.c (__gnat_initialize): Add braces to kill warning.

	* adaint.c: Minor reformatting, untabify, remove trailing spaces.

From-SVN: r146379

1 files changed, 20 insertions, 0 deletions

diff --git a/gcc/ada/s-conca9.adb b/gcc/ada/s-conca9.adb
index a575801..530eee1 100644
--- a/gcc/ada/s-conca9.adb
+++ b/gcc/ada/s-conca9.adb
@@ -31,6 +31,8 @@
 
 pragma Compiler_Unit;
 
+with System.Concat_8;
+
 package body System.Concat_9 is
 
    pragma Suppress (All_Checks);
@@ -83,4 +85,22 @@ package body System.Concat_9 is
       R (F .. L) := S9;
    end Str_Concat_9;
 
+   -------------------------
+   -- Str_Concat_Bounds_9 --
+   -------------------------
+
+   procedure Str_Concat_Bounds_9
+     (Lo, Hi                             : out Natural;
+      S1, S2, S3, S4, S5, S6, S7, S8, S9 : String)
+   is
+   begin
+      System.Concat_8.Str_Concat_Bounds_8
+        (Lo, Hi, S2, S3, S4, S5, S6, S7, S8, S9);
+
+      if S1 /= "" then
+         Hi := S1'Last + Hi - Lo + 1;
+         Lo := S1'First;
+      end if;
+   end Str_Concat_Bounds_9;
+
 end System.Concat_9;