Index: gcc/ChangeLog

	* dbxout.c (dbxout_init): Use assemble_name rather than just
	stripping off the first character.
	(dbxout_source_file): Likewise.

Index: gcc/testsuite/ChangeLog

	* gcc.dg/debug/debug.exp: New file.
        * gcc.dg/debug/trivial.c: New file.
        * gcc.dg/debug/20000503-1.c: Moved from gcc.dg/.
        * gcc.dg/debug/20010207-1.c: Moved from gcc.dg/.
        * gcc.dg/debug/20011223-1.c: Moved from gcc.dg/.
        * gcc.dg/debug/20020104-2.c: Moved from gcc.dg/.
        * gcc.dg/debug/debug-1.c: Moved from gcc.dg/.
        * gcc.dg/debug/debug-2.c: Moved from gcc.dg/.
        * gcc.dg/debug/debug-3.c: Moved from gcc.dg/.
        * gcc.dg/debug/debug-4.c: Moved from gcc.dg/.
        * gcc.dg/debug/debug-5.c: Moved from gcc.dg/.
        * gcc.dg/debug/debug-6.c: Moved from gcc.dg/.
        * gcc.dg/debug/dwarf2-1.c: Moved from gcc.dg/.
        * gcc.dg/debug/dwarf2-2.c: Moved from gcc.dg/.
        * gcc.dg/20000503-1.c: Removed.
        * gcc.dg/20010207-1.c: Removed.
        * gcc.dg/20011223-1.c: Removed.
        * gcc.dg/20020104-2.c: Removed.
        * gcc.dg/debug-1.c: Removed.
        * gcc.dg/debug-2.c: Removed.
        * gcc.dg/debug-3.c: Removed.
        * gcc.dg/debug-4.c: Removed.
        * gcc.dg/debug-5.c: Removed.
        * gcc.dg/debug-6.c: Removed.
        * gcc.dg/dwarf2-1.c: Removed.
        * gcc.dg/dwarf2-2.c: Removed.

From-SVN: r49238

18 files changed, 136 insertions, 24 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac35801..ec9b4ad 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-25  Geoffrey Keating  <geoffk@redhat.com>
+
+	* dbxout.c (dbxout_init): Use assemble_name rather than just
+	stripping off the first character.
+	(dbxout_source_file): Likewise.
+
 2002-01-25  DJ Delorie  <dj@redhat.com>
 
 	* config/sparc/sparc.c (sparc_emit_set_symbolic_const64): Compare
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index abcbee0..f352745 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -439,7 +439,9 @@ dbxout_init (input_file_name)
 #else /* no DBX_OUTPUT_MAIN_SOURCE_DIRECTORY */
 	  fprintf (asmfile, "%s", ASM_STABS_OP);
 	  output_quoted_string (asmfile, cwd);
-	  fprintf (asmfile, ",%d,0,0,%s\n", N_SO, &ltext_label_name[1]);
+	  fprintf (asmfile, ",%d,0,0,", N_SO);
+	  assemble_name (asmfile, ltext_label_name);
+	  fputc ('\n', asmfile);
 #endif /* no DBX_OUTPUT_MAIN_SOURCE_DIRECTORY */
 	}
     }
@@ -454,8 +456,9 @@ dbxout_init (input_file_name)
   /* Used to put `Ltext:' before the reference, but that loses on sun 4.  */
   fprintf (asmfile, "%s", ASM_STABS_OP);
   output_quoted_string (asmfile, input_file_name);
-  fprintf (asmfile, ",%d,0,0,%s\n", 
-	   N_SO, &ltext_label_name[1]);
+  fprintf (asmfile, ",%d,0,0,", N_SO);
+  assemble_name (asmfile, ltext_label_name);
+  fputc ('\n', asmfile);
   text_section ();
   ASM_OUTPUT_INTERNAL_LABEL (asmfile, "Ltext", 0);
 #endif /* no DBX_OUTPUT_MAIN_SOURCE_FILENAME */
@@ -577,7 +580,9 @@ dbxout_source_file (file, filename)
 				   source_label_number);
       fprintf (file, "%s", ASM_STABS_OP);
       output_quoted_string (file, filename);
