* defaults.h (DWARF2_GENERATE_TEXT_SECTION_LABEL): Remove.

	* dwarf2out.c (dwarf2out_init): Remove references to
	DWARF2_GENERATE_TEXT_SECTION_LABEL.
	* system.h: Poison DWARF2_GENERATE_TEXT_SECTION_LABEL.
	* doc/tm.texi (DWARF2_GENERATE_TEXT_SECTION_LABEL): Remove.


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

5 files changed, 12 insertions, 27 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d05f93d0ab5..30e873f7a57 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-06  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* defaults.h (DWARF2_GENERATE_TEXT_SECTION_LABEL): Remove.
+	* dwarf2out.c (dwarf2out_init): Remove references to
+	DWARF2_GENERATE_TEXT_SECTION_LABEL.
+	* system.h: Poison DWARF2_GENERATE_TEXT_SECTION_LABEL.
+	* doc/tm.texi (DWARF2_GENERATE_TEXT_SECTION_LABEL): Remove.
+
 2004-10-06  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	* c-typeck.c (convert_arguments): Take expression for called
diff --git a/gcc/defaults.h b/gcc/defaults.h
index bdcefdb9827..d842742e760 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -334,16 +334,6 @@ do { fputs (integer_asm_op (POINTER_SIZE / BITS_PER_UNIT, TRUE), FILE); \
 #endif
 #endif
 
-/* By default, we generate a label at the beginning and end of the
-   text section, and compute the size of the text section by
-   subtracting the two.  However, on some platforms that doesn't
-   work, and we use the section itself, rather than a label at the
-   beginning of it, to indicate the start of the section.  On such
-   platforms, define this to zero.  */
-#ifndef DWARF2_GENERATE_TEXT_SECTION_LABEL
-#define DWARF2_GENERATE_TEXT_SECTION_LABEL 1
-#endif
-
 /* Number of hardware registers that go into the DWARF-2 unwind info.
    If not defined, equals FIRST_PSEUDO_REGISTER  */
 
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index c22ae29905b..71c72c84603 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8090,13 +8090,6 @@ Dwarf 2 frame information.  If @code{DWARF2_UNWIND_INFO}
 information not matter how you define @code{DWARF2_FRAME_INFO}.
 @end defmac
 
-@defmac DWARF2_GENERATE_TEXT_SECTION_LABEL
-By default, the Dwarf 2 debugging information generator will generate a
-label to mark the beginning of the text section.  If it is better simply
-to use the name of the text section itself, rather than an explicit label,
-to indicate the beginning of the text section, define this macro to zero.
-@end defmac
-
 @defmac DWARF2_ASM_LINE_DEBUG_INFO
 Define this macro to be a nonzero value if the assembler can generate Dwarf 2
 line debug info sections.  This will result in much more compact line number
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 11bf0f8f3f6..4b976c10e6f 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -13262,10 +13262,7 @@ dwarf2out_init (const char *filename ATTRIBUTE_UNUSED)
   ASM_GENERATE_INTERNAL_LABEL (text_end_label, TEXT_END_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
-    strcpy (text_section_label, stripattributes (TEXT_SECTION_NAME));
+  ASM_GENERATE_INTERNAL_LABEL (text_section_label, TEXT_SECTION_LABEL, 0);
 
   ASM_GENERATE_INTERNAL_LABEL (debug_info_section_label,
 			       DEBUG_INFO_SECTION_LABEL, 0);
@@ -13288,11 +13285,8 @@ dwarf2out_init (const char *filename ATTRIBUTE_UNUSED)
       ASM_OUTPUT_LABEL (asm_out_file, macinfo_section_label);
     }
 
-  if (DWARF2_GENERATE_TEXT_SECTION_LABEL)
-    {
-      text_section ();
-      ASM_OUTPUT_LABEL (asm_out_file, text_section_label);
-    }
+  text_section ();
+  ASM_OUTPUT_LABEL (asm_out_file, text_section_label);
 }
 
 /* A helper function for dwarf2out_finish called through
diff --git a/gcc/system.h b/gcc/system.h
index 19eabd39563..bdfe2953f24 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -653,7 +653,7 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 	SUNOS4_SHARED_LIBRARIES PROMOTE_FOR_CALL_ONLY			   \
 	SPACE_AFTER_L_OPTION NO_RECURSIVE_FUNCTION_CSE			   \
 	DEFAULT_MAIN_RETURN TARGET_MEM_FUNCTIONS EXPAND_BUILTIN_VA_ARG	   \
-	COLLECT_PARSE_FLAG
+	COLLECT_PARSE_FLAG DWARF2_GENERATE_TEXT_SECTION_LABEL
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\