From 8604dde06645527f5a73fb7922ba8d944906df7e Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 20 Sep 2012 21:58:46 +0000
Subject: [PATCH] opt20.ads: Move dg directive to...

	* gnat.dg/opt20.ads: Move dg directive to...
	* gnat.dg/opt20.adb: ...here.
	* gnat.dg/addr1.ad[sb]: Likewise.
	* gnat.dg/concat2.ad[sb]: Likewise.
	* gnat.dg/array16.ad[sb]: Likewise.
	* gnat.dg/atomic5.ad[sb]: Likewise.
	* gnat.dg/discr29.ad[sb]: Likewise.
	* gnat.dg/noreturn5.ad[sb]: Likewise.
	* gnat.dg/vect8.ad[sb]: Likewise.  Add dg-options.
	* gnat.dg/discr23.ads: Remove dg directive.
	* gnat.dg/nested_float_packed.ads: Likewise.
	* gnat.dg/oconst6.ads: Move to...
	* gnat.dg/specs/oconst6.ads: ...here.

From-SVN: r191592
---
 gcc/testsuite/ChangeLog                       | 16 ++++++++++++++++
 gcc/testsuite/gnat.dg/addr1.adb               |  2 ++
 gcc/testsuite/gnat.dg/addr1.ads               |  2 --
 gcc/testsuite/gnat.dg/array16.adb             |  6 ++++++
 gcc/testsuite/gnat.dg/array16.ads             |  6 ------
 gcc/testsuite/gnat.dg/atomic5.adb             |  2 ++
 gcc/testsuite/gnat.dg/atomic5.ads             |  2 --
 gcc/testsuite/gnat.dg/concat2.adb             |  4 +++-
 gcc/testsuite/gnat.dg/concat2.ads             |  3 ---
 gcc/testsuite/gnat.dg/discr23.ads             |  2 --
 gcc/testsuite/gnat.dg/discr29.adb             |  2 ++
 gcc/testsuite/gnat.dg/discr29.ads             |  2 --
 gcc/testsuite/gnat.dg/nested_float_packed.ads |  4 ----
 gcc/testsuite/gnat.dg/noreturn5.adb           |  2 ++
 gcc/testsuite/gnat.dg/noreturn5.ads           |  2 --
 gcc/testsuite/gnat.dg/opt20.adb               |  3 +++
 gcc/testsuite/gnat.dg/opt20.ads               |  3 ---
 gcc/testsuite/gnat.dg/{ => specs}/oconst6.ads |  0
 gcc/testsuite/gnat.dg/vect8.adb               |  3 +++
 gcc/testsuite/gnat.dg/vect8.ads               |  2 --
 20 files changed, 39 insertions(+), 29 deletions(-)
 rename gcc/testsuite/gnat.dg/{ => specs}/oconst6.ads (100%)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e419eb121ac..4d1f9172c96 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2012-09-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt20.ads: Move dg directive to...
+	* gnat.dg/opt20.adb: ...here.
+	* gnat.dg/addr1.ad[sb]: Likewise.
+	* gnat.dg/concat2.ad[sb]: Likewise.
+	* gnat.dg/array16.ad[sb]: Likewise.
+	* gnat.dg/atomic5.ad[sb]: Likewise.
+	* gnat.dg/discr29.ad[sb]: Likewise.
+	* gnat.dg/noreturn5.ad[sb]: Likewise.
+	* gnat.dg/vect8.ad[sb]: Likewise.  Add dg-options.
+	* gnat.dg/discr23.ads: Remove dg directive.
+	* gnat.dg/nested_float_packed.ads: Likewise.
+	* gnat.dg/oconst6.ads: Move to...
+	* gnat.dg/specs/oconst6.ads: ...here.
+
 2012-09-20  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/52432
diff --git a/gcc/testsuite/gnat.dg/addr1.adb b/gcc/testsuite/gnat.dg/addr1.adb
index 521d0495a9b..5f5ff535633 100644
--- a/gcc/testsuite/gnat.dg/addr1.adb
+++ b/gcc/testsuite/gnat.dg/addr1.adb
@@ -1,3 +1,5 @@
+--  { dg-do compile }
+
 with System;
 package body addr1 is
    task type T is