-      fprintf (file, ",%d,0,0,%s\n", N_SOL, &ltext_label_name[1]);
+      fprintf (asmfile, ",%d,0,0,", N_SOL);
+      assemble_name (asmfile, ltext_label_name);
+      fputc ('\n', asmfile);
       if (current_function_decl != NULL_TREE
 	  && DECL_SECTION_NAME (current_function_decl) != NULL_TREE)
 	; /* Don't change section amid function.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a81e931..9b6fb5b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,32 @@
+2002-01-25  Geoffrey Keating  <geoffk@redhat.com>
+
+	* gcc.dg/debug/debug.exp: New file.
+	* gcc.dg/debug/trivial.c: New file.
+	* gcc.dg/debug/20000503-1.c: Moved from gcc.dg/.
+	* gcc.dg/debug/20010207-1.c: Moved from gcc.dg/.
+	* gcc.dg/debug/20011223-1.c: Moved from gcc.dg/.
+	* gcc.dg/debug/20020104-2.c: Moved from gcc.dg/.
+	* gcc.dg/debug/debug-1.c: Moved from gcc.dg/.
+	* gcc.dg/debug/debug-2.c: Moved from gcc.dg/.
+	* gcc.dg/debug/debug-3.c: Moved from gcc.dg/.
+	* gcc.dg/debug/debug-4.c: Moved from gcc.dg/.
+	* gcc.dg/debug/debug-5.c: Moved from gcc.dg/.
+	* gcc.dg/debug/debug-6.c: Moved from gcc.dg/.
+	* gcc.dg/debug/dwarf2-1.c: Moved from gcc.dg/.
+	* gcc.dg/debug/dwarf2-2.c: Moved from gcc.dg/.
+	* gcc.dg/20000503-1.c: Removed.
+	* gcc.dg/20010207-1.c: Removed.
+	* gcc.dg/20011223-1.c: Removed.
+	* gcc.dg/20020104-2.c: Removed.
+	* gcc.dg/debug-1.c: Removed.
+	* gcc.dg/debug-2.c: Removed.
+	* gcc.dg/debug-3.c: Removed.
+	* gcc.dg/debug-4.c: Removed.
+	* gcc.dg/debug-5.c: Removed.
+	* gcc.dg/debug-6.c: Removed.
+	* gcc.dg/dwarf2-1.c: Removed.
+	* gcc.dg/dwarf2-2.c: Removed.
+
 2002-01-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* g++.old-deja/g++.other/eh5.C: New test.
diff --git a/gcc/testsuite/gcc.dg/20010207-1.c b/gcc/testsuite/gcc.dg/20010207-1.c
deleted file mode 100644
index b92615d..0000000
--- a/gcc/testsuite/gcc.dg/20010207-1.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* { dg-do compile { target i?86-*-[eflno]* } } */
-/* linux, (free|net|open)bsd and elf only */
-/* cygwin and mingw32, for example, don't support dwarf-2 */
-/* { dg-options "-O3 -gdwarf-2" } */
-
-extern inline int f1 (void) {return f2();}
-int f3 (void) {return f1();}
-int f1 (void) {return 0;}
diff --git a/gcc/testsuite/gcc.dg/20000503-1.c b/gcc/testsuite/gcc.dg/debug/20000503-1.c
index a5900b8..27d3c55 100644
--- a/gcc/testsuite/gcc.dg/20000503-1.c
+++ b/gcc/testsuite/gcc.dg/debug/20000503-1.c
@@ -1,5 +1,4 @@
-/* { dg-do compile { target i?86-*-linux* i?86-*-sco3.2v5* i?86-*-sysv* } } */
-/* { dg-options "-O2 -gdwarf -g2" } */
+/* { dg-do compile } */
 
 /* Distilled from GCC's stmt.c.  Caused abort in dwarf-1 code. */
 
