From fb4fb123accb94141f0bb7ffdd9c62b4b71db15f Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 4 Aug 2014 07:45:28 +0000 Subject: [PATCH] discr6.adb, [...]: Removed, no longer relevant. * gnat.dg/discr6.adb, gnat.dg/discr6_pkg.ads: Removed, no longer relevant. * gnat.dg/debug1.ads: Adjust. * gnat.dg/formal_type.ads: Fix error in test. From-SVN: r213530 --- gcc/testsuite/ChangeLog | 7 +++++ gcc/testsuite/gnat.dg/discr6.adb | 33 --------------------- gcc/testsuite/gnat.dg/discr6_pkg.ads | 16 ---------- gcc/testsuite/gnat.dg/specs/debug1.ads | 2 +- gcc/testsuite/gnat.dg/specs/formal_type.ads | 3 +- 5 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 gcc/testsuite/gnat.dg/discr6.adb delete mode 100644 gcc/testsuite/gnat.dg/discr6_pkg.ads diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d18aed8ee1b..c04e0bc9c2c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-08-04 Arnaud Charlet + + * gnat.dg/discr6.adb, gnat.dg/discr6_pkg.ads: Removed, no longer + relevant. + * gnat.dg/debug1.ads: Adjust. + * gnat.dg/formal_type.ads: Fix error in test. + 2014-08-03 Marek Polacek * gcc.dg/case-bogus-1.c: New test. diff --git a/gcc/testsuite/gnat.dg/discr6.adb b/gcc/testsuite/gnat.dg/discr6.adb deleted file mode 100644 index 52a94b1d6ad..00000000000 --- a/gcc/testsuite/gnat.dg/discr6.adb +++ /dev/null @@ -1,33 +0,0 @@ --- { dg-do compile } --- { dg-options "-gnatdm -gnatws" } - -with Discr6_Pkg; - -procedure Discr6 is - - type T_Bit is range 0..1; - type T_Entier_16 is range -2**15 .. 2**15-1; - - package My_Q is new Discr6_Pkg(T_Entier_16); - - type T_Valeur is (BIT, Entier_16); - - type R(D : T_Valeur) is record - case D is - when BIT => V_BIT : T_Bit; - when Entier_16 => V_E16 : T_Entier_16; - end case; - end record; - for R use record - V_BIT at 0 range 0..7; - V_E16 at 0 range 0..15; - D at 8 range 0..7; - end record; - for R'size use 128; - - A : R(Entier_16); - I : Integer; - -begin - I := My_Q.X(A.V_E16); -end; diff --git a/gcc/testsuite/gnat.dg/discr6_pkg.ads b/gcc/testsuite/gnat.dg/discr6_pkg.ads deleted file mode 100644 index 81404d4613f..00000000000 --- a/gcc/testsuite/gnat.dg/discr6_pkg.ads +++ /dev/null @@ -1,16 +0,0 @@ -generic - - type T(<>) is private; - -package Discr6_Pkg is - - function X (A : T) return Integer; - - pragma Interface(C, X); - pragma IMPORT_FUNCTION ( - INTERNAL => X, - EXTERNAL => X, - PARAMETER_TYPES => (T), - MECHANISM => (Descriptor(S))); - -end Discr6_Pkg; diff --git a/gcc/testsuite/gnat.dg/specs/debug1.ads b/gcc/testsuite/gnat.dg/specs/debug1.ads index 1760eff739f..92e9184e473 100644 --- a/gcc/testsuite/gnat.dg/specs/debug1.ads +++ b/gcc/testsuite/gnat.dg/specs/debug1.ads @@ -11,4 +11,4 @@ package Debug1 is end Debug1; --- { dg-final { scan-assembler-times "DW_AT_artificial" 13 } } +-- { dg-final { scan-assembler-times "DW_AT_artificial" 17 } } diff --git a/gcc/testsuite/gnat.dg/specs/formal_type.ads b/gcc/testsuite/gnat.dg/specs/formal_type.ads index 4f12b82d3f5..1a6f8aadeb2 100644 --- a/gcc/testsuite/gnat.dg/specs/formal_type.ads +++ b/gcc/testsuite/gnat.dg/specs/formal_type.ads @@ -9,7 +9,6 @@ package formal_type is package G is end; package BI is new Ada.Strings.Bounded.Generic_Bounded_Length (30); type NB is new BI.Bounded_String; - Thing : NB; - Size : Integer := THing.Max_Length; + Thing : NB; package GI is new G (BI, NB); end; -- 2.30.2