diff --git a/gcc/testsuite/gnat.dg/addr1.ads b/gcc/testsuite/gnat.dg/addr1.ads
index 51061fde089..99496cd5147 100644
--- a/gcc/testsuite/gnat.dg/addr1.ads
+++ b/gcc/testsuite/gnat.dg/addr1.ads
@@ -1,5 +1,3 @@
---  { dg-do compile }
-
 package addr1 is
    pragma Elaborate_Body;
 end;
diff --git a/gcc/testsuite/gnat.dg/array16.adb b/gcc/testsuite/gnat.dg/array16.adb
index 18abf8f8199..be61cb93c79 100644
--- a/gcc/testsuite/gnat.dg/array16.adb
+++ b/gcc/testsuite/gnat.dg/array16.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-O -gnatn -fdump-tree-optimized" }
+
 package body Array16 is
 
   function F1 (A : access My_T1) return My_T1 is
@@ -20,3 +23,6 @@ package body Array16 is
   end;
 
 end Array16;
+
+-- { dg-final { scan-tree-dump-not "secondary_stack" "optimized" } }
+-- { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gnat.dg/array16.ads b/gcc/testsuite/gnat.dg/array16.ads
index 69452c98f3a..a54a2df45d6 100644
--- a/gcc/testsuite/gnat.dg/array16.ads
+++ b/gcc/testsuite/gnat.dg/array16.ads
@@ -1,6 +1,3 @@
--- { dg-do compile }
--- { dg-options "-O -gnatn -fdump-tree-optimized" }
-
 with Array16_Pkg;
 
 package Array16 is
@@ -26,6 +23,3 @@ package Array16 is
   procedure Proc (A : access My_T1; B : access My_T2);
 
 end Array16;
-
--- { dg-final { scan-tree-dump-not "secondary_stack" "optimized" } }
--- { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gnat.dg/atomic5.adb b/gcc/testsuite/gnat.dg/atomic5.adb
index efbed4e34ac..d17e6ff1ce9 100644
--- a/gcc/testsuite/gnat.dg/atomic5.adb
+++ b/gcc/testsuite/gnat.dg/atomic5.adb
@@ -1,3 +1,5 @@
+-- { dg-do compile }
+
 package body Atomic5 is
 
   function Create return R is
diff --git a/gcc/testsuite/gnat.dg/atomic5.ads b/gcc/testsuite/gnat.dg/atomic5.ads
index 3f653fa1151..ce702ba1c93 100644
--- a/gcc/testsuite/gnat.dg/atomic5.ads
+++ b/gcc/testsuite/gnat.dg/atomic5.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 with Unchecked_Conversion;
 
 package Atomic5 is
diff --git a/gcc/testsuite/gnat.dg/concat2.adb b/gcc/testsuite/gnat.dg/concat2.adb
index 221c4a310db..a642d264450 100644
--- a/gcc/testsuite/gnat.dg/concat2.adb
+++ b/gcc/testsuite/gnat.dg/concat2.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-O" }
+
 with Text_IO; use Text_IO;
 
 package body Concat2 is
@@ -15,4 +18,3 @@ package body Concat2 is
    end;
 
 end Concat2;
-
diff --git a/gcc/testsuite/gnat.dg/concat2.ads b/gcc/testsuite/gnat.dg/concat2.ads
index 01e620be0a6..9f90cbb0eaa 100644
--- a/gcc/testsuite/gnat.dg/concat2.ads
+++ b/gcc/testsuite/gnat.dg/concat2.ads
@@ -1,6 +1,3 @@
--- { dg-do compile }
--- { dg-options "-O" }
-
 package Concat2 is
 
    procedure Browse;
diff --git a/gcc/testsuite/gnat.dg/discr23.ads b/gcc/testsuite/gnat.dg/discr23.ads
index 8e673b382a9..960dcdaf8cc 100644
--- a/gcc/testsuite/gnat.dg/discr23.ads
+++ b/gcc/testsuite/gnat.dg/discr23.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Discr23 is
 
   procedure Dummy;
diff --git a/gcc/testsuite/gnat.dg/discr29.adb b/gcc/testsuite/gnat.dg/discr29.adb
index 56047c9cf6e..834437f6fb8 100644
--- a/gcc/testsuite/gnat.dg/discr29.adb
+++ b/gcc/testsuite/gnat.dg/discr29.adb
@@ -1,3 +1,5 @@
+-- { dg-do compile }
+
 package body Discr29 is
 
    procedure Proc (R : out Rec3) is
diff --git a/gcc/testsuite/gnat.dg/discr29.ads b/gcc/testsuite/gnat.dg/discr29.ads
index a205bc1e0dd..6bbf16725ed 100644
--- a/gcc/testsuite/gnat.dg/discr29.ads
+++ b/gcc/testsuite/gnat.dg/discr29.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Discr29 is
 
    type Rec1 is record
diff --git a/gcc/testsuite/gnat.dg/nested_float_packed.ads b/gcc/testsuite/gnat.dg/nested_float_packed.ads
index ae7f5239068..46b9e803fcd 100644
--- a/gcc/testsuite/gnat.dg/nested_float_packed.ads
+++ b/gcc/testsuite/gnat.dg/nested_float_packed.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Nested_Float_Packed is
 
    type Float_Type is record
@@ -20,5 +18,3 @@ package Nested_Float_Packed is
    Data_Block : array (Range_Type)
      of Data_Type := (others => Default_Data);
 end;
-
-
diff --git a/gcc/testsuite/gnat.dg/noreturn5.adb b/gcc/testsuite/gnat.dg/noreturn5.adb
index 2f759909769..59b05da92fe 100644
--- a/gcc/testsuite/gnat.dg/noreturn5.adb
+++ b/gcc/testsuite/gnat.dg/noreturn5.adb
@@ -1,3 +1,5 @@
+-- { dg-do compile }
+
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 with GNAT.OS_Lib;             use GNAT.OS_Lib;
 with Text_IO;                 use Text_IO;
diff --git a/gcc/testsuite/gnat.dg/noreturn5.ads b/gcc/testsuite/gnat.dg/noreturn5.ads
index 4da5c1e0906..433f0e63bee 100644
--- a/gcc/testsuite/gnat.dg/noreturn5.ads
+++ b/gcc/testsuite/gnat.dg/noreturn5.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Noreturn5 is
 
    procedure Proc (Arg_Line : Wide_String; Keep_Going : Boolean);
diff --git a/gcc/testsuite/gnat.dg/opt20.adb b/gcc/testsuite/gnat.dg/opt20.adb
index 6d3e240bab5..00e41b4a494 100644
--- a/gcc/testsuite/gnat.dg/opt20.adb
+++ b/gcc/testsuite/gnat.dg/opt20.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-O2 -gnatpn" }
+
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 
 package body Opt20 is
diff --git a/gcc/testsuite/gnat.dg/opt20.ads b/gcc/testsuite/gnat.dg/opt20.ads
index 58833bfab4b..ec547ee88f4 100644
--- a/gcc/testsuite/gnat.dg/opt20.ads
+++ b/gcc/testsuite/gnat.dg/opt20.ads
@@ -1,6 +1,3 @@
--- { dg-do compile }
--- { dg-options "-O2 -gnatpn" }
-
 with Opt20_Pkg; use Opt20_Pkg;
 
 package Opt20 is
diff --git a/gcc/testsuite/gnat.dg/oconst6.ads b/gcc/testsuite/gnat.dg/specs/oconst6.ads
similarity index 100%
rename from gcc/testsuite/gnat.dg/oconst6.ads
rename to gcc/testsuite/gnat.dg/specs/oconst6.ads
diff --git a/gcc/testsuite/gnat.dg/vect8.adb b/gcc/testsuite/gnat.dg/vect8.adb
index b13555abd0f..7b1cecf083b 100644
--- a/gcc/testsuite/gnat.dg/vect8.adb
+++ b/gcc/testsuite/gnat.dg/vect8.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-w" }
+
 package body Vect8 is
 
    function Foo (V : Vec) return Vec is
diff --git a/gcc/testsuite/gnat.dg/vect8.ads b/gcc/testsuite/gnat.dg/vect8.ads
index 5406c70f49f..c926cd51ffa 100644
--- a/gcc/testsuite/gnat.dg/vect8.ads
+++ b/gcc/testsuite/gnat.dg/vect8.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Vect8 is
 
    type Vec is array (1 .. 2) of Long_Float;