diff --git a/gcc/testsuite/gcc.dg/debug/20010207-1.c b/gcc/testsuite/gcc.dg/debug/20010207-1.c
new file mode 100644
index 0000000..513d7a4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/20010207-1.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+extern inline int f1 (void) {return f2();}
+int f3 (void) {return f1();}
+int f1 (void) {return 0;}
diff --git a/gcc/testsuite/gcc.dg/20011223-1.c b/gcc/testsuite/gcc.dg/debug/20011223-1.c
index 53f7f20..f8d70ab 100644
--- a/gcc/testsuite/gcc.dg/20011223-1.c
+++ b/gcc/testsuite/gcc.dg/debug/20011223-1.c
@@ -1,6 +1,5 @@
 /* Origin: PR c/5163 from aj@suse.de.  */
 /* { dg-do compile } */
-/* { dg-options "-O3 -g" } */
 
 extern int bar (int);
 
diff --git a/gcc/testsuite/gcc.dg/20020104-2.c b/gcc/testsuite/gcc.dg/debug/20020104-2.c
index 3bcafe0..854d174 100644
--- a/gcc/testsuite/gcc.dg/20020104-2.c
+++ b/gcc/testsuite/gcc.dg/debug/20020104-2.c
@@ -1,7 +1,6 @@
 /* This testcase used to fail because outlining_inline_function was called
    too early, before rtl was generated.  */
 /* { dg-do compile } */
