* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201734 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a1936ec1ca1b2929967eb5cc9954c0aefd3a8ccc..3b1de7328c57ead29539afbf59720cb5856a2235 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,47 @@
+2013-08-14  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.
+
 2013-08-14  Janis Johnson  <janisjo@codesourcery.com>
 
        * 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 8a97e4dc2ac41af1139ffe0155a4e8bc6ea8ca26..4e40aea4ea7fd5c54b41602ae8f93f6bccca7605 100644 (file)
--- 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 <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" } } */

diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/asm-line1.c
index f94dfce93ea981dc05d874036beb1d5c18c9bee5..3773e1c83c31dbbe0a4603833e1b32b5b0b7c55c 100644 (file)
--- 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 b7bd66a602315369563deef95a8acd78c8554803..c1ca1ebb6a26a7a864c20c310075d707fa00bea1 100644 (file)
--- 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 16e1d8bd1400975cf6e133c46146967fbf189d76..b139122fdeba809ed87990869539ffadb24bd721 100644 (file)
--- 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 6cbdc85b3d5df0ee6153a85c2924e6181efa17e1..e7d199d1c4eb3f4d5d3f76552db285d2ac2bf833 100644 (file)
--- 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 5eef4ab95fe0b74cf277aa555ae06b0e6e13f761..b77f7b1bfff6f9276aa2d9c8433fd5b892a0c001 100644 (file)
--- 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 ed32349b4de0f154ff5a867496ff258ed22f3298..23f9596732f05b3b70813a92a5657ebba4fe35be 100644 (file)
--- 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 dc145852fcdf9bc7f31368303dd25cfa3fbc4fc7..4a4bd438ce7f3d1858964899f791f39949a8d28b 100644 (file)
--- 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 edc1d83ed4fdddd77659387e9a6ba69660f7e7ea..4ff201f13459e57d11b2d738f32fb53f4e3a4367 100644 (file)
--- 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 ddb602250cef5d153461641a55cd87eaa1ecf459..951380f125ffbc8f46f172d10d46bfc0b65b1c67 100644 (file)
--- 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 fdfbf83215edfcaa42776f50e27951dde3d4ad71..9ca84e757b01c43d0bc4ed5dd2305b6e2a17de9d 100644 (file)
--- 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 ac897ab78c17207922a2017cf8d9a65139fc27ca..746ab031b830b771af11687399e638fbf7810d9a 100644 (file)
--- 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 04b2f36c3b3d461d6c7416d199cf681999bcb9c8..2b071fc9ed06b80fd67aa0980c3bcf28d2f20544 100644 (file)
--- 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 3fefd41ef94962e78494825c715c83cbb394be09..68985b71fab66fb8b22abbd77d2819ca6b34211b 100644 (file)
--- 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 d8f477f54e8bc81e32c466a8a7e422411f35e707..ff0d6798df20d85f50c1bfbbb7278bca7a42250f 100644 (file)
--- 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 b747076bac63168ce8ec5dabbf862b39467298da..88d78e2335814f532257ddf1d98706340620e49f 100644 (file)
--- 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 c68dfe436e38121a8318fe1744b4984715cba95e..b75395557bf2bb214f95f520508118f189a217ba 100644 (file)
--- 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 84d605fcd036bcc9041ea0183a0c9f9558260562..a028d1484afad09d1afe601471c5fe4ea24a3e2b 100644 (file)
--- 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 767d38b173b1a2c13ef525523d5424bb71398975..15e09b116ccf92eac27b642e609f548e7cc88770 100644 (file)
--- 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 7bcebe355e55e4319bb5da3d36b4a75eb547d864..d871bab0c2e7756c709169d4d77ba391811fe841 100644 (file)
--- 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 4efb25e8c22af6af390b82e77b75ea0e0cd04392..fd61296b2f1d0c1a58489117fe229150345bc5d0 100644 (file)
--- 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 829840c2052e61aa496f92008701b3c3b4d0b45f..824d9947f09057ae33f132c09c28f181336a4f48 100644 (file)
--- 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 fc510903c2ca8e3e04471ed0fa4028c123c5d56a..810788ae6e30a41c70f5c0a85ad3a1bc9f3f7a6d 100644 (file)
--- 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 a32abb5a2e22434ffa1d51925a0dba62886f5f16..aefcb871509b34ad1fd94d9c36eb7b292d0989c4 100644 (file)
--- 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 bd218f82615ef4a70ae8d8091717751469b67dab..193c05d6155cc35a5380f364785938efc7b4cccb 100644 (file)
--- 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 ac599f43fbff865fb47d85fdbfdac4efc28ab5bd..ebbfc36672b0c0c1de47f60ed31089ce8db341c6 100644 (file)
--- 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 3a5c0bf1463512c71b407b4edbc33c77b037339d..ad0a44a95b32069af57869d5c557c33f3303479e 100644 (file)
--- 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 11c8fad7841bdafbda9e87c9fdece86256fe438e..bd7f7b986b3d4de38b8d6a87bf56464972ca40ba 100644 (file)
--- 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 7442dab19f9a5e852d6d563cff9d91355d08716e..395c54418592a2d4c0b3c55288251d6d45c2fd5b 100644 (file)
--- 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 5476aac0afd715ab6472c13c32781dc3ce227076..e818263a51d9e4c312ab303aa8e43b6cdfeddfce 100644 (file)
--- 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 43bc54524a999ffa4d8753df250d44462fb0f8e0..463d3cc588fa8e587659880a31343f971878bfa6 100644 (file)
--- 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 ce26ec639c32c0d694f08e1ab102bd903f29842b..36d55bf30fdb03d72d055288ff5217702668eb1c 100644 (file)
--- 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 de90acb81bf76c6c4ae40d748eac26a0ec24e298..d84ce26cae90e52cc387cabe7ef0b0458d52e7c0 100644 (file)
--- 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 2330f53858e6a659e06eacdf89831be1b8effa84..0927e7465b3c4ea7023ebad2b1db970f14afeb73 100644 (file)
--- 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 234ad1263b28ef93cbedd2413209001caf1e8a9a..bc492f2c14a6f5d2f026cf8288cf3fc873932575 100644 (file)
--- 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 badff447a8bc52e1bec0eac117f335fda97abc18..016dbc94806f457975df84875d3cfe084cf12748 100644 (file)
--- 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 957c152b4a09c6f308afba69eb911cd6733319cf..62b389ee935b91e21c8cb565fbab8b4b499682a8 100644 (file)
--- 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 7e745ff19d2ba1802152cbe87d5d776774d7c19f..4fa199c0c188c4aaaeec13fae9f006acf7d4c9f1 100644 (file)
--- 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 b9b5d0b37438c2fa2f070089506815f879583339..bdc118ddcecc07a06a5fc06d12f6c84c29a10da4 100644 (file)
--- 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 04dd1297694fad54d343fe122c8dcdaace4b750b..297d244e2cc779f55822c9b9a4717012ad475358 100644 (file)
--- 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 8ef2a74388c20968db6ca8aecfbc635b0ac2f32f..72aef4180983ff5377b1a46385d0c30ebee94983 100644 (file)
--- 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" } } */