Hi,
This patch adds the new -gdwarf option to dg-options for testcases in
gcc.dg/debug/dwarf2 that don't already explicitly request DWARF.
Not asking gcc to generate DWARF causes these tests to fail if gcc is
built/configured with support for multiple debugging formats and DWARF
is not the default.
If ok, could someone commit please? I don't have commit access.
Regards
Senthil
gcc/testsuite/ChangeLog
2013-04-11 Senthil Kumar Selvaraj <senthil_kumar.selva...@atmel.com>
* gcc.dg/debug/dwarf2/global-used-types.c: Add -gdwarf to 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..431b429 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 <do...@redhat.com>
- { dg-options "-g -dA -fno-merge-debug-strings" }
+ { dg-options "-gdwarf -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..b128e22 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 -gdwarf -g3 -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..baa2f66 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 -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..622fbcf 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 -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..4e856ec 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 -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..e416b0f 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 -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..46f57e6 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 -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..409f79f 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 -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..de5a1cc 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 -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..340cb38 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 -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..a859ac9 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 -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..dfbfa2f 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 -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..c8039ef 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 -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..bd2351b 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 -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..0ec3e84 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 -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..bf893ee 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 -O0 -dA -fno-merge-debug-strings" } */
struct foo;
struct foo *obj;
