dwarf2out.c (DEBUG_ABBREV_SECTION, [...]): Rename from s/DEBUG_//.

        * dwarf2out.c (DEBUG_ABBREV_SECTION, DEBUG_ARANGES_SECTION,
        DEBUG_MACINFO_SECTION, DEBUG_LOC_SECTION, DEBUG_PUBNAMES_SECTION,
        DEBUG_STR_SECTION): Rename from s/DEBUG_//.  Update all users.
        * dwarfout.c (DEBUG_SFNAMES_SECTION, DEBUG_SRCINFO_SECTION,
        DEBUG_MACINFO_SECTION, DEBUG_PUBNAMES_SECTION, DEBUG_ARANGES_SECTION):
        Likewise.
        * config/mips/iris6.h (DEBUG_SFNAMES_SECTION, DEBUG_SRCINFO_SECTION,
        DEBUG_MACINFO_SECTION, DEBUG_PUBNAMES_SECTION, DEBUG_ARANGES_SECTION,
        DEBUG_FRAME_SECTION, DEBUG_ABBREV_SECTION): Rename as above.
        (DEBUG_LOC_SECTION, DEBUG_STR_SECTION): New.
        * config/ia64/ia64.h (DEBUG_ABBREV_SECTION, DEBUG_ARANGES_SECTION,
        DEBUG_PUBNAMES_SECTION): Rename as above.
        (DEBUG_MACINFO_SECTION, DEBUG_LOC_SECTION, DEBUG_STR_SECTION): New.

From-SVN: r42368

5 files changed, 87 insertions, 63 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc32386..9cbbbda 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,21 @@
 2001-05-20  Richard Henderson  <rth@redhat.com>
 
