mips.h (MDEBUG_ASM_SPEC): Change for dwarf2 default.

2004-01-06  Eric Christopher  <echristo@redhat.com>

	* config/mips/mips.h (MDEBUG_ASM_SPEC): Change for dwarf2 default.
	(DWARF2_DEBUGGING_INFO): Define.
	(PREFERRED_DEBUGGING_TYPE): Set to dwarf2.
	* config/mips/openbsd.h (PREFERRED_DEBUGGING_TYPE): Remove.
	* config/mips/iris6.h (SUBTARGET_ASM_DEBUGGING_SPEC): Only pass -g0
	for irix as.
	(SUBTARGET_ASM_OPTIMIZING_SPEC): Only pass O0 for irix as.
	* config/mips/iris6gas.h (MDEBUG_ASM_SPEC): Remove.
	* config/mips/iris5gas.h: Ditto.
	(DBX_DEBUGGING_INFO): Remove.
	(DWARF2_DEBUGGING_INFO): Ditto.
	(MIPS_DEBUGGING_INFO): Ditto.
	(PREFERRED_DEBUGGING_TYPE): Ditto.
	* config/mips/elf.h (DWARF2_DEBUGGING_INFO): Remove.
	(PREFERRED_DEBUGGING_TYPE): Ditto.
	(SUBTARGET_ASM_DEBUGGING_SPEC): Ditto.
	* config/mips/elf64.h: Ditto.

From-SVN: r75496

9 files changed, 77 insertions, 46 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27c4023..d9c9b30 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,23 @@
+2004-01-06  Eric Christopher  <echristo@redhat.com>
+
+	* config/mips/mips.h (MDEBUG_ASM_SPEC): Change for dwarf2 default.
+	(DWARF2_DEBUGGING_INFO): Define.
+	(PREFERRED_DEBUGGING_TYPE): Set to dwarf2.
+	* config/mips/openbsd.h (PREFERRED_DEBUGGING_TYPE): Remove.
+	* config/mips/iris6.h (SUBTARGET_ASM_DEBUGGING_SPEC): Only pass -g0
+	for irix as.
+	(SUBTARGET_ASM_OPTIMIZING_SPEC): Only pass O0 for irix as.
+	* config/mips/iris6gas.h (MDEBUG_ASM_SPEC): Remove.
+	* config/mips/iris5gas.h: Ditto.
+	(DBX_DEBUGGING_INFO): Remove.
+	(DWARF2_DEBUGGING_INFO): Ditto.
+	(MIPS_DEBUGGING_INFO): Ditto.
+	(PREFERRED_DEBUGGING_TYPE): Ditto.
+	* config/mips/elf.h (DWARF2_DEBUGGING_INFO): Remove.
+	(PREFERRED_DEBUGGING_TYPE): Ditto.
+	(SUBTARGET_ASM_DEBUGGING_SPEC): Ditto.
+	* config/mips/elf64.h: Ditto.
+
 2004-01-06  Jan Hubicka  <jh@suse.cz>
 
 	* Makefile.in (STAGEPROFILE_FLAGS_TO_PASS): Use -fprofile-generate.
@@ -8,7 +28,7 @@
 	* config/rs6000/t-darwin (LIB2FUNCS_EXTRA): Compile darwin-ldouble.c.
 	(TARGET_LIBGCC2_CFLAGS): Use -mlong-double-128.
 	* config/rs6000/darwin-ldouble.c: New.
-	
+
 	* emit-rtl.c (gen_lowpart_common): Use simplify_gen_subreg
 	for constants.
 	(constant_subword): Delete.
@@ -110,7 +130,7 @@
 	ASM_OUTPUT_MAIN_SOURCE_FILENAME.
 
 2004-01-05  Daniel Berlin  <dberlin@dberlin.org>
-	
+
 	* ggc-zone.c: Remove everything in #ifdef USING_MALLOC_PAGE_GROUPS
 	(USING_MMAP): We don't support non-mmap.
 	(struct alloc_chunk): Steal 1 bit from typecode, use it to mark
