From 2ae39fb2b00b0cfa48a1b62e0a6565daa54a80f3 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 31 May 2018 11:30:46 +0000 Subject: [PATCH] stack_usage1.adb: Replace -fstack-usage with -Wstack-usage. * gnat.dg/stack_usage1.adb: Replace -fstack-usage with -Wstack-usage. * gnat.dg/stack_usage1b.adb: Likewise. * gnat.dg/stack_usage1c.adb: Likewise. * gnat.dg/stack_usage3.adb: Likewise. * gnat.dg/stack_usage1_pkg.adb: Delete. From-SVN: r261021 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gnat.dg/stack_usage1.adb | 5 +---- gcc/testsuite/gnat.dg/stack_usage1_pkg.adb | 13 ------------- gcc/testsuite/gnat.dg/stack_usage1b.adb | 5 +---- gcc/testsuite/gnat.dg/stack_usage1c.adb | 5 +---- gcc/testsuite/gnat.dg/stack_usage3.adb | 5 +---- 6 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 gcc/testsuite/gnat.dg/stack_usage1_pkg.adb diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 297141ff8d2..a04fff8d188 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-05-31 Eric Botcazou + + * gnat.dg/stack_usage1.adb: Replace -fstack-usage with -Wstack-usage. + * gnat.dg/stack_usage1b.adb: Likewise. + * gnat.dg/stack_usage1c.adb: Likewise. + * gnat.dg/stack_usage3.adb: Likewise. + * gnat.dg/stack_usage1_pkg.adb: Delete. + 2018-05-31 Eric Botcazou * gcc.dg/store_merging_10.c: Turn dg-do compile into dg-do run. diff --git a/gcc/testsuite/gnat.dg/stack_usage1.adb b/gcc/testsuite/gnat.dg/stack_usage1.adb index 81c0a083243..75b1d28c3aa 100644 --- a/gcc/testsuite/gnat.dg/stack_usage1.adb +++ b/gcc/testsuite/gnat.dg/stack_usage1.adb @@ -1,5 +1,5 @@ -- { dg-do compile } --- { dg-options "-fstack-usage" } +-- { dg-options "-Wstack-usage=128" { target i?86-*-* x86_64-*-* } } with Stack_Usage1_Pkg; use Stack_Usage1_Pkg; @@ -34,6 +34,3 @@ begin end case; end Stack_Usage1; - --- { dg-final { scan-stack-usage "\t\[0-9\]\[0-9\]\t" { target i?86-*-* x86_64-*-* } } } --- { dg-final { cleanup-stack-usage } } diff --git a/gcc/testsuite/gnat.dg/stack_usage1_pkg.adb b/gcc/testsuite/gnat.dg/stack_usage1_pkg.adb deleted file mode 100644 index 1538b858fa3..00000000000 --- a/gcc/testsuite/gnat.dg/stack_usage1_pkg.adb +++ /dev/null @@ -1,13 +0,0 @@ -package body Stack_Usage1_Pkg is - - function Ident_Int (X : Integer) return Integer is - begin - return X; - end Ident_Int; - - procedure My_Proc (X : R) is - begin - null; - end My_Proc; - -end Stack_Usage1_Pkg; diff --git a/gcc/testsuite/gnat.dg/stack_usage1b.adb b/gcc/testsuite/gnat.dg/stack_usage1b.adb index 4129c0d34a7..529e93dca8a 100644 --- a/gcc/testsuite/gnat.dg/stack_usage1b.adb +++ b/gcc/testsuite/gnat.dg/stack_usage1b.adb @@ -1,5 +1,5 @@ -- { dg-do compile } --- { dg-options "-O -fstack-usage" } +-- { dg-options "-O -Wstack-usage=128" { target i?86-*-* x86_64-*-* } } with Stack_Usage1_Pkg; use Stack_Usage1_Pkg; @@ -34,6 +34,3 @@ begin end case; end Stack_Usage1b; - --- { dg-final { scan-stack-usage "\t\[0-9\]\[0-9\]\t" { target i?86-*-* x86_64-*-* } } } --- { dg-final { cleanup-stack-usage } } diff --git a/gcc/testsuite/gnat.dg/stack_usage1c.adb b/gcc/testsuite/gnat.dg/stack_usage1c.adb index 41b7a60563a..4afd2dad2e6 100644 --- a/gcc/testsuite/gnat.dg/stack_usage1c.adb +++ b/gcc/testsuite/gnat.dg/stack_usage1c.adb @@ -1,5 +1,5 @@ -- { dg-do compile } --- { dg-options "-O2 -fstack-usage" } +-- { dg-options "-O2 -Wstack-usage=128" { target i?86-*-* x86_64-*-* } } with Stack_Usage1_Pkg; use Stack_Usage1_Pkg; @@ -34,6 +34,3 @@ begin end case; end Stack_Usage1c; - --- { dg-final { scan-stack-usage "\t\[0-9\]\[0-9\]\t" { target i?86-*-* x86_64-*-* } } } --- { dg-final { cleanup-stack-usage } } diff --git a/gcc/testsuite/gnat.dg/stack_usage3.adb b/gcc/testsuite/gnat.dg/stack_usage3.adb index bd7d811612a..2bcd9c5c5c2 100644 --- a/gcc/testsuite/gnat.dg/stack_usage3.adb +++ b/gcc/testsuite/gnat.dg/stack_usage3.adb @@ -1,5 +1,5 @@ -- { dg-do compile } --- { dg-options "-O -fstack-usage" } +-- { dg-options "-O -Wstack-usage=1024" } with Ada.Text_IO; use Ada.Text_IO; with Stack_Usage3_Pkg; use Stack_Usage3_Pkg; @@ -27,6 +27,3 @@ begin Put_Line (Diag ("Diag line 19")); Put_Line (Diag ("Diag line 20")); end; - --- { dg-final { scan-stack-usage-not "\t\[0-9\]\[0-9\]\[0-9\]\[0-9\]\t" } } --- { dg-final { cleanup-stack-usage } } -- 2.30.2