| Message ID | 20130722054046.3qdmygop44gcg8gk-nzlynne@webmail.spamcop.net |
|---|---|
| State | New |
| Headers | show |
Ok. On Jul 22, 2013, at 2:40 AM, Joern Rennecke <joern.rennecke@embecosm.com> wrote: > Quoting Jakub Jelinek <jakub@redhat.com>: > >> On Mon, Jul 22, 2013 at 10:31:03AM +0530, Senthil Kumar Selvaraj wrote: > .. >>> I ran into this problem a while ago, and after discussion on the >>> mailing list, added a -gdwarf option to emit DWARF with the default >>> version (http://gcc.gnu.org/ml/gcc-patches/2013-04/msg00592.html). Might >>> be better than hardcoding dwarf-2 IMO. >> >> Yeah, definitely. >> >> Jakub > > All right, then we should start by changing the existing -gdwarf-2 options in > the gcc.dg/debug/dwarf2 directory to -gdwarf. > > Tested on i686-pc-linux-gnu . > > 2013-07-22 Joern Rennecke <joern.rennecke@embecosm.com> > > * 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. > > Index: gcc.dg/debug/dwarf2/dwarf2.exp > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf2.exp (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf2.exp (working copy) > @@ -22,7 +22,7 @@ > # 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 @@ > # 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" > Index: gcc.dg/debug/dwarf2/dwarf-die7.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-die7.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-die7.c (working copy) > @@ -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); > Index: gcc.dg/debug/dwarf2/static1.c > =================================================================== > --- gcc.dg/debug/dwarf2/static1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/static1.c (working copy) > @@ -1,5 +1,5 @@ > /* { dg-do compile } */ > -/* { dg-options "-O2 -gdwarf-2" } */ > +/* { dg-options "-O2 -gdwarf" } */ > void > main(void) > { > Index: gcc.dg/debug/dwarf2/dwarf-dfp.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-dfp.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-dfp.c (working copy) > @@ -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" } } */ > Index: gcc.dg/debug/dwarf2/fesd-any.c > =================================================================== > --- gcc.dg/debug/dwarf2/fesd-any.c (revision 201032) > +++ gcc.dg/debug/dwarf2/fesd-any.c (working copy) > @@ -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" } } > Index: gcc.dg/debug/dwarf2/dwarf-uninit.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-uninit.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-uninit.c (working copy) > @@ -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 */ > > Index: gcc.dg/debug/dwarf2/dwarf-die1.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-die1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-die1.c (working copy) > @@ -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() > { > Index: gcc.dg/debug/dwarf2/var1.c > =================================================================== > --- gcc.dg/debug/dwarf2/var1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/var1.c (working copy) > @@ -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) > Index: gcc.dg/debug/dwarf2/pr29609-2.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr29609-2.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr29609-2.c (working copy) > @@ -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; > Index: gcc.dg/debug/dwarf2/aranges-fnsec-1.c > =================================================================== > --- gcc.dg/debug/dwarf2/aranges-fnsec-1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/aranges-fnsec-1.c (working copy) > @@ -3,7 +3,7 @@ > /* Origin: Joseph Myers <joseph@codesourcery.com> */ > /* { 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" } } */ > Index: gcc.dg/debug/dwarf2/dwarf-die3.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-die3.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-die3.c (working copy) > @@ -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() > { > Index: gcc.dg/debug/dwarf2/dwarf-merge.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-merge.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-merge.c (working copy) > @@ -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" } } */ > > Index: gcc.dg/debug/dwarf2/dwarf-char1.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-char1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-char1.c (working copy) > @@ -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" } } */ > Index: gcc.dg/debug/dwarf2/discriminator.c > =================================================================== > --- gcc.dg/debug/dwarf2/discriminator.c (revision 201032) > +++ gcc.dg/debug/dwarf2/discriminator.c (working copy) > @@ -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" } } */ > Index: gcc.dg/debug/dwarf2/dwarf-char2.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-char2.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-char2.c (working copy) > @@ -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" } } */ > Index: gcc.dg/debug/dwarf2/fesd-baseonly.c > =================================================================== > --- gcc.dg/debug/dwarf2/fesd-baseonly.c (revision 201032) > +++ gcc.dg/debug/dwarf2/fesd-baseonly.c (working copy) > @@ -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" } } > Index: gcc.dg/debug/dwarf2/pr36690-3.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr36690-3.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr36690-3.c (working copy) > @@ -1,6 +1,6 @@ > /* PR debug/36690 */ > /* { dg-do compile } */ > -/* { dg-options "-O0 -gdwarf-2 -dA" } */ > +/* { dg-options "-O0 -gdwarf -dA" } */ > > int cnt; > > Index: gcc.dg/debug/dwarf2/const-2.c > =================================================================== > --- gcc.dg/debug/dwarf2/const-2.c (revision 201032) > +++ gcc.dg/debug/dwarf2/const-2.c (working copy) > @@ -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))); > Index: gcc.dg/debug/dwarf2/ipa-cp1.c > =================================================================== > --- gcc.dg/debug/dwarf2/ipa-cp1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/ipa-cp1.c (working copy) > @@ -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) > Index: gcc.dg/debug/dwarf2/dwarf-char3.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-char3.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-char3.c (working copy) > @@ -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" } } */ > Index: gcc.dg/debug/dwarf2/var2.c > =================================================================== > --- gcc.dg/debug/dwarf2/var2.c (revision 201032) > +++ gcc.dg/debug/dwarf2/var2.c (working copy) > @@ -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" } } */ > > Index: gcc.dg/debug/dwarf2/pr36690-2.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr36690-2.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr36690-2.c (working copy) > @@ -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; > > Index: gcc.dg/debug/dwarf2/pr31230.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr31230.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr31230.c (working copy) > @@ -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 } } */ > > Index: gcc.dg/debug/dwarf2/dwarf-float.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-float.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-float.c (working copy) > @@ -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" } } */ > Index: gcc.dg/debug/dwarf2/short-circuit.c > =================================================================== > --- gcc.dg/debug/dwarf2/short-circuit.c (revision 201032) > +++ gcc.dg/debug/dwarf2/short-circuit.c (working copy) > @@ -1,5 +1,5 @@ > /* { dg-do compile } */ > -/* { dg-options "-O0 -gdwarf-2 -dA" } */ > +/* { dg-options "-O0 -gdwarf -dA" } */ > > #define True 1 > #define False 0 > Index: gcc.dg/debug/dwarf2/pr36690-1.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr36690-1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr36690-1.c (working copy) > @@ -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; > > Index: gcc.dg/debug/dwarf2/fesd-reduced.c > =================================================================== > --- gcc.dg/debug/dwarf2/fesd-reduced.c (revision 201032) > +++ gcc.dg/debug/dwarf2/fesd-reduced.c (working copy) > @@ -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" } } > Index: gcc.dg/debug/dwarf2/pr37616.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr37616.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr37616.c (working copy) > @@ -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); > > Index: gcc.dg/debug/dwarf2/dwarf-die2.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-die2.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-die2.c (working copy) > @@ -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() > { > Index: gcc.dg/debug/dwarf2/inline1.c > =================================================================== > --- gcc.dg/debug/dwarf2/inline1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/inline1.c (working copy) > @@ -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) > Index: gcc.dg/debug/dwarf2/fesd-sys.c > =================================================================== > --- gcc.dg/debug/dwarf2/fesd-sys.c (revision 201032) > +++ gcc.dg/debug/dwarf2/fesd-sys.c (working copy) > @@ -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" } } > Index: gcc.dg/debug/dwarf2/pr29609-1.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr29609-1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr29609-1.c (working copy) > @@ -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); > > Index: gcc.dg/debug/dwarf2/asm-line1.c > =================================================================== > --- gcc.dg/debug/dwarf2/asm-line1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/asm-line1.c (working copy) > @@ -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; > Index: gcc.dg/debug/dwarf2/c99-typedef1.c > =================================================================== > --- gcc.dg/debug/dwarf2/c99-typedef1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/c99-typedef1.c (working copy) > @@ -1,4 +1,4 @@ > -// { dg-options "-std=iso9899:1999 -gdwarf-2" } > +// { dg-options "-std=iso9899:1999 -gdwarf" } > > void f() { > int n = 3; > Index: gcc.dg/debug/dwarf2/dwarf2-macro.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf2-macro.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf2-macro.c (working copy) > @@ -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) > Index: gcc.dg/debug/dwarf2/fesd-none.c > =================================================================== > --- gcc.dg/debug/dwarf2/fesd-none.c (revision 201032) > +++ gcc.dg/debug/dwarf2/fesd-none.c (working copy) > @@ -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" } } > Index: gcc.dg/debug/dwarf2/pr51410.c > =================================================================== > --- gcc.dg/debug/dwarf2/pr51410.c (revision 201032) > +++ gcc.dg/debug/dwarf2/pr51410.c (working copy) > @@ -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; > > Index: gcc.dg/debug/dwarf2/dwarf-file1.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-file1.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-file1.c (working copy) > @@ -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:", > Index: gcc.dg/debug/dwarf2/dwarf-die6.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-die6.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-die6.c (working copy) > @@ -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() > Index: gcc.dg/debug/dwarf2/const-2b.c > =================================================================== > --- gcc.dg/debug/dwarf2/const-2b.c (revision 201032) > +++ gcc.dg/debug/dwarf2/const-2b.c (working copy) > @@ -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" } } */ > > Index: gcc.dg/debug/dwarf2/dwarf-die5.c > =================================================================== > --- gcc.dg/debug/dwarf2/dwarf-die5.c (revision 201032) > +++ gcc.dg/debug/dwarf2/dwarf-die5.c (working copy) > @@ -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()
Index: gcc.dg/debug/dwarf2/dwarf2.exp =================================================================== --- gcc.dg/debug/dwarf2/dwarf2.exp (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf2.exp (working copy) @@ -22,7 +22,7 @@ # 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 @@ # 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" Index: gcc.dg/debug/dwarf2/dwarf-die7.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-die7.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-die7.c (working copy) @@ -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); Index: gcc.dg/debug/dwarf2/static1.c =================================================================== --- gcc.dg/debug/dwarf2/static1.c (revision 201032) +++ gcc.dg/debug/dwarf2/static1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -gdwarf-2" } */ +/* { dg-options "-O2 -gdwarf" } */ void main(void) { Index: gcc.dg/debug/dwarf2/dwarf-dfp.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-dfp.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-dfp.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/fesd-any.c =================================================================== --- gcc.dg/debug/dwarf2/fesd-any.c (revision 201032) +++ gcc.dg/debug/dwarf2/fesd-any.c (working copy) @@ -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" } } Index: gcc.dg/debug/dwarf2/dwarf-uninit.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-uninit.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-uninit.c (working copy) @@ -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 */ Index: gcc.dg/debug/dwarf2/dwarf-die1.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-die1.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-die1.c (working copy) @@ -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() { Index: gcc.dg/debug/dwarf2/var1.c =================================================================== --- gcc.dg/debug/dwarf2/var1.c (revision 201032) +++ gcc.dg/debug/dwarf2/var1.c (working copy) @@ -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) Index: gcc.dg/debug/dwarf2/pr29609-2.c =================================================================== --- gcc.dg/debug/dwarf2/pr29609-2.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr29609-2.c (working copy) @@ -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; Index: gcc.dg/debug/dwarf2/aranges-fnsec-1.c =================================================================== --- gcc.dg/debug/dwarf2/aranges-fnsec-1.c (revision 201032) +++ gcc.dg/debug/dwarf2/aranges-fnsec-1.c (working copy) @@ -3,7 +3,7 @@ /* Origin: Joseph Myers <joseph@codesourcery.com> */ /* { 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" } } */ Index: gcc.dg/debug/dwarf2/dwarf-die3.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-die3.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-die3.c (working copy) @@ -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() { Index: gcc.dg/debug/dwarf2/dwarf-merge.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-merge.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-merge.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/dwarf-char1.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-char1.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-char1.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/discriminator.c =================================================================== --- gcc.dg/debug/dwarf2/discriminator.c (revision 201032) +++ gcc.dg/debug/dwarf2/discriminator.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/dwarf-char2.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-char2.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-char2.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/fesd-baseonly.c =================================================================== --- gcc.dg/debug/dwarf2/fesd-baseonly.c (revision 201032) +++ gcc.dg/debug/dwarf2/fesd-baseonly.c (working copy) @@ -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" } } Index: gcc.dg/debug/dwarf2/pr36690-3.c =================================================================== --- gcc.dg/debug/dwarf2/pr36690-3.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr36690-3.c (working copy) @@ -1,6 +1,6 @@ /* PR debug/36690 */ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ int cnt; Index: gcc.dg/debug/dwarf2/const-2.c =================================================================== --- gcc.dg/debug/dwarf2/const-2.c (revision 201032) +++ gcc.dg/debug/dwarf2/const-2.c (working copy) @@ -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))); Index: gcc.dg/debug/dwarf2/ipa-cp1.c =================================================================== --- gcc.dg/debug/dwarf2/ipa-cp1.c (revision 201032) +++ gcc.dg/debug/dwarf2/ipa-cp1.c (working copy) @@ -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) Index: gcc.dg/debug/dwarf2/dwarf-char3.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-char3.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-char3.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/var2.c =================================================================== --- gcc.dg/debug/dwarf2/var2.c (revision 201032) +++ gcc.dg/debug/dwarf2/var2.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/pr36690-2.c =================================================================== --- gcc.dg/debug/dwarf2/pr36690-2.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr36690-2.c (working copy) @@ -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; Index: gcc.dg/debug/dwarf2/pr31230.c =================================================================== --- gcc.dg/debug/dwarf2/pr31230.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr31230.c (working copy) @@ -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 } } */ Index: gcc.dg/debug/dwarf2/dwarf-float.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-float.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-float.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/short-circuit.c =================================================================== --- gcc.dg/debug/dwarf2/short-circuit.c (revision 201032) +++ gcc.dg/debug/dwarf2/short-circuit.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O0 -gdwarf-2 -dA" } */ +/* { dg-options "-O0 -gdwarf -dA" } */ #define True 1 #define False 0 Index: gcc.dg/debug/dwarf2/pr36690-1.c =================================================================== --- gcc.dg/debug/dwarf2/pr36690-1.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr36690-1.c (working copy) @@ -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; Index: gcc.dg/debug/dwarf2/fesd-reduced.c =================================================================== --- gcc.dg/debug/dwarf2/fesd-reduced.c (revision 201032) +++ gcc.dg/debug/dwarf2/fesd-reduced.c (working copy) @@ -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" } } Index: gcc.dg/debug/dwarf2/pr37616.c =================================================================== --- gcc.dg/debug/dwarf2/pr37616.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr37616.c (working copy) @@ -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); Index: gcc.dg/debug/dwarf2/dwarf-die2.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-die2.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-die2.c (working copy) @@ -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() { Index: gcc.dg/debug/dwarf2/inline1.c =================================================================== --- gcc.dg/debug/dwarf2/inline1.c (revision 201032) +++ gcc.dg/debug/dwarf2/inline1.c (working copy) @@ -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) Index: gcc.dg/debug/dwarf2/fesd-sys.c =================================================================== --- gcc.dg/debug/dwarf2/fesd-sys.c (revision 201032) +++ gcc.dg/debug/dwarf2/fesd-sys.c (working copy) @@ -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" } } Index: gcc.dg/debug/dwarf2/pr29609-1.c =================================================================== --- gcc.dg/debug/dwarf2/pr29609-1.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr29609-1.c (working copy) @@ -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); Index: gcc.dg/debug/dwarf2/asm-line1.c =================================================================== --- gcc.dg/debug/dwarf2/asm-line1.c (revision 201032) +++ gcc.dg/debug/dwarf2/asm-line1.c (working copy) @@ -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; Index: gcc.dg/debug/dwarf2/c99-typedef1.c =================================================================== --- gcc.dg/debug/dwarf2/c99-typedef1.c (revision 201032) +++ gcc.dg/debug/dwarf2/c99-typedef1.c (working copy) @@ -1,4 +1,4 @@ -// { dg-options "-std=iso9899:1999 -gdwarf-2" } +// { dg-options "-std=iso9899:1999 -gdwarf" } void f() { int n = 3; Index: gcc.dg/debug/dwarf2/dwarf2-macro.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf2-macro.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf2-macro.c (working copy) @@ -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) Index: gcc.dg/debug/dwarf2/fesd-none.c =================================================================== --- gcc.dg/debug/dwarf2/fesd-none.c (revision 201032) +++ gcc.dg/debug/dwarf2/fesd-none.c (working copy) @@ -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" } } Index: gcc.dg/debug/dwarf2/pr51410.c =================================================================== --- gcc.dg/debug/dwarf2/pr51410.c (revision 201032) +++ gcc.dg/debug/dwarf2/pr51410.c (working copy) @@ -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; Index: gcc.dg/debug/dwarf2/dwarf-file1.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-file1.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-file1.c (working copy) @@ -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:", Index: gcc.dg/debug/dwarf2/dwarf-die6.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-die6.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-die6.c (working copy) @@ -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() Index: gcc.dg/debug/dwarf2/const-2b.c =================================================================== --- gcc.dg/debug/dwarf2/const-2b.c (revision 201032) +++ gcc.dg/debug/dwarf2/const-2b.c (working copy) @@ -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" } } */ Index: gcc.dg/debug/dwarf2/dwarf-die5.c =================================================================== --- gcc.dg/debug/dwarf2/dwarf-die5.c (revision 201032) +++ gcc.dg/debug/dwarf2/dwarf-die5.c (working copy) @@ -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()