+	* dwarf2out.c (DEBUG_ABBREV_SECTION, DEBUG_ARANGES_SECTION,
+	DEBUG_MACINFO_SECTION, DEBUG_LOC_SECTION, DEBUG_PUBNAMES_SECTION,
+	DEBUG_STR_SECTION): Rename from s/DEBUG_//.  Update all users.
+	* dwarfout.c (DEBUG_SFNAMES_SECTION, DEBUG_SRCINFO_SECTION,
+	DEBUG_MACINFO_SECTION, DEBUG_PUBNAMES_SECTION, DEBUG_ARANGES_SECTION):
+	Likewise.
+	* config/mips/iris6.h (DEBUG_SFNAMES_SECTION, DEBUG_SRCINFO_SECTION,
+	DEBUG_MACINFO_SECTION, DEBUG_PUBNAMES_SECTION, DEBUG_ARANGES_SECTION,
+	DEBUG_FRAME_SECTION, DEBUG_ABBREV_SECTION): Rename as above.
+	(DEBUG_LOC_SECTION, DEBUG_STR_SECTION): New.
+	* config/ia64/ia64.h (DEBUG_ABBREV_SECTION, DEBUG_ARANGES_SECTION,
+	DEBUG_PUBNAMES_SECTION): Rename as above.
+	(DEBUG_MACINFO_SECTION, DEBUG_LOC_SECTION, DEBUG_STR_SECTION): New.
+
+2001-05-20  Richard Henderson  <rth@redhat.com>
+
 	* optabs.c (emit_cmp_and_jump_insns): Don't swap commutative
 	operands unless the operation is commutative.
 
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index 62cc4fb..98847af 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -2560,10 +2560,13 @@ do {									\
 /* Section names for DWARF2 debug info.  */
 
 #define DEBUG_INFO_SECTION	".debug_info, \"\", \"progbits\""
-#define ABBREV_SECTION		".debug_abbrev, \"\", \"progbits\""
-#define ARANGES_SECTION		".debug_aranges, \"\", \"progbits\""
+#define DEBUG_ABBREV_SECTION	".debug_abbrev, \"\", \"progbits\""
+#define DEBUG_ARANGES_SECTION	".debug_aranges, \"\", \"progbits\""
+#define DEBUG_MACINFO_SECTION	".debug_macinfo, \"\", \"progbits\""
 #define DEBUG_LINE_SECTION	".debug_line, \"\", \"progbits\""
-#define PUBNAMES_SECTION	".debug_pubnames, \"\", \"progbits\""
+#define DEBUG_LOC_SECTION	".debug_loc, \"\", \"progbits\""
+#define DEBUG_PUBNAMES_SECTION	".debug_pubnames, \"\", \"progbits\""
+#define DEBUG_STR_SECTION	".debug_str, \"\", \"progbits\""
 
 /* C string constants giving the pseudo-op to use for a sequence of
    2, 4, and 8 byte unaligned constants.  dwarf2out.c needs these.  */
diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h
index e9b594f..626991d 100644
--- a/gcc/config/mips/iris6.h
+++ b/gcc/config/mips/iris6.h
@@ -212,13 +212,15 @@ Boston, MA 02111-1307, USA.  */
 
 #define DEBUG_INFO_SECTION	".debug_info,0x7000001e,0,0,1"
 #define DEBUG_LINE_SECTION	".debug_line,0x7000001e,0,0,1"
-#define SFNAMES_SECTION		".debug_sfnames,0x7000001e,0,0,1"
-#define SRCINFO_SECTION		".debug_srcinfo,0x7000001e,0,0,1"
-#define MACINFO_SECTION		".debug_macinfo,0x7000001e,0,0,1"
-#define PUBNAMES_SECTION	".debug_pubnames,0x7000001e,0,0,1"
-#define ARANGES_SECTION		".debug_aranges,0x7000001e,0,0,1"
-#define FRAME_SECTION		".debug_frame,0x7000001e,0x08000000,0,1"
-#define ABBREV_SECTION		".debug_abbrev,0x7000001e,0,0,1"
+#define DEBUG_SFNAMES_SECTION	".debug_sfnames,0x7000001e,0,0,1"
+#define DEBUG_SRCINFO_SECTION	".debug_srcinfo,0x7000001e,0,0,1"
+#define DEBUG_MACINFO_SECTION	".debug_macinfo,0x7000001e,0,0,1"
+#define DEBUG_PUBNAMES_SECTION	".debug_pubnames,0x7000001e,0,0,1"
+#define DEBUG_ARANGES_SECTION	".debug_aranges,0x7000001e,0,0,1"
+#define DEBUG_FRAME_SECTION	".debug_frame,0x7000001e,0x08000000,0,1"
+#define DEBUG_ABBREV_SECTION	".debug_abbrev,0x7000001e,0,0,1"
+#define DEBUG_LOC_SECTION	".debug_loc,0x7000001e,0,0,1"
+#define DEBUG_STR_SECTION	".debug_str,0x7000001e,0,0,1"
 
 /* ??? If no mabi=X option give, but a mipsX option is, then should depend
    on the mipsX option.  */
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 7cc71fb..630be8f 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3558,26 +3558,26 @@ static int file_info_cmp		PARAMS ((const void *, const void *));
 #ifndef DEBUG_INFO_SECTION
 #define DEBUG_INFO_SECTION	".debug_info"
 #endif
-#ifndef ABBREV_SECTION
-#define ABBREV_SECTION		".debug_abbrev"
+#ifndef DEBUG_ABBREV_SECTION
+#define DEBUG_ABBREV_SECTION	".debug_abbrev"
 #endif
-#ifndef ARANGES_SECTION
-#define ARANGES_SECTION		".debug_aranges"
+#ifndef DEBUG_ARANGES_SECTION
+#define DEBUG_ARANGES_SECTION	".debug_aranges"
 #endif
-#ifndef DW_MACINFO_SECTION
-#define DW_MACINFO_SECTION	".debug_macinfo"
+#ifndef DEBUG_MACINFO_SECTION
+#define DEBUG_MACINFO_SECTION	".debug_macinfo"
 #endif
 #ifndef DEBUG_LINE_SECTION
 #define DEBUG_LINE_SECTION	".debug_line"
 #endif
-#ifndef LOC_SECTION
-#define LOC_SECTION		".debug_loc"
+#ifndef DEBUG_LOC_SECTION
+#define DEBUG_LOC_SECTION	".debug_loc"
 #endif
-#ifndef PUBNAMES_SECTION
-#define PUBNAMES_SECTION	".debug_pubnames"
+#ifndef DEBUG_PUBNAMES_SECTION
+#define DEBUG_PUBNAMES_SECTION	".debug_pubnames"
 #endif
-#ifndef STR_SECTION
-#define STR_SECTION		".debug_str"
+#ifndef DEBUG_STR_SECTION
+#define DEBUG_STR_SECTION	".debug_str"
 #endif
 
 /* Standard ELF section names for compiled code and data.  */
@@ -3595,19 +3595,19 @@ static int file_info_cmp		PARAMS ((const void *, const void *));
    the section names themselves.  */
 
 #ifndef TEXT_SECTION_LABEL
-#define TEXT_SECTION_LABEL	 "Ltext"
+#define TEXT_SECTION_LABEL		"Ltext"
 #endif
 #ifndef DEBUG_LINE_SECTION_LABEL
-#define DEBUG_LINE_SECTION_LABEL "Ldebug_line"
+#define DEBUG_LINE_SECTION_LABEL	"Ldebug_line"
 #endif
 #ifndef DEBUG_INFO_SECTION_LABEL
-#define DEBUG_INFO_SECTION_LABEL "Ldebug_info"
+#define DEBUG_INFO_SECTION_LABEL	"Ldebug_info"
 #endif
-#ifndef ABBREV_SECTION_LABEL
-#define ABBREV_SECTION_LABEL     "Ldebug_abbrev"
+#ifndef DEBUG_ABBREV_SECTION_LABEL
+#define DEBUG_ABBREV_SECTION_LABEL	"Ldebug_abbrev"
 #endif
-#ifndef LOC_SECTION_LABEL
-#define LOC_SECTION_LABEL	 "Ldebug_loc"
+#ifndef DEBUG_LOC_SECTION_LABEL
+#define DEBUG_LOC_SECTION_LABEL		"Ldebug_loc"
 #endif
 
 /* Definitions of defaults for formats and names of various special
@@ -5771,7 +5771,9 @@ value_format (a)
     case dw_val_class_addr:
       return DW_FORM_addr;
     case dw_val_class_loc_list:
-	return DW_FORM_data4; /* FIXME: Could be DW_FORM_data8, with a > 32 bit size .debug_loc section */
+      /* FIXME: Could be DW_FORM_data8, with a > 32 bit size
+	 .debug_loc section */
+      return DW_FORM_data4;
     case dw_val_class_loc:
       switch (constant_size (size_of_locs (AT_loc (a))))
 	{
@@ -11332,7 +11334,8 @@ dwarf2out_init (asm_out_file, main_input_filename)
   ggc_add_rtx_varray_root (&used_rtx_varray, 1);
 
   ASM_GENERATE_INTERNAL_LABEL (text_end_label, TEXT_END_LABEL, 0);
-  ASM_GENERATE_INTERNAL_LABEL (abbrev_section_label, ABBREV_SECTION_LABEL, 0);
+  ASM_GENERATE_INTERNAL_LABEL (abbrev_section_label,
+			       DEBUG_ABBREV_SECTION_LABEL, 0);
   if (DWARF2_GENERATE_TEXT_SECTION_LABEL)
     ASM_GENERATE_INTERNAL_LABEL (text_section_label, TEXT_SECTION_LABEL, 0);
   else
@@ -11341,10 +11344,10 @@ dwarf2out_init (asm_out_file, main_input_filename)
 			       DEBUG_INFO_SECTION_LABEL, 0);
   ASM_GENERATE_INTERNAL_LABEL (debug_line_section_label,
 			       DEBUG_LINE_SECTION_LABEL, 0);
-  ASM_GENERATE_INTERNAL_LABEL (loc_section_label, LOC_SECTION_LABEL, 0);
-  ASM_OUTPUT_SECTION (asm_out_file, LOC_SECTION);
+  ASM_GENERATE_INTERNAL_LABEL (loc_section_label, DEBUG_LOC_SECTION_LABEL, 0);
+  ASM_OUTPUT_SECTION (asm_out_file, DEBUG_LOC_SECTION);
   ASM_OUTPUT_LABEL (asm_out_file, loc_section_label);
-  ASM_OUTPUT_SECTION (asm_out_file, ABBREV_SECTION);
+  ASM_OUTPUT_SECTION (asm_out_file, DEBUG_ABBREV_SECTION);
   ASM_OUTPUT_LABEL (asm_out_file, abbrev_section_label);
   if (DWARF2_GENERATE_TEXT_SECTION_LABEL)
     {
@@ -11457,13 +11460,13 @@ dwarf2out_finish ()
   output_comp_unit (comp_unit_die);
 
   /* Output the abbreviation table.  */
-  ASM_OUTPUT_SECTION (asm_out_file, ABBREV_SECTION);
+  ASM_OUTPUT_SECTION (asm_out_file, DEBUG_ABBREV_SECTION);
   output_abbrev_section ();
 
   if (pubname_table_in_use)
     {
       /* Output public names table.  */
-      ASM_OUTPUT_SECTION (asm_out_file, PUBNAMES_SECTION);
+      ASM_OUTPUT_SECTION (asm_out_file, DEBUG_PUBNAMES_SECTION);
       output_pubnames ();
     }
 
@@ -11472,14 +11475,14 @@ dwarf2out_finish ()
   if (fde_table_in_use)
     {
       /* Output the address range information.  */
-      ASM_OUTPUT_SECTION (asm_out_file, ARANGES_SECTION);
+      ASM_OUTPUT_SECTION (asm_out_file, DEBUG_ARANGES_SECTION);
       output_aranges ();
     }
   /* Output location list section if necessary */
   if (have_location_lists)
     {
       /* Output the location lists info. */
-      ASM_OUTPUT_SECTION (asm_out_file, LOC_SECTION);
+      ASM_OUTPUT_SECTION (asm_out_file, DEBUG_LOC_SECTION);
       output_location_lists (die);
       have_location_lists = 0;
     }
diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c
index f319187..6c21cbf 100644
--- a/gcc/dwarfout.c
+++ b/gcc/dwarfout.c
@@ -976,20 +976,20 @@ static void retry_incomplete_types	PARAMS ((void));
 #ifndef LINE_SECTION
 #define LINE_SECTION		".line"
 #endif
-#ifndef SFNAMES_SECTION
-#define SFNAMES_SECTION		".debug_sfnames"
+#ifndef DEBUG_SFNAMES_SECTION
+#define DEBUG_SFNAMES_SECTION	".debug_sfnames"
 #endif
-#ifndef SRCINFO_SECTION
-#define SRCINFO_SECTION		".debug_srcinfo"
+#ifndef DEBUG_SRCINFO_SECTION
+#define DEBUG_SRCINFO_SECTION	".debug_srcinfo"
 #endif
-#ifndef MACINFO_SECTION
-#define MACINFO_SECTION		".debug_macinfo"
+#ifndef DEBUG_MACINFO_SECTION
+#define DEBUG_MACINFO_SECTION	".debug_macinfo"
 #endif
-#ifndef PUBNAMES_SECTION
-#define PUBNAMES_SECTION	".debug_pubnames"
+#ifndef DEBUG_PUBNAMES_SECTION
+#define DEBUG_PUBNAMES_SECTION	".debug_pubnames"
 #endif
-#ifndef ARANGES_SECTION
-#define ARANGES_SECTION		".debug_aranges"
+#ifndef DEBUG_ARANGES_SECTION
+#define DEBUG_ARANGES_SECTION	".debug_aranges"
 #endif
 #ifndef TEXT_SECTION
 #define TEXT_SECTION		".text"
@@ -5664,7 +5664,7 @@ dwarfout_file_scope_decl (decl, set_finalizing)
 	     defined in this compilation unit.  */
 
 	  fputc ('\n', asm_out_file);
-	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, PUBNAMES_SECTION);
+	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_PUBNAMES_SECTION);
 	  sprintf (label, PUB_DIE_LABEL_FMT, next_pubname_number);
 	  ASM_OUTPUT_DWARF_ADDR (asm_out_file, label);
 	  ASM_OUTPUT_DWARF_STRING_NEWLINE (asm_out_file,
@@ -5702,7 +5702,7 @@ dwarfout_file_scope_decl (decl, set_finalizing)
 	         defined in this compilation unit.  */
 
 	      fputc ('\n', asm_out_file);
-	      ASM_OUTPUT_PUSH_SECTION (asm_out_file, PUBNAMES_SECTION);
+	      ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_PUBNAMES_SECTION);
 	      sprintf (label, PUB_DIE_LABEL_FMT, next_pubname_number);
 	      ASM_OUTPUT_DWARF_ADDR (asm_out_file, label);
 	      ASM_OUTPUT_DWARF_STRING_NEWLINE (asm_out_file,
@@ -5716,7 +5716,7 @@ dwarfout_file_scope_decl (decl, set_finalizing)
 		 which is tentatively defined in this compilation unit.  */
 
 	      fputc ('\n', asm_out_file);
-	      ASM_OUTPUT_PUSH_SECTION (asm_out_file, ARANGES_SECTION);
+	      ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_ARANGES_SECTION);
 	      ASM_OUTPUT_DWARF_ADDR (asm_out_file,
 			      IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)));
 	      ASM_OUTPUT_DWARF_DATA4 (asm_out_file, 
@@ -5917,7 +5917,7 @@ generate_new_sfname_entry ()
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
 
   fputc ('\n', asm_out_file);
-  ASM_OUTPUT_PUSH_SECTION (asm_out_file, SFNAMES_SECTION);
+  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_SFNAMES_SECTION);
   sprintf (label, SFNAMES_ENTRY_LABEL_FMT, filename_table[0].number);
   ASM_OUTPUT_LABEL (asm_out_file, label);
   ASM_OUTPUT_DWARF_STRING_NEWLINE (asm_out_file,
@@ -6017,7 +6017,7 @@ generate_srcinfo_entry (line_entry_num, files_entry_num)
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
 
   fputc ('\n', asm_out_file);
-  ASM_OUTPUT_PUSH_SECTION (asm_out_file, SRCINFO_SECTION);
+  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_SRCINFO_SECTION);
   sprintf (label, LINE_ENTRY_LABEL_FMT, line_entry_num);
   ASM_OUTPUT_DWARF_DELTA4 (asm_out_file, label, LINE_BEGIN_LABEL);
   sprintf (label, SFNAMES_ENTRY_LABEL_FMT, files_entry_num);
