* Merge accumulated Ada changes from gnat-4.8.

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7078 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

1 files changed, 3 insertions, 5 deletions

diff --git a/debian/patches/ada-default-project-path.diff b/debian/patches/ada-default-project-path.diff
index 2ccdaf0..8f9ff5f 100644
--- a/debian/patches/ada-default-project-path.diff
+++ b/debian/patches/ada-default-project-path.diff
@@ -26,7 +26,7 @@ Index: b/src/gcc/ada/prj-env.adb
  with Opt;
  with Osint;    use Osint;
  with Output;   use Output;
-@@ -1884,6 +1883,7 @@
+@@ -1889,6 +1888,7 @@
       (Self        : in out Project_Search_Path;
        Target_Name : String)
     is
@@ -34,7 +34,7 @@ Index: b/src/gcc/ada/prj-env.adb
        Add_Default_Dir : Boolean := True;
        First           : Positive;
        Last            : Positive;
-@@ -2018,59 +2018,10 @@
+@@ -2023,59 +2023,8 @@
  
        --  Set the initial value of Current_Project_Path
  
@@ -92,9 +92,7 @@ Index: b/src/gcc/ada/prj-env.adb
 -            Free (Prefix);
 -         end;
 +      if Add_Default_Dir and Sdefault.Search_Dir_Prefix /= null then
-+         Self.Path :=
-+           new String'(Name_Buffer (1 .. Name_Len) & Path_Separator &
-+                         Sdefault.Search_Dir_Prefix.all);
++         Add_Str_To_Name_Buffer (Path_Separator & Sdefault.Search_Dir_Prefix.all);
        end if;
  
        Self.Path := new String'(Name_Buffer (1 .. Name_Len));