dwarfout.c (INSN_LABEL_FMT): Remove.

        * dwarfout.c (INSN_LABEL_FMT): Remove.
        (output_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
        (dwarfout_label): Remove.
        * dwarfout.h: Remove it's prototype.
        * dwarf2out.c (INSN_LABEL_FMT): Remove.
        (gen_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
        (dwarf2out_label): Remove.
        * dwarf2out.h: Remove it's prototype.
        * final.c (final_scan_insn): Don't call dwarf[2]out_label.

From-SVN: r37310

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9403c3e7cac7536eea913b5e791a36bebd2cef2..7bb1251612675f2c928210c64ed8b192e57e3ef9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-07  Richard Henderson  <rth@redhat.com>
+
+       * dwarfout.c (INSN_LABEL_FMT): Remove.
+       (output_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
+       (dwarfout_label): Remove.
+       * dwarfout.h: Remove it's prototype.
+       * dwarf2out.c (INSN_LABEL_FMT): Remove.
+       (gen_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
+       (dwarf2out_label): Remove.
+       * dwarf2out.h: Remove it's prototype.
+       * final.c (final_scan_insn): Don't call dwarf[2]out_label.
+
 2000-11-07  Richard Henderson  <rth@redhat.com>
 
        * config/ia64/fde-glibc.c (find_fde_for_dso): Do a binary

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 507c9a7d3e37170d482d15c0d5dff82195e8a4e7..a5517a2436b3570444b9424e9acc2dd646fb5e44 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3594,9 +3594,6 @@ static char debug_line_section_label[MAX_ARTIFICIAL_LABEL_BYTES];
 #ifndef BSS_END_LABEL
 #define BSS_END_LABEL           "Lebss"
 #endif
-#ifndef INSN_LABEL_FMT
-#define INSN_LABEL_FMT         "LI%u_"
-#endif
 #ifndef BLOCK_BEGIN_LABEL
 #define BLOCK_BEGIN_LABEL      "LBB"
 #endif
@@ -9824,7 +9821,6 @@ gen_label_die (decl, context_die)
   register dw_die_ref lbl_die = new_die (DW_TAG_label, context_die);
   register rtx insn;
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
-  char label2[MAX_ARTIFICIAL_LABEL_BYTES];
 
   if (origin != NULL)
     add_abstract_origin_attribute (lbl_die, origin);
@@ -9852,9 +9848,7 @@ gen_label_die (decl, context_die)
          if (INSN_DELETED_P (insn))
            abort ();
 
-         sprintf (label2, INSN_LABEL_FMT, current_funcdef_number);
-         ASM_GENERATE_INTERNAL_LABEL (label, label2,
-                                      (unsigned) INSN_UID (insn));
+         ASM_GENERATE_INTERNAL_LABEL (label, "L", CODE_LABEL_NUMBER (insn));
          add_AT_lbl_id (lbl_die, DW_AT_low_pc, label);
        }
     }
@@ -10966,24 +10960,6 @@ dwarf2out_ignore_block (block)
   return 1;
 }
 
-/* Output a marker (i.e. a label) at a point in the assembly code which
-   corresponds to a given source level label.  */
-
-void
-dwarf2out_label (insn)
-     register rtx insn;
-{
-  char label[MAX_ARTIFICIAL_LABEL_BYTES];
-
-  if (debug_info_level >= DINFO_LEVEL_NORMAL)
-    {
-      function_section (current_function_decl);
-      sprintf (label, INSN_LABEL_FMT, current_funcdef_number);
-      ASM_OUTPUT_DEBUG_LABEL (asm_out_file, label,
-                                (unsigned) INSN_UID (insn));
-    }
-}
-
 /* Lookup a filename (in the list of filenames that we know about here in
    dwarf2out.c) and return its "index".  The index of each (known) filename is
    just a unique number which is associated with only that one filename.

diff --git a/gcc/dwarf2out.h b/gcc/dwarf2out.h
index 0b6d1b22de0be2949eb765e0d6c698ee39e5cdbb..bced6a6a8a46626e6f7d5a42e924aec8691ab49a 100644 (file)
--- a/gcc/dwarf2out.h
+++ b/gcc/dwarf2out.h
@@ -29,7 +29,6 @@ extern void dwarf2out_end_source_file         PARAMS ((void));
 extern void dwarf2out_begin_block      PARAMS ((unsigned));
 extern void dwarf2out_end_block                PARAMS ((unsigned));
 extern int dwarf2out_ignore_block      PARAMS ((tree));
-extern void dwarf2out_label            PARAMS ((rtx));                 
 extern void dwarf2out_decl             PARAMS ((tree));        
 extern void dwarf2out_line             PARAMS ((const char *, unsigned));
 extern void dwarf2out_frame_init       PARAMS ((void));

diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c
index 653f8dec197d2e4aa76829a37354e8c36bae4b83..708c574fa71536880a92b235cc6179ebef7756b6 100644 (file)
--- a/gcc/dwarfout.c
+++ b/gcc/dwarfout.c
@@ -561,9 +561,6 @@ static void retry_incomplete_types  PARAMS ((void));
 #ifndef PUB_DIE_LABEL_FMT
 #define PUB_DIE_LABEL_FMT      "*.L_P%u"
 #endif
-#ifndef INSN_LABEL_FMT
-#define INSN_LABEL_FMT         "*.L_I%u_%u"
-#endif
 #ifndef BLOCK_BEGIN_LABEL_FMT
 #define BLOCK_BEGIN_LABEL_FMT  "*.L_B%u"
 #endif
@@ -3485,8 +3482,7 @@ output_label_die (arg)
          if (INSN_DELETED_P (insn))
            abort ();   /* Should never happen.  */
 
-         sprintf (label, INSN_LABEL_FMT, current_funcdef_number,
-                                         (unsigned) INSN_UID (insn));
+         ASM_GENERATE_INTERNAL_LABEL (label, "L", CODE_LABEL_NUMBER (insn));
          low_pc_attribute (label);
        }
     }
