Re: 3.4 PATCH: Switch IRIX 6 O32 to DWARF 2

[Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>]

> The few regressions for the DWARF 2 case in those results are due to the
> fact that I originally forgot to handle -gcoff* like -gstabs* in
> MDEBUG_ASM_SPEC.  The patch below fixes this as well, a new bootstrap with
> this version is in progress.
> 
> Ok for mainline if it passes?

Silly me: of course the original was wrong since gas got passed -mdebug
-no-mdebug with -gcoff.  The corrected version below fixes this and passed
bootstrap with only minimal regressions compared to the stabs version:

	http://gcc.gnu.org/ml/gcc-testresults/2003-06/msg00329.html

The only differences are

--- mail-report.log.columba-stabs       Thu Jun  5 11:37:47 2003
+++ mail-report.log.columba-dwarf2      Fri Jun  6 16:59:23 2003

-FAIL: gcc.dg/pch/static-1.c -O0 -g assembly comparison
-FAIL: gcc.dg/pch/static-2.c -O0 -g assembly comparison
-FAIL: gcc.dg/pch/static-3.c -O0 -g assembly comparison
+FAIL: static-1.h (test for excess errors)
+FAIL: static-2.h (test for excess errors)
+FAIL: static-3.h (test for excess errors)
+FAIL: system-1.h (test for excess errors)
+FAIL: system-1.h (test for excess errors)

Those five test fail for the reason described in

	http://gcc.gnu.org/ml/gcc-patches/2003-06/msg00485.html

PCH generation currently fails in this configuration (sometimes with stabs
default, always with dwarf 2 default).

Ok for mainline now?

	Rainer

-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University


Wed Jun  4 22:07:39 2003  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* configure.in: Don't pass --with-stabs for mips*-sgi-irix6*o32.
	* configure. Regenerate.
	
	* config/mips/iris5gas.h (MDEBUG_ASM_SPEC): Override to match
	DWARF 2 default.

	* config/mips/dbxmdebug.h: New file.
	* config.gcc (mips-sgi-irix6*o32, mips-sgi-irix5*): Use it with
	gas and --with-stabs.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.236
diff -u -p -r1.236 configure.in
--- configure.in	22 May 2003 02:49:07 -0000	1.236
+++ configure.in	6 Jun 2003 15:26:29 -0000
@@ -1230,10 +1230,6 @@ fi
 # Default to using --with-stabs for certain targets.
 if test x${with_stabs} = x ; then
   case "${target}" in
-  mips*-*-irix6*o32)
-    with_stabs=yes;
-    extra_host_args="${extra_host_args} --with-stabs"
-    ;;
   mips*-*-irix6*)
     ;;
   mips*-*-* | alpha*-*-osf*)
Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.307
diff -u -p -r1.307 config.gcc
--- gcc/config.gcc	2 Jun 2003 15:40:43 -0000	1.307
+++ gcc/config.gcc	6 Jun 2003 15:26:29 -0000
@@ -1363,7 +1363,7 @@ mips-sgi-irix6*o32)		# SGI System V.4., 
 		tm_file="mips/iris5.h mips/iris5gas.h mips/iris6-o32-gas.h"
 		if test x$stabs = xyes
 		then
-			tm_file="${tm_file} dbx.h"
+			tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
 		fi
 		tmake_file=mips/t-iris5-gas
 	else
@@ -1408,7 +1408,7 @@ mips-sgi-irix5*)		# SGI System V.4., IRI
 		tm_file="mips/iris5.h mips/iris5gas.h"
 		if test x$stabs = xyes
 		then
-			tm_file="${tm_file} dbx.h"
+			tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
 		fi
 		tmake_file=mips/t-iris5-gas
 	else
Index: gcc/config/mips/dbxmdebug.h
===================================================================
RCS file: gcc/config/mips/dbxmdebug.h
diff -N gcc/config/mips/dbxmdebug.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gcc/config/mips/dbxmdebug.h	6 Jun 2003 15:26:29 -0000
@@ -0,0 +1,6 @@
+/* Definitions of target machine for GNU compiler, for MIPS running IRIX 5
+   or IRIX 6 (O32 ABI) using the GNU assembler with stabs-in-mdebug.  */
+
+/* Override iris5gas.h version again to retain mips.h default.  */
+#undef MDEBUG_ASM_SPEC
+#define MDEBUG_ASM_SPEC "%{!gdwarf*:-mdebug} %{gdwarf*:-no-mdebug}"
Index: gcc/config/mips/iris5gas.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/iris5gas.h,v
retrieving revision 1.11
diff -u -p -r1.11 iris5gas.h
--- gcc/config/mips/iris5gas.h	16 May 2003 18:57:42 -0000	1.11
+++ gcc/config/mips/iris5gas.h	6 Jun 2003 15:26:29 -0000
@@ -11,6 +11,11 @@
 #undef DWARF2_UNWIND_INFO
 #define DWARF2_UNWIND_INFO 1
 
+/* Override mips.h version to match DWARF 2 default.  */
+#undef MDEBUG_ASM_SPEC
+#define MDEBUG_ASM_SPEC "%{gstabs*|gcoff*:-mdebug} \
+%{!gstabs*:%{!gcoff*:-no-mdebug}}"
+
 /* Override iris5.h version to invoke [cd]tors and register eh frame
    information.  */
 #undef LINK_SPEC