Index: gcc.dg/debug/dwarf2/global-used-types.c
===================================================================
--- gcc.dg/debug/dwarf2/global-used-types.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/global-used-types.c	(working copy)
@@ -1,6 +1,6 @@
 /*
  Contributed by Dodji Seketeli <dodji@redhat.com>
- { dg-options "-g -dA -fno-merge-debug-strings" }
+ { dg-options "-gdwarf-2 -dA -fno-merge-debug-strings" }
  { dg-do compile }
  { dg-final { scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_enumeration_type" 1 } }
  { dg-final { scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_enumerator" 2 } }
Index: gcc.dg/debug/dwarf2/inline2.c
===================================================================
--- gcc.dg/debug/dwarf2/inline2.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/inline2.c	(working copy)
@@ -14,7 +14,7 @@
   properly nested DW_TAG_inlined_subroutine DIEs for third, second and first.
 */
 
-/* { dg-options "-O -g3 -dA" } */
+/* { dg-options "-O -g3 -gdwarf-2 -dA" } */
 /* { dg-do compile } */
 
 /* There are 6 inlined subroutines:
Index: gcc.dg/debug/dwarf2/inline3.c
===================================================================
--- gcc.dg/debug/dwarf2/inline3.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/inline3.c	(working copy)
@@ -1,7 +1,7 @@
 /* Verify that only one DW_AT_const_value is emitted for baz,
    not for baz abstract DIE and again inside of
    DW_TAG_inlined_subroutine.  */
-/* { dg-options "-O2 -g -dA -fmerge-all-constants" } */
+/* { dg-options "-O2 -gdwarf-2 -dA -fmerge-all-constants" } */
 /* { dg-do compile } */
 /* { dg-final { scan-assembler-times " DW_AT_const_value" 1 } } */
 
Index: gcc.dg/debug/dwarf2/pr37726.c
===================================================================
--- gcc.dg/debug/dwarf2/pr37726.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr37726.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR debug/37726 */
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 int foo (int parm)
 {
Index: gcc.dg/debug/dwarf2/pr41445-1.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41445-1.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41445-1.c	(working copy)
@@ -2,7 +2,7 @@
 /* Test that token after multi-line function-like macro use
    gets correct locus even when preprocessing separately.  */
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-save-temps -gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #define A(a,b)
 int varh;A(1,
Index: gcc.dg/debug/dwarf2/pr41445-2.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41445-2.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41445-2.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR preprocessor/41445 */
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #include "pr41445-1.c"
 
Index: gcc.dg/debug/dwarf2/pr41445-3.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41445-3.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41445-3.c	(working copy)
@@ -2,7 +2,7 @@
 /* Test that token after multi-line function-like macro use
    gets correct locus even when preprocessing separately.  */
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-save-temps -gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #define A(a,b)
 int varh;/*
Index: gcc.dg/debug/dwarf2/pr41445-4.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41445-4.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41445-4.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR preprocessor/41445 */
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #include "pr41445-3.c"
 
Index: gcc.dg/debug/dwarf2/pr41445-5.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41445-5.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41445-5.c	(working copy)
@@ -2,7 +2,7 @@
 /* Test that token after multi-line function-like macro use
    gets correct locus even when preprocessing separately.  */
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-save-temps -gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #define A(x) vari x
 #define vari(x)
Index: gcc.dg/debug/dwarf2/pr41445-6.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41445-6.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41445-6.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR preprocessor/41445 */
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #include "pr41445-5.c"
 
Index: gcc.dg/debug/dwarf2/pr41543.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41543.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41543.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR preprocessor/41543 */
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-save-temps -gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 #include <stdarg.h>
 
Index: gcc.dg/debug/dwarf2/pr41695.c
===================================================================
--- gcc.dg/debug/dwarf2/pr41695.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr41695.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR debug/41695 */
 /* { dg-do compile } */
-/* { dg-options "-g -O2 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O2 -dA -fno-merge-debug-strings" } */
 
 int bar (int);
 
Index: gcc.dg/debug/dwarf2/pr43237.c
===================================================================
--- gcc.dg/debug/dwarf2/pr43237.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr43237.c	(working copy)
@@ -1,6 +1,6 @@
 /* PR debug/43237 */
 /* { dg-do compile } */
-/* { dg-options "-g -O2 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O2 -dA -fno-merge-debug-strings" } */
 
 struct S
 {
Index: gcc.dg/debug/dwarf2/pr47939-1.c
===================================================================
--- gcc.dg/debug/dwarf2/pr47939-1.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr47939-1.c	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -dA" } */
+/* { dg-options "-save-temps -gdwarf-2 -dA" } */
 
 typedef struct _Harry { int dummy; } Harry_t;
 Harry_t harry;
Index: gcc.dg/debug/dwarf2/pr47939-2.c
===================================================================
--- gcc.dg/debug/dwarf2/pr47939-2.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr47939-2.c	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -dA" } */
+/* { dg-options "-save-temps -gdwarf-2 -dA" } */
 
 typedef const struct _Harry { int dummy; } Harry_t;
 Harry_t harry;
Index: gcc.dg/debug/dwarf2/pr47939-3.c
===================================================================
--- gcc.dg/debug/dwarf2/pr47939-3.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr47939-3.c	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -dA" } */
+/* { dg-options "-save-temps -gdwarf-2 -dA" } */
 
 typedef struct _Harry { int dummy; } Harry_t;
 const Harry_t harry[5];
Index: gcc.dg/debug/dwarf2/pr47939-4.c
===================================================================
--- gcc.dg/debug/dwarf2/pr47939-4.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr47939-4.c	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-save-temps -g -dA" } */
+/* { dg-options "-save-temps -gdwarf-2 -dA" } */
 
 typedef const struct _Harry { int dummy; } Harry_t;
 Harry_t harry[10];
Index: gcc.dg/debug/dwarf2/pr53948.c
===================================================================
--- gcc.dg/debug/dwarf2/pr53948.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/pr53948.c	(working copy)
@@ -1,6 +1,6 @@
 /* Test that we have line information for the line
    with local variable initializations.  */
-/* { dg-options "-O0 -g -dA" } */
+/* { dg-options "-O0 -gdwarf-2 -dA" } */
 /* { dg-final { scan-assembler ".loc 1 8 0|\[#/!\]\[ \t\]+line 8" } } */
 
 
Index: gcc.dg/debug/dwarf2/struct-loc1.c
===================================================================
--- gcc.dg/debug/dwarf2/struct-loc1.c	(revision 201032)
+++ gcc.dg/debug/dwarf2/struct-loc1.c	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -dA -fno-merge-debug-strings" } */
+/* { dg-options "-gdwarf-2 -O0 -dA -fno-merge-debug-strings" } */
 
 struct foo;
 struct foo *obj;