@@ -125,7 +145,7 @@
 	(alloc_small_page): Don't care about bytes_free anymore.
 	(alloc_large_page): Round up size.
 	(ggc_alloc_zone_1): Mark large objects as such, and calculate
-	their size the new way. 
+	their size the new way.
 	Remove page table lookups and setting.
 	(ggc_get_size): Calculate large object size the new way.
 	(sweep_pages): Redo to account for fact that we no longer have
@@ -195,7 +215,7 @@
 2004-01-05  Bernardo Innocenti  <bernie@develer.com>
 
 	* config/m68k/m68k.c (output_andsi3): Fix signed/unsigned comparison
-	warning.	
+	warning.
 
 2004-01-04  Nathanael Nerode  <neroden@gcc.gnu.org>
 
diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h
index 279f0c7..febb821 100644
--- a/gcc/config/mips/elf.h
+++ b/gcc/config/mips/elf.h
@@ -20,14 +20,6 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define DWARF2_DEBUGGING_INFO 1
-
-#undef  PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-
-#undef  SUBTARGET_ASM_DEBUGGING_SPEC
-#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0"
-
 /* Biggest alignment supported by the object file format of this
    machine.  Use this macro to limit the alignment which can be
    specified using the `__attribute__ ((aligned (N)))' construct.  If
diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h
index 1efe51c..071f6fa 100644
--- a/gcc/config/mips/elf64.h
+++ b/gcc/config/mips/elf64.h
@@ -20,14 +20,6 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define DWARF2_DEBUGGING_INFO 1
-
-#undef  PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-
-#undef  SUBTARGET_ASM_DEBUGGING_SPEC
-#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0"
-
 /* Biggest alignment supported by the object file format of this
    machine.  Use this macro to limit the alignment which can be
    specified using the `__attribute__ ((aligned (N)))' construct.  If
diff --git a/gcc/config/mips/iris5gas.h b/gcc/config/mips/iris5gas.h
index 27b3118..6abd98c 100644
--- a/gcc/config/mips/iris5gas.h
+++ b/gcc/config/mips/iris5gas.h
@@ -1,20 +1,28 @@
-/* Definitions of target machine for GNU compiler.  Irix version 5 with gas.  */
+/* Definitions of target machine for GNU compiler.  Irix version 5 with gas.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
 
-/* Enable debugging.  */
-#define DBX_DEBUGGING_INFO 1
-#define DWARF2_DEBUGGING_INFO 1
-#define MIPS_DEBUGGING_INFO 1
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+   This file is part of GCC.
+
+   GCC 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, or (at your option)
+   any later version.
+
+   GCC 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 GCC; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* GNU as does handle DWARF2 directives.  */
 #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
diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h
index 5bac6e6..53b88d8 100644
--- a/gcc/config/mips/iris6.h
+++ b/gcc/config/mips/iris6.h
@@ -267,19 +267,20 @@ Boston, MA 02111-1307, USA.  */
 /* Must pass -show instead of -v.  */
 /* Must pass -G 0 to the assembler, otherwise we may get warnings about
    GOT overflow.  */
-/* ??? We pass -w to disable all assembler warnings.  The `label should be
-   inside .ent/.end block' warning that we get for DWARF II debug info labels
-   is particularly annoying.  */
+/* Must pass -w to the assembler to quiet warnings about .ent/.end for dwarf2.  */
+#if ((TARGET_CPU_DEFAULT | TARGET_DEFAULT) & MASK_GAS) == 0
+/* We have a separate file for gas.  */
 #undef SUBTARGET_MIPS_AS_ASM_SPEC
 #define SUBTARGET_MIPS_AS_ASM_SPEC "%{v:-show} -G 0 -w"
 
 #undef SUBTARGET_ASM_DEBUGGING_SPEC
