merge from trunk

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/profile-stdlib@152425 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 3 deletions

diff --git a/gcc/testsuite/gnat.dg/array7.adb b/gcc/testsuite/gnat.dg/array7.adb
index ff4e9e48857..d9df597cb3a 100644
--- a/gcc/testsuite/gnat.dg/array7.adb
+++ b/gcc/testsuite/gnat.dg/array7.adb
@@ -3,9 +3,18 @@
 
 package body Array7 is
 
-   function Get_Arr (Nbr : My_Range) return Arr_Acc is
-   begin
-      return new Arr (1 .. Nbr);
+   package body Range_Subtype is
+      function Get_Arr (Nbr : My_Range) return Arr_Acc is
+      begin
+         return new Arr (1 .. Nbr);
+      end;
+   end;
+
+   package body Range_Type is
+      function Get_Arr (Nbr : My_Range) return Arr_Acc is
+      begin
+         return new Arr (1 .. Nbr);
+      end;
    end;
 
 end Array7;