@@ -6091,7 +6091,7 @@ generate_macinfo_entry (type_and_offset, string)
     return;
 
   fputc ('\n', asm_out_file);
-  ASM_OUTPUT_PUSH_SECTION (asm_out_file, MACINFO_SECTION);
+  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_MACINFO_SECTION);
   fprintf (asm_out_file, "%s%s\n", UNALIGNED_INT_ASM_OP, type_and_offset);
   ASM_OUTPUT_DWARF_STRING_NEWLINE (asm_out_file, string);
   ASM_OUTPUT_POP_SECTION (asm_out_file);
@@ -6259,7 +6259,7 @@ dwarfout_init (asm_out_file, main_input_filename)
 	     referenced by the initial entry in the .debug_srcinfo section.  */
     
 	  fputc ('\n', asm_out_file);
-	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, SFNAMES_SECTION);
+	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_SFNAMES_SECTION);
 	  ASM_OUTPUT_LABEL (asm_out_file, SFNAMES_BEGIN_LABEL);
 	  {
 	    register const char *pwd = getpwd ();
@@ -6283,7 +6283,7 @@ dwarfout_init (asm_out_file, main_input_filename)
 	     TAG_compile_unit DIE.  */
         
           fputc ('\n', asm_out_file);
-          ASM_OUTPUT_PUSH_SECTION (asm_out_file, MACINFO_SECTION);
+          ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_MACINFO_SECTION);
           ASM_OUTPUT_LABEL (asm_out_file, MACINFO_BEGIN_LABEL);
           ASM_OUTPUT_POP_SECTION (asm_out_file);
 	}
