dwarf2out.c: Revert most of 2000-11-25 and 2001-01-24 changes.

        * dwarf2out.c: Revert most of 2000-11-25 and 2001-01-24 changes.
        (LN_PROLOG_AS_LABEL, LN_PROLOG_END_LABEL): New.
        (size_of_line_prolog): Remove.
        (output_line_info): Compute prologue size via label difference.
        (lookup_filename): Return "unspecified" for <internal> and <built-in>.

        * configure.in (HAVE_AS_DWARF2_DEBUG_LINE): Require that the
        assembler error when redefining file numbers.
        * config.in, configure: Rebuild.

From-SVN: r40559

gcc/ChangeLog

+2001-03-16  Richard Henderson  <rth@redhat.com>
+
+	* dwarf2out.c: Revert most of 2000-11-25 and 2001-01-24 changes.
+	(LN_PROLOG_AS_LABEL, LN_PROLOG_END_LABEL): New.
+	(size_of_line_prolog): Remove.
+	(output_line_info): Compute prologue size via label difference.
+	(lookup_filename): Return "unspecified" for <internal> and <built-in>.
+
+	* configure.in (HAVE_AS_DWARF2_DEBUG_LINE): Require that the
+	assembler error when redefining file numbers.
+	* config.in, configure: Rebuild.
+
 2001-03-16  Michael Meissner  <meissner@redhat.com>
 
 	* mips.h (BITMASK_HIGH): Replacement for 0x80000000 that avoids

gcc/config.in

@@ -465,7 +465,8 @@
 /* Define if your assembler supports offsetable %lo(). */
 #undef HAVE_AS_OFFSETABLE_LO10
 
-/* Define if your assembler supports dwarf2 .file/.loc directives. */
+/* Define if your assembler supports dwarf2 .file/.loc directives,
+   and preserves file table indicies exactly as given. */
 #undef HAVE_AS_DWARF2_DEBUG_LINE
 
 /* Define to 1 if you want to enable namespaces (-fhonor-std) by default. */

gcc/configure

@@ -2098,7 +2098,7 @@ EOF
 fi
 
 # Find some useful tools
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -6688,9 +6688,21 @@ elif test x$gcc_cv_as != x -a x"$insn" != x ; then
 	echo '	.file 0 "conftest.s"' > conftest.s
 	echo '	.loc 0 3 0' >> conftest.s
 	echo "	$insn" >> conftest.s
+	# ??? This fails with non-gnu grep.
 	if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \
 	   && grep debug_line conftest.o > /dev/null 2>&1 ; then
-		gcc_cv_as_dwarf2_debug_line="yes"
+		# The .debug_line file table must be in the exact order that
+		# we specified the files, since these indicies are also used
+		# by DW_AT_decl_file.  Approximate this test by testing if
+		# the assembler bitches if the same index is assigned twice.
+		echo '	.file 1 "foo.s"' > conftest.s
+		echo '	.file 1 "bar.s"' >> conftest.s
+		if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1
+		then
+		  gcc_cv_as_dwarf2_debug_line="no"
+		else
+		  gcc_cv_as_dwarf2_debug_line="yes"
+		fi
 	fi
 	rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
 fi
@@ -6837,7 +6849,7 @@ EOF
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6841: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6853: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"

gcc/configure.in

@@ -1494,15 +1494,28 @@ elif test x$gcc_cv_as != x -a x"$insn" != x ; then
 	echo '	.file 0 "conftest.s"' > conftest.s
 	echo '	.loc 0 3 0' >> conftest.s
 	echo "	$insn" >> conftest.s
+	# ??? This fails with non-gnu grep.
 	if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \
 	   && grep debug_line conftest.o > /dev/null 2>&1 ; then
-		gcc_cv_as_dwarf2_debug_line="yes"
+		# The .debug_line file table must be in the exact order that
+		# we specified the files, since these indicies are also used
+		# by DW_AT_decl_file.  Approximate this test by testing if
+		# the assembler bitches if the same index is assigned twice.
+		echo '	.file 1 "foo.s"' > conftest.s
+		echo '	.file 1 "bar.s"' >> conftest.s
+		if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1
+		then
+		  gcc_cv_as_dwarf2_debug_line="no"
+		else
+		  gcc_cv_as_dwarf2_debug_line="yes"
+		fi
 	fi
 	rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
 fi
 if test x"$gcc_cv_as_dwarf2_debug_line" = xyes; then
 	AC_DEFINE(HAVE_AS_DWARF2_DEBUG_LINE, 1,
-	  [Define if your assembler supports dwarf2 .file/.loc directives.])
+[Define if your assembler supports dwarf2 .file/.loc directives,
+   and preserves file table indicies exactly as given.])
 fi
 AC_MSG_RESULT($gcc_cv_as_dwarf2_debug_line)