* config/mips/elf.h (DWARF2_DEBUG_INFO): Define.

        * config/mips/mips.c (mips_output_filename): Don't print a
        ".file" directive if we are using DWARF-2.
        (mips_output_function_prologue): Do not emit source file
        name for TARGET_GAS.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1680440..53037b3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-12  Daniel Jacobowitz  <drow@mvista.com>
+
+       * config/mips/elf.h (DWARF2_DEBUG_INFO): Define.
+       * config/mips/mips.c (mips_output_filename): Don't print a
+       ".file" directive if we are using DWARF-2.
+       (mips_output_function_prologue): Do not emit source file
+       name for TARGET_GAS.
+
 Wed Jun 12 16:45:13 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * i386.md (shift patterns): Use (TARGET_SHIFT1 || optimize_size) to
@@ -6,9 +14,9 @@ Wed Jun 12 16:45:13 CEST 2002  Jan Hubicka  <jh@suse.cz>
        (TARGET_SHIFT1): New macro.
        * i386.c (x86_shift1): New global variable.
 
-       * toplev.c (rest_of_compilation): Call find_basic_block pre-loop unconditionally;
-       make loop to rebuild CFG; kill unnecesary find_basic_block calls;
-       kill compute_bb_for_insn call.
+       * toplev.c (rest_of_compilation): Call find_basic_block pre-loop
+       unconditionally; make loop to rebuild CFG; kill unnecesary
+       find_basic_block calls; kill compute_bb_for_insn call.
        * cfgbuild.c (find_basic_blocks): Kill compute_bb_for_insn call.
        * haifa-sched.c (sched_init): Likewise.
        * ssa-ccp.c (ssa_const_prop): Likewise.

diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h
index de870c0..8e22e0b 100644 (file)
--- a/gcc/config/mips/elf.h
+++ b/gcc/config/mips/elf.h
@@ -22,6 +22,12 @@ Boston, MA 02111-1307, USA.  */
 /* Use ELF.  */
 #define OBJECT_FORMAT_ELF
 
+/* All ELF targets can support DWARF-2.  */
+
+#ifndef DWARF2_DEBUGGING_INFO
+#define DWARF2_DEBUGGING_INFO 1
+#endif
+
 /* Until we figure out what MIPS ELF targets normally use, just do
    stabs in ELF.  */
 #ifndef PREFERRED_DEBUGGING_TYPE

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 26f899a..0203a88 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -6025,7 +6025,11 @@ mips_output_filename (stream, name)
   static int first_time = 1;
   char ltext_label_name[100];
 
-  if (first_time)
+  /* If we are emitting DWARF-2, let dwarf2out handle the ".file"
+     directives.  */
+  if (write_symbols == DWARF2_DEBUG)
+    return;
+  else if (first_time)
     {
       first_time = 0;
       SET_FILE_NUMBER ();
@@ -6949,7 +6953,11 @@ mips_output_function_prologue (file, size)
 #endif
   HOST_WIDE_INT tsize = current_frame_info.total_size;
 
-  ASM_OUTPUT_SOURCE_FILENAME (file, DECL_SOURCE_FILE (current_function_decl));
+  /* ??? When is this really needed?  At least the GNU assembler does not
+     need the source filename more than once in the file, beyond what is
+     emitted by the debug information.  */
+  if (!TARGET_GAS)
+    ASM_OUTPUT_SOURCE_FILENAME (file, DECL_SOURCE_FILE (current_function_decl));
 
 #ifdef SDB_DEBUGGING_INFO
   if (debug_info_level != DINFO_LEVEL_TERSE && write_symbols == SDB_DEBUG)