@@ -6302,7 +6302,7 @@ dwarfout_init (asm_out_file, main_input_filename)
 	  /* Generate the initial entry for the .debug_srcinfo section.  */
 
 	  fputc ('\n', asm_out_file);
-	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, SRCINFO_SECTION);
+	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_SRCINFO_SECTION);
 	  ASM_OUTPUT_LABEL (asm_out_file, SRCINFO_BEGIN_LABEL);
 	  ASM_OUTPUT_DWARF_ADDR (asm_out_file, LINE_BEGIN_LABEL);
 	  ASM_OUTPUT_DWARF_ADDR (asm_out_file, SFNAMES_BEGIN_LABEL);
@@ -6319,14 +6319,14 @@ dwarfout_init (asm_out_file, main_input_filename)
       /* Generate the initial entry for the .debug_pubnames section.  */
     
       fputc ('\n', asm_out_file);
-      ASM_OUTPUT_PUSH_SECTION (asm_out_file, PUBNAMES_SECTION);
+      ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_PUBNAMES_SECTION);
       ASM_OUTPUT_DWARF_ADDR (asm_out_file, DEBUG_BEGIN_LABEL);
       ASM_OUTPUT_POP_SECTION (asm_out_file);
     
       /* Generate the initial entry for the .debug_aranges section.  */
     
       fputc ('\n', asm_out_file);
