Re: [Patch, testsuite] Add missing -gdwarf-2 flag in debug/dwarf2 testcase

[Senthil Kumar Selvaraj <senthil_kumar dot selvaraj at atmel dot com>]

On Wed, Mar 27, 2013 at 08:43:53AM -0700, Mike Stump wrote:
> On Mar 27, 2013, at 1:02 AM, Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com> wrote:
> > global-used-types.c in gcc/testsuite/gcc.dg/debug/dwarf2 only specifies
> > -g in dg-options. For a target that is not configured to generate
> > dwarf-2 by default, the test fails looking for specific DWARF strings in
> > the generated assembly.
> > 
> > The patch below changes dg-options to -gdwarf-2. Can someone
> > apply if it is ok?
> 
> Ok.  [ that clears the way for application. ]

I found a bunch of other testcases missing -gdwarf-2, attached is a 
patch that includes fixes for them as well. Finding these many testcases
with just -g makes me a bit suspicious though, could there be a reason why
-gdwarf-2 is not specified?

Regards
Senthil

2013-03-28	Senthil Kumar Selvaraj	<senthil_kumar.selvaraj@atmel.com>

	* gcc.dg/debug/dwarf2/global-used-types.c: Specify -gdwarf-2 in
	dg-options
	* gcc.dg/debug/dwarf2/inline2.c: Likewise
	* gcc.dg/debug/dwarf2/inline3.c: Likewise
	* gcc.dg/debug/dwarf2/pr37726.c: Likewise 
	* gcc.dg/debug/dwarf2/pr41445-1.c: Likewise 
	* gcc.dg/debug/dwarf2/pr41445-2.c: Likewise
	* gcc.dg/debug/dwarf2/pr41445-3.c: Likewise
	* gcc.dg/debug/dwarf2/pr41445-4.c: Likewise
	* gcc.dg/debug/dwarf2/pr41445-5.c: Likewise
	* gcc.dg/debug/dwarf2/pr41445-6.c: Likewise
	* gcc.dg/debug/dwarf2/pr47939-1.c: Likewise
	* gcc.dg/debug/dwarf2/pr47939-2.c: Likewise
	* gcc.dg/debug/dwarf2/pr47939-3.c: Likewise
	* gcc.dg/debug/dwarf2/pr47939-4.c: Likewise
	* gcc.dg/debug/dwarf2/pr53948.c: Likewise
	* gcc.dg/debug/dwarf2/struct-loc1.c: Likewise
	

diff --git gcc/testsuite/gcc.dg/debug/dwarf2/global-used-types.c gcc/testsuite/gcc.dg/debug/dwarf2/global-used-types.c
index 54fa58a..03c6ede 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/global-used-types.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/global-used-types.c
@@ -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 } }
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
index 20edb58..b9ce3a5 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
@@ -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:
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/inline3.c gcc/testsuite/gcc.dg/debug/dwarf2/inline3.c
index d2d3e0f..caa397e 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/inline3.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/inline3.c
@@ -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 } } */
 
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c
index 60fb839..2f2d26c 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c
@@ -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)
 {
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c
index 452c0f6..f91a79d 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c
@@ -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,
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-2.c gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-2.c
index d2ee408..a39419e 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-2.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-2.c
@@ -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"
 
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c
index 2a74dc5..d046eab 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c
@@ -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;/*
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-4.c gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-4.c
index 8aa92de..2d4d6d4 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-4.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-4.c
@@ -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"
 
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c
index d21acd5..09190dc 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c
@@ -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)
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-6.c gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-6.c
index d6d79cc..fbf0337 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-6.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-6.c
@@ -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"
 
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
index 2e4c3cd..fc46336 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
@@ -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;
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
index 13856d7..62a26f2 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
@@ -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;
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
index f1e463e..dbb33ae 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
@@ -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];
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
index cf0a2af..3dc3a8f 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
@@ -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];
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/pr53948.c gcc/testsuite/gcc.dg/debug/dwarf2/pr53948.c
index d2d44ea..fc6c4e5 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/pr53948.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/pr53948.c
@@ -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" } } */
 
 
diff --git gcc/testsuite/gcc.dg/debug/dwarf2/struct-loc1.c gcc/testsuite/gcc.dg/debug/dwarf2/struct-loc1.c
index 216a498..d2395e8 100644
--- gcc/testsuite/gcc.dg/debug/dwarf2/struct-loc1.c
+++ gcc/testsuite/gcc.dg/debug/dwarf2/struct-loc1.c
@@ -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;