From d94084f79a5fa26e76b3b7697c6674b4223f51f7 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 20 Feb 2002 18:31:24 +0000
Subject: [PATCH] fr30.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.

	* config/fr30/fr30.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* config/sh/sh.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* config/pj/pj.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* config/cris/cris.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Define
	unconditionally.

From-SVN: r49903
---
 gcc/ChangeLog          |  9 +++++++++
 gcc/config/cris/cris.h |  4 +---
 gcc/config/fr30/fr30.h | 10 ----------
 gcc/config/pj/pj.h     |  1 -
 gcc/config/sh/sh.h     |  2 --
 gcc/dwarf2out.c        |  8 ++++----
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f902e89954d..2b0a2b51989 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-20  Tom Tromey  <tromey@redhat.com>
+
+	* config/fr30/fr30.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
+	* config/sh/sh.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
+	* config/pj/pj.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
+	* config/cris/cris.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
+	* dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Define
+	unconditionally.
+
 Wed Feb 20 00:03:25 EST 2002 Alan Matsuoka <alanm@redhat.com>
 
 	* config/rs6000/rs6000.h (LEGITIMATE_OFFSET_ADDRESS_P): Look
diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index e2cb514a7d1..9ddd065dc7f 100644
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -1748,9 +1748,7 @@ call_ ## FUNC (void)						\
 
 
 /* Node: SDB and DWARF */
-
-#define DWARF_LINE_MIN_INSTR_LENGTH 2
-
+/* (no definitions) */
 
 /* Node: Cross-compilation */
 #define REAL_ARITHMETIC
diff --git a/gcc/config/fr30/fr30.h b/gcc/config/fr30/fr30.h
index 34e52a8361b..dd19f757da8 100644
--- a/gcc/config/fr30/fr30.h
+++ b/gcc/config/fr30/fr30.h
@@ -1355,16 +1355,6 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE)
 #define ASM_OUTPUT_ALIGN(STREAM, POWER) \
   fprintf ((STREAM), "\t.p2align %d\n", (POWER))
 
-/*}}}*/ 
-/*{{{  Macros for SDB and Dwarf Output.  */ 
-
-/* Define this macro to allow references to structure, union, or enumeration
-   tags that have not yet been seen to be handled.  Some assemblers choke if
-   forward tags are used, while some require it.  */
-/* #define SDB_ALLOW_FORWARD_REFERENCES */
-
-#define DWARF_LINE_MIN_INSTR_LENGTH 2
-     
 /*}}}*/ 
 /*{{{  Miscellaneous Parameters.  */ 
 
diff --git a/gcc/config/pj/pj.h b/gcc/config/pj/pj.h
index 655ae0d6498..0adf02a3f11 100644
--- a/gcc/config/pj/pj.h
+++ b/gcc/config/pj/pj.h
@@ -1252,7 +1252,6 @@ extern short pj_debugreg_renumber_vec[FIRST_PSEUDO_REGISTER];
 #undef  PREFERRED_DEBUGGING_TYPE 
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 #define DWARF2_UNWIND_INFO 1
-#define DWARF_LINE_MIN_INSTR_LENGTH 1
 
 
 /* varargs and stdarg builtins.  */
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 800f3d9ee7d..880ab4168e1 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -3288,8 +3288,6 @@ extern struct rtx_def *fpscr_rtx;
 #define MD_CAN_REDIRECT_BRANCH(INSN, SEQ) \
   sh_can_redirect_branch ((INSN), (SEQ))
 
-#define DWARF_LINE_MIN_INSTR_LENGTH 2
-
 #if (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__
 /* SH constant pool breaks the devices in crtstuff.c to control section
    in where code resides.  We have to write it as asm code.  */
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 526766b3e5f..4eb18c7c7a8 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3270,10 +3270,10 @@ extern int flag_traditional;
    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.  */
-#ifndef DWARF_LINE_MIN_INSTR_LENGTH
-#define DWARF_LINE_MIN_INSTR_LENGTH 4
-#endif
+   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.  */