-      ASM_OUTPUT_PUSH_SECTION (asm_out_file, ARANGES_SECTION);
+      ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_ARANGES_SECTION);
       ASM_OUTPUT_DWARF_DELTA4 (asm_out_file,
 			       DEBUG_ARANGES_END_LABEL,
 			       DEBUG_ARANGES_BEGIN_LABEL);
@@ -6464,7 +6464,7 @@ dwarfout_finish ()
 	  /* Output a terminating entry for the .debug_srcinfo section.  */
 
 	  fputc ('\n', asm_out_file);
-	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, SRCINFO_SECTION);
+	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_SRCINFO_SECTION);
 	  ASM_OUTPUT_DWARF_DELTA4 (asm_out_file,
 				   LINE_LAST_ENTRY_LABEL, LINE_BEGIN_LABEL);
 	  ASM_OUTPUT_DWARF_DATA4 (asm_out_file, -1);
@@ -6478,7 +6478,7 @@ dwarfout_finish ()
 	  dwarfout_resume_previous_source_file (0);
 
 	  fputc ('\n', asm_out_file);
-	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, MACINFO_SECTION);
+	  ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_MACINFO_SECTION);
 	  ASM_OUTPUT_DWARF_DATA4 (asm_out_file, 0);
 	  ASM_OUTPUT_DWARF_STRING_NEWLINE (asm_out_file, "");
 	  ASM_OUTPUT_POP_SECTION (asm_out_file);
@@ -6487,7 +6487,7 @@ dwarfout_finish ()
       /* Generate the terminating entry for the .debug_pubnames section.  */
     
       fputc ('\n', asm_out_file);
-      ASM_OUTPUT_PUSH_SECTION (asm_out_file, PUBNAMES_SECTION);
+      ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_PUBNAMES_SECTION);
       ASM_OUTPUT_DWARF_DATA4 (asm_out_file, 0);
       ASM_OUTPUT_DWARF_STRING_NEWLINE (asm_out_file, "");
       ASM_OUTPUT_POP_SECTION (asm_out_file);
@@ -6507,7 +6507,7 @@ dwarfout_finish ()
       */
     
       fputc ('\n', asm_out_file);
-      ASM_OUTPUT_PUSH_SECTION (asm_out_file, ARANGES_SECTION);
+      ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_ARANGES_SECTION);
 
       ASM_OUTPUT_DWARF_ADDR (asm_out_file, TEXT_BEGIN_LABEL);
       ASM_OUTPUT_DWARF_DELTA4 (asm_out_file, TEXT_END_LABEL, TEXT_BEGIN_LABEL);