-#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0 %(mdebug_asm_spec)"
+#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0"
 
 /* The MIPS assembler occasionally misoptimizes.  Since GCC should be
    doing scheduling anyhow, just turn off optimization in the assembler.  */
 #undef SUBTARGET_ASM_OPTIMIZING_SPEC
 #define SUBTARGET_ASM_OPTIMIZING_SPEC "-O0"
+#endif
 
 /* The assembler now accepts .section pseudo-ops, but it does not allow
    one to change the section in the middle of a function, so we can't use
diff --git a/gcc/config/mips/iris6gas.h b/gcc/config/mips/iris6gas.h
index e73bfaf..532e9e4 100644
--- a/gcc/config/mips/iris6gas.h
+++ b/gcc/config/mips/iris6gas.h
@@ -1,9 +1,25 @@
-/* Definitions of target machine for GNU compiler.  IRIX 6 with GNU as.  */
+/* Definitions for MIPS running IRIX 6 using GNU AS
+   Copyright (C) 2003
+   Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC 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, or (at your option)
+any later version.
 
-/* Override mips.h version to match DWARF 2 default.  */
-#undef MDEBUG_ASM_SPEC
-#define MDEBUG_ASM_SPEC "%{gstabs*|gcoff*:-mdebug} \
-%{!gstabs*:%{!gcoff*:-no-mdebug}}"
+GCC 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 GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Definitions of target machine for GNU compiler.  IRIX 6 with GNU as.  */
 
 /* Override iris6.h version to always use -init/-fini.
 
diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
index b10ec3a..a087758 100644
--- a/gcc/config/mips/linux.h
+++ b/gcc/config/mips/linux.h
@@ -124,9 +124,6 @@ Boston, MA 02111-1307, USA.  */
 %{!fno-PIC:%{!fno-pic:-KPIC}} \
 %{fno-PIC:-non_shared} %{fno-pic:-non_shared}"
 
-#undef  SUBTARGET_ASM_DEBUGGING_SPEC
-#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0"
-
 /* The MIPS assembler has different syntax for .set. We set it to
    .dummy to trap any errors.  */
 #undef SET_ASM_OP
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 8ebc217..049933a 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -1066,10 +1066,11 @@ extern const struct mips_cpu_info *mips_tune_info;
 #endif
 
 /* Beginning with gas 2.13, -mdebug must be passed to correctly handle COFF
-   and stabs debugging info.  */
+   debugging info.  */
 #if ((TARGET_CPU_DEFAULT | TARGET_DEFAULT) & MASK_GAS) != 0
 /* GAS */
-#define MDEBUG_ASM_SPEC "%{!gdwarf*:-mdebug} %{gdwarf*:-no-mdebug}"
+#define MDEBUG_ASM_SPEC "%{gcoff*:-mdebug} \
+                         %{!gcoff*:-no-mdebug}"
 #else /* not GAS */
 #define MDEBUG_ASM_SPEC ""
 #endif /* not GAS */
@@ -1184,6 +1185,11 @@ extern const struct mips_cpu_info *mips_tune_info;
 
 #define DBX_DEBUGGING_INFO 1		/* generate stabs (OSF/rose) */
 #define MIPS_DEBUGGING_INFO 1		/* MIPS specific debugging info */
+#define DWARF2_DEBUGGING_INFO 1         /* dwarf2 debugging info */
+
+#ifndef PREFERRED_DEBUGGING_TYPE
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+#endif
 
 /* By default, turn on GDB extensions.  */
 #define DEFAULT_GDB_EXTENSIONS 1
diff --git a/gcc/config/mips/openbsd.h b/gcc/config/mips/openbsd.h
index 5e6a4e9..bea4981 100644
--- a/gcc/config/mips/openbsd.h
+++ b/gcc/config/mips/openbsd.h
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA.  */
 #define SUBTARGET_CPP_SPEC OBSD_CPP_SPEC
 
 /* Needed for ELF (inspired by netbsd-elf).  */
-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 #undef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX	"."