@@ -5294,24 +5290,6 @@ dwarfout_end_block (blocknum)
   ASM_OUTPUT_LABEL (asm_out_file, label);
 }
 
-/* Output a marker (i.e. a label) at a point in the assembly code which
-   corresponds to a given source level label.  */
-
-void
-dwarfout_label (insn)
-     register rtx insn;
-{
-  if (debug_info_level >= DINFO_LEVEL_NORMAL)
-    {
-      char label[MAX_ARTIFICIAL_LABEL_BYTES];
-
-      function_section (current_function_decl);
-      sprintf (label, INSN_LABEL_FMT, current_funcdef_number,
-                                     (unsigned) INSN_UID (insn));
-      ASM_OUTPUT_LABEL (asm_out_file, label);
-    }
-}
-
 /* Output a marker (i.e. a label) for the point in the generated code where
    the real body of the function begins (after parameters have been moved
    to their home locations).  */

diff --git a/gcc/dwarfout.h b/gcc/dwarfout.h
index e0b9e2c74702c73ec6b15ccbb551e6ca36ebde38..1eeef5fb90e212249dd603103eddf403f59b1df0 100644 (file)
--- a/gcc/dwarfout.h
+++ b/gcc/dwarfout.h
@@ -34,8 +34,4 @@ extern void dwarfout_end_epilogue     PARAMS ((void));
 extern void dwarfout_begin_block       PARAMS ((unsigned));
 extern void dwarfout_end_block         PARAMS ((unsigned));
 
-#ifdef RTX_CODE
-extern void dwarfout_label             PARAMS ((rtx));
-#endif
 extern void dwarfout_line              PARAMS ((const char *, unsigned));
-

diff --git a/gcc/final.c b/gcc/final.c
index ae2864aec0a45ac4a4c78407f404671f68c8d3f9..9b76aa801a3beb896cd8adda4b2af801f75b3b0f 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -2268,22 +2268,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
          /* Emit the label.  We may have deleted the CODE_LABEL because
             the label could be proved to be unreachable, though still
             referenced (in the form of having its address taken.  */
-         /* ??? Figure out how not to do this unconditionally.  This
-            interferes with bundling on LIW targets.  */
          ASM_OUTPUT_DEBUG_LABEL (file, "L", CODE_LABEL_NUMBER (insn));
-
-         if (debug_info_level == DINFO_LEVEL_NORMAL
-             || debug_info_level == DINFO_LEVEL_VERBOSE)
-           {
-#ifdef DWARF_DEBUGGING_INFO
-             if (write_symbols == DWARF_DEBUG)
-               dwarfout_label (insn);
-#endif
-#ifdef DWARF2_DEBUGGING_INFO
-             if (write_symbols == DWARF2_DEBUG)
-               dwarf2out_label (insn);
-#endif
-           }
          break;
 
        case 0:
@@ -2402,14 +2387,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
 #ifdef SDB_DEBUGGING_INFO
       if (write_symbols == SDB_DEBUG && LABEL_NAME (insn))
        sdbout_label (insn);
-#endif
-#ifdef DWARF_DEBUGGING_INFO
-      if (write_symbols == DWARF_DEBUG && LABEL_NAME (insn))
-       dwarfout_label (insn);
-#endif
-#ifdef DWARF2_DEBUGGING_INFO
-      if (write_symbols == DWARF2_DEBUG && LABEL_NAME (insn))
-       dwarf2out_label (insn);
 #endif
       if (app_on)
        {