-/* { dg-options "-O3 -g" } */
 
 int foo (const int *x)
 {
diff --git a/gcc/testsuite/gcc.dg/debug-1.c b/gcc/testsuite/gcc.dg/debug/debug-1.c
index 1e53b14..b413eb7 100644
--- a/gcc/testsuite/gcc.dg/debug-1.c
+++ b/gcc/testsuite/gcc.dg/debug/debug-1.c
@@ -1,6 +1,6 @@
 /* Verify that the scheduler does not discard the lexical block.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g -dA" } */
+/* { dg-options "-dA" } */
 /* { dg-final { scan-assembler "xyzzy" } } */
 
 long foo(long p)
diff --git a/gcc/testsuite/gcc.dg/debug-2.c b/gcc/testsuite/gcc.dg/debug/debug-2.c
index 4305059..e11b7b0 100644
--- a/gcc/testsuite/gcc.dg/debug-2.c
+++ b/gcc/testsuite/gcc.dg/debug/debug-2.c
@@ -1,6 +1,6 @@
 /* Verify that the scheduler does not discard the lexical block.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g -dA" } */
+/* { dg-options "-dA" } */
 /* { dg-final { scan-assembler "xyzzy" } } */
 
 long foo(long p)
diff --git a/gcc/testsuite/gcc.dg/debug-3.c b/gcc/testsuite/gcc.dg/debug/debug-3.c
index b94c4eb..bb819f4 100644
--- a/gcc/testsuite/gcc.dg/debug-3.c
+++ b/gcc/testsuite/gcc.dg/debug/debug-3.c
@@ -1,7 +1,6 @@
 /* This testcase failed, because scope containing baz was deleted
    (spanned 0 basic blocks) and DWARF-2 couldn't find baz origin.  */
 /* { dg-do compile } */
-/* { dg-options "-O3 -g" } */
 
 struct A { char *a, *b, *c, *d; };
 
diff --git a/gcc/testsuite/gcc.dg/debug-4.c b/gcc/testsuite/gcc.dg/debug/debug-4.c
index f3cf0c2..62e824a 100644
--- a/gcc/testsuite/gcc.dg/debug-4.c
+++ b/gcc/testsuite/gcc.dg/debug/debug-4.c
@@ -1,7 +1,6 @@
 /* This testcase failed, because scope containing baz was not emitted
    (doesn't contain any instructions) and DWARF-2 couldn't find baz origin.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g" } */
 
 struct A { char *a, *b, *c, *d; };
 
diff --git a/gcc/testsuite/gcc.dg/debug-5.c b/gcc/testsuite/gcc.dg/debug/debug-5.c
index 4d1d229..8f26fc4 100644
--- a/gcc/testsuite/gcc.dg/debug-5.c
+++ b/gcc/testsuite/gcc.dg/debug/debug-5.c
@@ -1,7 +1,6 @@
 /* This testcase failed, because scope containing baz was deleted
    (spanned 0 basic blocks) and DWARF-2 couldn't find baz origin.  */
 /* { dg-do compile } */
-/* { dg-options "-O3 -g" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/debug-6.c b/gcc/testsuite/gcc.dg/debug/debug-6.c
index 1ed8679..4fe680d 100644
--- a/gcc/testsuite/gcc.dg/debug-6.c
+++ b/gcc/testsuite/gcc.dg/debug/debug-6.c
@@ -1,6 +1,6 @@
 /* Verify that bb-reorder re-inserts nested scopes properly.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g -dA" } */
+/* { dg-options "-dA" } */
 /* { dg-final { scan-assembler "xyzzy" } } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/debug/debug.exp b/gcc/testsuite/gcc.dg/debug/debug.exp
new file mode 100644
index 0000000..310ce13
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/debug.exp
@@ -0,0 +1,78 @@
+#   Copyright (C) 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# GCC testsuite that uses the `dg.exp' driver.
+
+# Load support procs.
+load_lib gcc-dg.exp
+
+# This is the list of debugging options we'll try.  Some of them won't
+# be supported, that's OK; they will be quickly eliminated.
+# It's probably not a good idea to add more optimisation options.
+
+if ![info exists DEBUG_TORTURE_OPTIONS] {
+    set DEBUG_TORTURE_OPTIONS ""
+    foreach type {-gdwarf-2 -gstabs -gstabs+ -gxcoff -gxcoff+ -gcoff} {
+	set comp_output [gcc_target_compile \
+		"$srcdir/$subdir/trivial.c" "trivial.S" assembly \
+		"additional_flags=$type"]
+	if { ! [string match "*: unknown or unsupported -g option*" \
+		$comp_output] } {
+	    foreach level {1 "" 3} {
+		lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}"]
+		foreach opt { -O -O3 } {
+		    lappend DEBUG_TORTURE_OPTIONS \
+			    [list "${type}${level}" "$opt" ]
+		}
+	    }
+	}
+    }
+}
+
+verbose -log "Using options $DEBUG_TORTURE_OPTIONS"
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+
+foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] {
+    global runtests
+
+    # If we're only testing specific files and this isn't one of 
+    # them, skip it.
+    if ![runtest_file_p $runtests $test] {
+	continue
+    }
+
+    set nshort [file tail [file dirname $test]]/[file tail $test]
+
+    foreach flags $DEBUG_TORTURE_OPTIONS {
+	set doit 1
+	if { [string match {*/debug-[126].c} "$nshort"] \
+		&& [string match "*1" [lindex "$flags" 0] ] } { 
+	    set doit 0
+	}
+	
+	if { $doit } {
+	    verbose -log "Testing $nshort, $flags" 1
+	    dg-test $test $flags ""
+	}
+    }
+}
+
+# All done.
+dg-finish
diff --git a/gcc/testsuite/gcc.dg/dwarf2-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2-1.c
index 9135cf7..3eb4f95 100644
--- a/gcc/testsuite/gcc.dg/dwarf2-1.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2-1.c
@@ -1,5 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -g" } */
 
 /* Copyright (C) 2000  Free Software Foundation  */
 /* Contributed by Alexandre Oliva <aoliva@cygnus.com> */
diff --git a/gcc/testsuite/gcc.dg/dwarf2-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2-2.c
index 82e5d8d..0c3cee1 100644
--- a/gcc/testsuite/gcc.dg/dwarf2-2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2-2.c
@@ -1,5 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-O -g" } */
 
 /* Copyright (C) 2000  Free Software Foundation  */
 /* Contributed by Alexandre Oliva <aoliva@redhat.com> */
diff --git a/gcc/testsuite/gcc.dg/debug/trivial.c b/gcc/testsuite/gcc.dg/debug/trivial.c
new file mode 100644
index 0000000..5b125ec
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/trivial.c
@@ -0,0 +1,6 @@
+/* { dg-do run } */
+
+int main(void)
+{
+  return 0;
+}