dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Removed.

	* dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	(output_line_info): Use constant `1', with a long explanatory
	comment.
	* system.h (DWARF_LINE_MIN_INSTR_LENGTH): Poison.

From-SVN: r49944

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 647eb31b5564e642183d7434452a841727be8902..c7878d70e65f92cbcf7cdadee60774e7d456ce42 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-21  Tom Tromey  <tromey@redhat.com>
+
+       * dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
+       (output_line_info): Use constant `1', with a long explanatory
+       comment.
+       * system.h (DWARF_LINE_MIN_INSTR_LENGTH): Poison.
+
 Thu Feb 21 22:43:44 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
        * jump.c (redirect_jump): If old label has no UID, don't try to

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index f51df45d77bd2f012807ad18db92753cc3ad7b97..8d7d48b39bb26ee61c2a73924fe63042be47fb72 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3265,16 +3265,6 @@ extern int flag_traditional;
 #endif
 #endif
 
-/* Define the architecture-dependent minimum instruction length (in bytes).
-   In this implementation of DWARF, this field is used for information
-   purposes only.  Since GCC generates assembly language, we have
-   no a priori knowledge of how many instruction bytes are generated
-   for each source line, and therefore can use only the  DW_LNE_set_address
-   and DW_LNS_fixed_advance_pc line information commands.
-   Accordingly, we define this as `1', which is "correct enough" for
-   all architectures, and don't let the target override.  */
-#define DWARF_LINE_MIN_INSTR_LENGTH 1
-
 /* Minimum line offset in a special line info. opcode.
    This value was chosen to give a reasonable range of values.  */
 #define DWARF_LINE_BASE  -10
@@ -7031,8 +7021,17 @@ output_line_info ()
   dw2_asm_output_delta (DWARF_OFFSET_SIZE, p2, p1, "Prolog Length");
   ASM_OUTPUT_LABEL (asm_out_file, p1);
 
-  dw2_asm_output_data (1, DWARF_LINE_MIN_INSTR_LENGTH,
+  /* Define the architecture-dependent minimum instruction length (in
+   bytes).  In this implementation of DWARF, this field is used for
+   information purposes only.  Since GCC generates assembly language,
+   we have no a priori knowledge of how many instruction bytes are
+   generated for each source line, and therefore can use only the
+   DW_LNE_set_address and DW_LNS_fixed_advance_pc line information
+   commands.  Accordingly, we fix this as `1', which is "correct
+   enough" for all architectures, and don't let the target override.  */
+  dw2_asm_output_data (1, 1,
                       "Minimum Instruction Length");
+
   dw2_asm_output_data (1, DWARF_LINE_DEFAULT_IS_STMT_START,
                       "Default is_stmt_start flag");
   dw2_asm_output_data (1, DWARF_LINE_BASE,

diff --git a/gcc/system.h b/gcc/system.h
index 25e9549a006cb100d72bd597ea00847595ffe464..0577708bff495396c83c5b5f1e2dcb6b7f9c223f 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -605,7 +605,7 @@ typedef char _Bool;
        OMIT_EH_TABLE EASY_DIV_EXPR IMPLICIT_FIX_EXPR                      \
        LONGJMP_RESTORE_FROM_STACK MAX_INT_TYPE_SIZE ASM_IDENTIFY_GCC      \
        STDC_VALUE TRAMPOLINE_ALIGN ASM_IDENTIFY_GCC_AFTER_SOURCE          \
-       SLOW_ZERO_EXTEND SUBREG_REGNO_OFFSET
+       SLOW_ZERO_EXTEND SUBREG_REGNO_OFFSET DWARF_LINE_MIN_INSTR_LENGTH
 
 #endif /* IN_GCC */