From 071e3c4f2b2b1b76330bc5258b04e8e3b14e9e25 Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Wed, 14 Aug 2013 18:08:22 +0000 Subject: [PATCH] dwarf2.exp: Replace -gdwarf-2 with -gdwarf. * gcc.dg/debug/dwarf2/dwarf2.exp: Replace -gdwarf-2 with -gdwarf. * gcc.dg/debug/dwarf2/dwarf-die7.c: Likewise. * gcc.dg/debug/dwarf2/static1.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-dfp.c: Likewise. * gcc.dg/debug/dwarf2/fesd-any.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-uninit.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-die1.c: Likewise. * gcc.dg/debug/dwarf2/var1.c: Likewise. * gcc.dg/debug/dwarf2/pr29609-2.c: Likewise. * gcc.dg/debug/dwarf2/aranges-fnsec-1.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-die3.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-merge.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-char1.c: Likewise. * gcc.dg/debug/dwarf2/discriminator.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-char2.c: Likewise. * gcc.dg/debug/dwarf2/fesd-baseonly.c: Likewise. * gcc.dg/debug/dwarf2/pr36690-3.c: Likewise. * gcc.dg/debug/dwarf2/const-2.c: Likewise. * gcc.dg/debug/dwarf2/ipa-cp1.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-char3.c: Likewise. * gcc.dg/debug/dwarf2/var2.c: Likewise. * gcc.dg/debug/dwarf2/pr36690-2.c: Likewise. * gcc.dg/debug/dwarf2/pr31230.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-float.c: Likewise. * gcc.dg/debug/dwarf2/short-circuit.c: Likewise. * gcc.dg/debug/dwarf2/pr36690-1.c: Likewise. * gcc.dg/debug/dwarf2/fesd-reduced.c: Likewise. * gcc.dg/debug/dwarf2/pr37616.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-die2.c: Likewise. * gcc.dg/debug/dwarf2/inline1.c: Likewise. * gcc.dg/debug/dwarf2/fesd-sys.c: Likewise. * gcc.dg/debug/dwarf2/pr29609-1.c: Likewise. * gcc.dg/debug/dwarf2/asm-line1.c: Likewise. * gcc.dg/debug/dwarf2/c99-typedef1.c: Likewise. * gcc.dg/debug/dwarf2/dwarf2-macro.c: Likewise. * gcc.dg/debug/dwarf2/fesd-none.c: Likewise. * gcc.dg/debug/dwarf2/pr51410.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-file1.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-die6.c: Likewise. * gcc.dg/debug/dwarf2/const-2b.c: Likewise. * gcc.dg/debug/dwarf2/dwarf-die5.c: Likewise. From-SVN: r201734 --- gcc/testsuite/ChangeLog | 44 +++++++++++++++++++ .../gcc.dg/debug/dwarf2/aranges-fnsec-1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c | 2 +- .../gcc.dg/debug/dwarf2/c99-typedef1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c | 2 +- .../gcc.dg/debug/dwarf2/discriminator.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-char1.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-char2.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-char3.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-dfp.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-die1.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-die2.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-die3.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-die5.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-die6.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-die7.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-file1.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-float.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-merge.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf-uninit.c | 2 +- .../gcc.dg/debug/dwarf2/dwarf2-macro.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp | 4 +- gcc/testsuite/gcc.dg/debug/dwarf2/fesd-any.c | 2 +- .../gcc.dg/debug/dwarf2/fesd-baseonly.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/fesd-none.c | 2 +- .../gcc.dg/debug/dwarf2/fesd-reduced.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/fesd-sys.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/inline1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/ipa-cp1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr31230.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/pr51410.c | 2 +- .../gcc.dg/debug/dwarf2/short-circuit.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/static1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/var1.c | 2 +- gcc/testsuite/gcc.dg/debug/dwarf2/var2.c | 2 +- 42 files changed, 86 insertions(+), 42 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a1936ec1ca1..3b1de7328c5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,47 @@ +2013-08-14 Joern Rennecke + + * gcc.dg/debug/dwarf2/dwarf2.exp: Replace -gdwarf-2 with -gdwarf. + * gcc.dg/debug/dwarf2/dwarf-die7.c: Likewise. + * gcc.dg/debug/dwarf2/static1.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-dfp.c: Likewise. + * gcc.dg/debug/dwarf2/fesd-any.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-uninit.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-die1.c: Likewise. + * gcc.dg/debug/dwarf2/var1.c: Likewise. + * gcc.dg/debug/dwarf2/pr29609-2.c: Likewise. + * gcc.dg/debug/dwarf2/aranges-fnsec-1.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-die3.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-merge.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-char1.c: Likewise. + * gcc.dg/debug/dwarf2/discriminator.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-char2.c: Likewise. + * gcc.dg/debug/dwarf2/fesd-baseonly.c: Likewise. + * gcc.dg/debug/dwarf2/pr36690-3.c: Likewise. + * gcc.dg/debug/dwarf2/const-2.c: Likewise. + * gcc.dg/debug/dwarf2/ipa-cp1.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-char3.c: Likewise. + * gcc.dg/debug/dwarf2/var2.c: Likewise. + * gcc.dg/debug/dwarf2/pr36690-2.c: Likewise. + * gcc.dg/debug/dwarf2/pr31230.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-float.c: Likewise. + * gcc.dg/debug/dwarf2/short-circuit.c: Likewise. + * gcc.dg/debug/dwarf2/pr36690-1.c: Likewise. + * gcc.dg/debug/dwarf2/fesd-reduced.c: Likewise. + * gcc.dg/debug/dwarf2/pr37616.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-die2.c: Likewise. + * gcc.dg/debug/dwarf2/inline1.c: Likewise. + * gcc.dg/debug/dwarf2/fesd-sys.c: Likewise. + * gcc.dg/debug/dwarf2/pr29609-1.c: Likewise. + * gcc.dg/debug/dwarf2/asm-line1.c: Likewise. + * gcc.dg/debug/dwarf2/c99-typedef1.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf2-macro.c: Likewise. + * gcc.dg/debug/dwarf2/fesd-none.c: Likewise. + * gcc.dg/debug/dwarf2/pr51410.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-file1.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-die6.c: Likewise. + * gcc.dg/debug/dwarf2/const-2b.c: Likewise. + * gcc.dg/debug/dwarf2/dwarf-die5.c: Likewise. + 2013-08-14 Janis Johnson * gcc.target/arm/pr19599.c: Skip for -mthumb. diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/aranges-fnsec-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/aranges-fnsec-1.c index 8a97e4dc2ac..4e40aea4ea7 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/aranges-fnsec-1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/aranges-fnsec-1.c @@ -3,7 +3,7 @@ /* Origin: Joseph Myers */ /* { dg-do compile } */ /* { dg-require-effective-target function_sections } */ -/* { dg-options "-gdwarf-2 -ffunction-sections -w -dA" } */ +/* { dg-options "-gdwarf -ffunction-sections -w -dA" } */ /* { dg-final { scan-assembler-not "\\.Letext0-\\.Ltext0" } } */ /* { dg-final { scan-assembler-not "\\.Ltext0\[^\n\r\]*Offset 0x0" } } */ /* { dg-final { scan-assembler "DW_AT_ranges" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c index f94dfce93ea..3773e1c83c3 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c @@ -1,6 +1,6 @@ /* PR debug/50983 */ /* { dg-do compile { target *-*-gnu* } } */ -/* { dg-options "-O0 -gdwarf-2" } */ +/* { dg-options "-O0 -gdwarf" } */ /* { dg-final { scan-assembler "is_stmt 1" } } */ int i; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/c99-typedef1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/c99-typedef1.c index b7bd66a6023..c1ca1ebb6a2 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/c99-typedef1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/c99-typedef1.c @@ -1,4 +1,4 @@ -// { dg-options "-std=iso9899:1999 -gdwarf-2" } +// { dg-options "-std=iso9899:1999 -gdwarf" } void f() { int n = 3; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c index 16e1d8bd140..b139122fdeb 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c @@ -1,5 +1,5 @@ /* { dg-do compile { target powerpc_altivec_ok } } */ -/* { dg-options "-O -gdwarf-2 -dA -maltivec" } */ +/* { dg-options "-O -gdwarf -dA -maltivec" } */ /* { dg-final { scan-assembler "DW_AT_const_value" } } */ typedef float FloatVect __attribute__((__vector_size__(16))); diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c b/gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c index 6cbdc85b3d5..e7d199d1c4e 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/const-2b.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i386*-*-* } } */ -/* { dg-options "-O -gdwarf-2 -dA -msse" } */ +/* { dg-options "-O -gdwarf -dA -msse" } */ /* { dg-require-effective-target sse } */ /* { dg-final { scan-assembler "DW_AT_const_value" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/discriminator.c b/gcc/testsuite/gcc.dg/debug/dwarf2/discriminator.c index 5eef4ab95fe..b77f7b1bfff 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/discriminator.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/discriminator.c @@ -1,7 +1,7 @@ /* HAVE_AS_DWARF2_DEBUG_LINE macro needs to be defined to pass the unittest. However, dg cannot access it, so we restrict to GNU targets. */ /* { dg-do compile { target *-*-gnu* } } */ -/* { dg-options "-O0 -gdwarf-2" } */ +/* { dg-options "-O0 -gdwarf" } */ /* { dg-final { scan-assembler "loc \[0-9] 11 \[0-9]( is_stmt \[0-9])?\n" } } */ /* { dg-final { scan-assembler "loc \[0-9] 11 \[0-9]( is_stmt \[0-9])? discriminator 2\n" } } */ /* { dg-final { scan-assembler "loc \[0-9] 11 \[0-9]( is_stmt \[0-9])? discriminator 1\n" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char1.c index ed32349b4de..23f9596732f 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char1.c @@ -1,6 +1,6 @@ /* PR debug/7241 */ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ /* { dg-final { scan-assembler "0x\[68\]\[ \t\]+\[#@;!/|\]+\[ \t\]+DW_AT_encoding" } } */ /* { dg-final { scan-assembler-not "0x\[57\]\[ \t\]+\[#@;!/|\]+\[ \t\]+DW_AT_encoding" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char2.c index dc145852fcd..4a4bd438ce7 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char2.c @@ -1,6 +1,6 @@ /* PR debug/7241 */ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ /* { dg-final { scan-assembler "0x\[68\]\[ \t\]+\[#@;!/|\]+\[ \t\]+DW_AT_encoding" } } */ /* { dg-final { scan-assembler-not "0x\[57\]\[ \t\]+\[#@;!/|\]+\[ \t\]+DW_AT_encoding" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char3.c index edc1d83ed4f..4ff201f1345 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char3.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-char3.c @@ -1,6 +1,6 @@ /* PR debug/7241 */ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ /* { dg-final { scan-assembler "0x\[68\]\[ \t\]+\[#@;!/|\]+\[ \t\]+DW_AT_encoding" } } */ /* { dg-final { scan-assembler-not "0x\[57\]\[ \t\]+\[#@;!/|\]+\[ \t\]+DW_AT_encoding" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-dfp.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-dfp.c index ddb602250ce..951380f125f 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-dfp.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-dfp.c @@ -2,7 +2,7 @@ /* { dg-do compile */ /* { dg-require-effective-target dfp } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ /* { dg-final { scan-assembler "0x10.*DW_AT_encoding" } } */ /* { dg-final { scan-assembler "0x4.*DW_AT_byte_size" } } */ /* { dg-final { scan-assembler "0x8.*DW_AT_byte_size" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die1.c index fdfbf83215e..9ca84e757b0 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die1.c @@ -1,6 +1,6 @@ /* Verify that inline function never actually inlined has no abstract DIE. */ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-final { scan-assembler-not "DW_AT_inline" } } */ inline int t() { diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die2.c index ac897ab78c1..746ab031b83 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die2.c @@ -1,6 +1,6 @@ /* Verify that inline function never actually emit has no DIE. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ /* { dg-final { scan-assembler-not "CIE Version" } } */ static inline int t() { diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die3.c index 04b2f36c3b3..2b071fc9ed0 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die3.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die3.c @@ -1,6 +1,6 @@ /* Verify that extern inline function never actually inlined has no abstract DIE. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ /* { dg-final { scan-assembler-not "DW_AT_inline" } } */ extern inline int t() { diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die5.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die5.c index 3fefd41ef94..68985b71fab 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die5.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die5.c @@ -1,6 +1,6 @@ /* Inlined inline function must have abstract DIE */ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA -fpreprocessed" } */ +/* { dg-options "-O2 -gdwarf -dA -fpreprocessed" } */ /* { dg-final { scan-assembler "3.*DW_AT_inline" } } */ #1 "test.h" inline int t() diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die6.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die6.c index d8f477f54e8..ff0d6798df2 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die6.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die6.c @@ -1,6 +1,6 @@ /* not inline inline function must not have abstract DIE */ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-inline -gdwarf-2 -dA -fpreprocessed" } */ +/* { dg-options "-O2 -fno-inline -gdwarf -dA -fpreprocessed" } */ /* { dg-final { scan-assembler-not "DW_AT_inline" } } */ #1 "test.h" inline int t() diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die7.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die7.c index b747076bac6..88d78e23358 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die7.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-die7.c @@ -1,6 +1,6 @@ /* Inlined non-inline function must have abstract DIE */ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA -fpreprocessed" } */ +/* { dg-options "-O2 -gdwarf -dA -fpreprocessed" } */ /* { dg-final { scan-assembler "1.*DW_AT_inline" } } */ #1 "test.h" void f(void); diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-file1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-file1.c index c68dfe436e3..b75395557bf 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-file1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-file1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-final { scan-assembler "File Entry:|.file" } } */ /* Verify that a file entry is output for this file. Only systems that do not define HAVE_AS_DWARF2_DEBUG_LINE will put out "File Entry:", diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-float.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-float.c index 84d605fcd03..a028d1484af 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-float.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-float.c @@ -1,7 +1,7 @@ /* Verify the DWARF encoding of C99 floating point types. */ /* { dg-do compile */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ /* { dg-final { scan-assembler "0x4.*DW_AT_encoding" } } */ /* { dg-final { scan-assembler "0x4.*DW_AT_byte_size" } } */ /* { dg-final { scan-assembler "0x8.*DW_AT_byte_size" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-merge.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-merge.c index 767d38b173b..15e09b116cc 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-merge.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-merge.c @@ -1,7 +1,7 @@ /* Verify that mergeable strings are used in the CU DIE. */ /* { dg-do compile } */ /* { dg-require-effective-target string_merging } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-final { scan-assembler "DW_AT_producer: \"GNU C" } } */ /* { dg-final { scan-assembler-not "GNU C\[^\\n\\r\]*DW_AT_producer" } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-uninit.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-uninit.c index 7bcebe355e5..d871bab0c2e 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-uninit.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf-uninit.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-final { scan-assembler "DW_TAG_variable" } } */ /* PR debug/21828 */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c index 4efb25e8c22..fd61296b2f1 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2-macro.c @@ -1,6 +1,6 @@ /* Test to make sure the mcaro info includes a start file command for the main source */ /* { dg-do compile } */ -/* { dg-options "-g3 -gdwarf-2 -dA -fverbose-asm" } */ +/* { dg-options "-g3 -gdwarf -dA -fverbose-asm" } */ /* { dg-final { scan-assembler "Start new file" } } */ #define ADD(x) (M + x) diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp index 829840c2052..824d9947f09 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp @@ -22,7 +22,7 @@ load_lib gcc-dg.exp # If a testcase doesn't have special options, use these. global DEFAULT_CFLAGS if ![info exists DEFAULT_CFLAGS] then { - set DEFAULT_CFLAGS " -ansi -pedantic-errors -gdwarf-2" + set DEFAULT_CFLAGS " -ansi -pedantic-errors -gdwarf" } # Initialize `dg'. @@ -31,7 +31,7 @@ dg-init # Main loop. set comp_output [gcc_target_compile \ "$srcdir/$subdir/../trivial.c" "trivial.S" assembly \ - "additional_flags=-gdwarf-2"] + "additional_flags=-gdwarf"] if { ! [string match "*: target system does not support the * debug format*" \ $comp_output] } { remove-build-file "trivial.S" diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-any.c b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-any.c index fc510903c2c..810788ae6e3 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-any.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-any.c @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-gdwarf-2 -dA -femit-struct-debug-detailed=any" } +// { dg-options "-gdwarf -dA -femit-struct-debug-detailed=any" } // { dg-final { scan-assembler "timespec.*DW_AT_name" } } // { dg-final { scan-assembler "tv_sec.*DW_AT_name" } } // { dg-final { scan-assembler "tv_nsec.*DW_AT_name" } } diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-baseonly.c b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-baseonly.c index a32abb5a2e2..aefcb871509 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-baseonly.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-baseonly.c @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-gdwarf-2 -dA -femit-struct-debug-baseonly" } +// { dg-options "-gdwarf -dA -femit-struct-debug-baseonly" } // { dg-final { scan-assembler "timespec.*DW_AT_name" } } // { dg-final { scan-assembler-not "tv_sec.*DW_AT_name" } } // { dg-final { scan-assembler-not "tv_nsec.*DW_AT_name" } } diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-none.c b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-none.c index bd218f82615..193c05d6155 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-none.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-none.c @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-gdwarf-2 -dA -femit-struct-debug-detailed=none" } +// { dg-options "-gdwarf -dA -femit-struct-debug-detailed=none" } // { dg-final { scan-assembler "timespec.*DW_AT_name" } } // { dg-final { scan-assembler-not "tv_sec.*DW_AT_name" } } // { dg-final { scan-assembler-not "tv_nsec.*DW_AT_name" } } diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-reduced.c b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-reduced.c index ac599f43fbf..ebbfc36672b 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-reduced.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-reduced.c @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-gdwarf-2 -dA -femit-struct-debug-reduced" } +// { dg-options "-gdwarf -dA -femit-struct-debug-reduced" } // { dg-final { scan-assembler "timespec.*DW_AT_name" } } // { dg-final { scan-assembler "tv_sec.*DW_AT_name" } } // { dg-final { scan-assembler "tv_nsec.*DW_AT_name" } } diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-sys.c b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-sys.c index 3a5c0bf1463..ad0a44a95b3 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-sys.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/fesd-sys.c @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-gdwarf-2 -dA -femit-struct-debug-detailed=sys" } +// { dg-options "-gdwarf -dA -femit-struct-debug-detailed=sys" } // { dg-final { scan-assembler "timespec.*DW_AT_name" } } // { dg-final { scan-assembler "tv_sec.*DW_AT_name" } } // { dg-final { scan-assembler "tv_nsec.*DW_AT_name" } } diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/inline1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/inline1.c index 11c8fad7841..bd7f7b986b3 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/inline1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/inline1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ void e(int); __attribute__ ((always_inline)) inline int t(int function_parameter) diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/ipa-cp1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/ipa-cp1.c index 7442dab19f9..395c5441859 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/ipa-cp1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/ipa-cp1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ void q(int p); static void t(int constant_propagated_par) diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c index 5476aac0afd..e818263a51d 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-1.c @@ -1,7 +1,7 @@ /* PR debug/29609 */ /* Verify that breakpoint on the break is hit. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ void abort (void); diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c index 43bc54524a9..463d3cc588f 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr29609-2.c @@ -1,7 +1,7 @@ /* PR debug/29609 */ /* Verify that breakpoint on both goto failure; stmts is hit. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ extern void abort (void); int x; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr31230.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr31230.c index ce26ec639c3..36d55bf30fd 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr31230.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr31230.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-gdwarf-2 -dA --param ggc-min-expand=0 --param ggc-min-heapsize=0" } */ +/* { dg-options "-gdwarf -dA --param ggc-min-expand=0 --param ggc-min-heapsize=0" } */ /* { dg-final { scan-assembler-times "DIE.*DW_TAG_array_type" 1 } } */ /* { dg-final { scan-assembler-times "DIE.*DW_TAG_subrange_type" 1 } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c index de90acb81bf..d84ce26cae9 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-1.c @@ -1,7 +1,7 @@ /* PR debug/36690 */ /* Verify that break func is hit. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ int i; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c index 2330f53858e..0927e7465b3 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-2.c @@ -3,7 +3,7 @@ varz at that spot is defined and contains 5. Nowhere else in the function should be varz in the scope. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ int cnt; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c index 234ad1263b2..bc492f2c14a 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr36690-3.c @@ -1,6 +1,6 @@ /* PR debug/36690 */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ int cnt; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c index badff447a8b..016dbc94806 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr37616.c @@ -2,7 +2,7 @@ /* Test that one can put breakpoints onto continue, exitlab and break and actually see program reaching those breakpoints. */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr51410.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr51410.c index 957c152b4a0..62b389ee935 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr51410.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr51410.c @@ -1,6 +1,6 @@ /* PR debug/51410 */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA -fno-merge-debug-strings" } */ +/* { dg-options "-O0 -gdwarf -dA -fno-merge-debug-strings" } */ int x; diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/short-circuit.c b/gcc/testsuite/gcc.dg/debug/dwarf2/short-circuit.c index 7e745ff19d2..4fa199c0c18 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/short-circuit.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/short-circuit.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ #define True 1 #define False 0 diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/static1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/static1.c index b9b5d0b3743..bdc118ddcec 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/static1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/static1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2" } */ +/* { dg-options "-O2 -gdwarf" } */ void main(void) { diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/var1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/var1.c index 04dd1297694..297d244e2cc 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/var1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/var1.c @@ -1,6 +1,6 @@ /* PR 23190 */ /* { dg-do compile } -/* { dg-options "-gdwarf-2 -dA -fno-merge-debug-strings" } */ +/* { dg-options "-gdwarf -dA -fno-merge-debug-strings" } */ /* { dg-final { scan-assembler "xyzzy\[^\\n\\r\]+DW_AT_name" } } */ void f(void) diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/var2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/var2.c index 8ef2a74388c..72aef418098 100644 --- a/gcc/testsuite/gcc.dg/debug/dwarf2/var2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/var2.c @@ -1,6 +1,6 @@ /* PR 23190 */ /* { dg-do compile } -/* { dg-options "-O2 -gdwarf-2 -dA" } */ +/* { dg-options "-O2 -gdwarf -dA" } */ /* { dg-final { scan-assembler "DW_OP_addr\[\\n\\r\]+\[^\\n\\r\]+foo" } } */ /* { dg-final { scan-assembler "DW_OP_addr\[\\n\\r\]+\[^\\n\\r\]+bar" } } */