Fix more problems from GC diffs

From-SVN: r28820

18 files changed, 42 insertions, 23 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1537c9e..89cbb2b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+Tue Aug 24 12:35:20 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* tree.h (current_function_calls_setjmp,
+ 	current_function_calls_longjmp): Delete declarations.
+	* dsp16xx.c: Include "function.h".
+	* elxsi.c: Likewise.
+	* gmicro.c: Likewise.
+	* h8300.c: Likewise.
+	* i370.c: Likewise.
+	* m32r.c: Likewise.
+	* mn10200.c: Likewise.
+	* mn10300.c: Likewise.
+	* ns32k.c: Likewise.
+	* spur.c: Likewise.
+	* v850.c: Likewise.
+
+	* rtl.h (rtx_equal_function_value_matters): Declare.
+	* toplev.c (rtx_equal_function_value_matters): Don't declare.
+	* cse.c: Likewise.
+	* function.c: Likewise.
+	* emit-rtl.c: Likewise.
+
 Tue Aug 24 02:47:44 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* expr.c (convert_move): Fix arguments to TRULY_NOOP_TRUNCATION
diff --git a/gcc/config/dsp16xx/dsp16xx.c b/gcc/config/dsp16xx/dsp16xx.c
index 69f40c7..30e72b4 100644
--- a/gcc/config/dsp16xx/dsp16xx.c
+++ b/gcc/config/dsp16xx/dsp16xx.c
@@ -33,6 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-attr.h"
 #include "tree.h"
 #include "expr.h"
+#include "function.h"
 #include "flags.h"
 
 char *text_seg_name;
diff --git a/gcc/config/elxsi/elxsi.c b/gcc/config/elxsi/elxsi.c
index b881853..5526beb 100644
--- a/gcc/config/elxsi/elxsi.c
+++ b/gcc/config/elxsi/elxsi.c
@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include <stdio.h>
 #include "rtl.h"
+#include "function.h"
 
 extern char *reg_names[];
 rtx cmp_op0=0, cmp_op1=0;
diff --git a/gcc/config/gmicro/gmicro.c b/gcc/config/gmicro/gmicro.c
index 7a81a7d..ed60e49 100644
--- a/gcc/config/gmicro/gmicro.c
+++ b/gcc/config/gmicro/gmicro.c
@@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include "conditions.h"
 #include "insn-flags.h"
 #include "output.h"
+#include "function.h"
 #include "insn-attr.h"
 
 mypr (s, a1, a2, a3, a4, a5)
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 5fb4a62..4fac366 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include <stdio.h>
 #include "rtl.h"
+#include "tree.h"
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "real.h"
@@ -35,7 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
-#include "tree.h"
+#include "function.h"
 #include "obstack.h"
 
 /* Forward declarations.  */
diff --git a/gcc/config/i370/i370.c b/gcc/config/i370/i370.c
index 8287c92..5c0e576 100644
--- a/gcc/config/i370/i370.c
+++ b/gcc/config/i370/i370.c
@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-flags.h"
 #include "output.h"
 #include "insn-attr.h"
+#include "function.h"
 #include "flags.h"
 #include "recog.h"
 #include <time.h>
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 6dc5ff4..685de33 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-attr.h"
 #include "flags.h"
 #include "expr.h"
+#include "function.h"
 #include "recog.h"
 
 /* Save the operands last given to a compare for use when we
diff --git a/gcc/config/mn10200/mn10200.c b/gcc/config/mn10200/mn10200.c
index 6e91b8e..26205af 100644
--- a/gcc/config/mn10200/mn10200.c
+++ b/gcc/config/mn10200/mn10200.c
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include <stdio.h>
 #include "rtl.h"
+#include "tree.h"
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "real.h"
@@ -33,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
-#include "tree.h"
+#include "function.h"
 #include "obstack.h"
 
 /* Global registers known to hold the value zero.
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index cf84e48..8703bf0 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include <stdio.h>
 #include "rtl.h"
+#include "tree.h"
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "real.h"
@@ -33,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
-#include "tree.h"
+#include "function.h"
 #include "obstack.h"
 
 /* The size of the callee register save area.  Right now we save everything
diff --git a/gcc/config/ns32k/ns32k.c b/gcc/config/ns32k/ns32k.c
index a0011f1..cfc7cd2 100644
--- a/gcc/config/ns32k/ns32k.c
+++ b/gcc/config/ns32k/ns32k.c
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "insn-attr.h"
 #include "tree.h"
+#include "function.h"
 #include "expr.h"
 #include "flags.h"
 
diff --git a/gcc/config/spur/spur.c b/gcc/config/spur/spur.c
index 83e37b8..2e3fe38 100644
--- a/gcc/config/spur/spur.c
+++ b/gcc/config/spur/spur.c
@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #include "conditions.h"
 #include "insn-flags.h"
 #include "output.h"
+#include "function.h"
 #include "insn-attr.h"
 
 static rtx find_addr_reg ();
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 7222bbb..8ccbcd8 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
+#include "function.h"
 #include "obstack.h"
 #include "toplev.h"
 
diff --git a/gcc/cse.c b/gcc/cse.c
index b6b8035..29a8e9f 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -693,8 +693,6 @@ static void check_fold_consts	PROTO((PTR));
 static struct cse_reg_info* get_cse_reg_info PROTO((int));
 static void free_cse_reg_info   PROTO((splay_tree_value));
 static void flush_hash_table	PROTO((void));
-
-extern int rtx_equal_function_value_matters;
 
 /* Dump the expressions in the equivalence class indicated by CLASSP.
    This function is used only for debugging.  */
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index cee784d..b028556 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -184,8 +184,6 @@ static rtx free_insn;
 #define last_filename (current_function->emit->x_last_filename)
 #define first_label_num (current_function->emit->x_first_label_num)
 
-extern int rtx_equal_function_value_matters;
-
 static rtx make_jump_insn_raw		PROTO((rtx));
 static rtx make_call_insn_raw		PROTO((rtx));
 static rtx find_line_note		PROTO((rtx));
diff --git a/gcc/function.c b/gcc/function.c
index 6c5792a..cae26e5 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -120,12 +120,6 @@ static int virtuals_instantiated;
 void (*save_machine_status) PROTO((struct function *));
 void (*restore_machine_status) PROTO((struct function *));
 
-/* Nonzero if we need to distinguish between the return value of this function
-   and the return value of a function called by this function.  This helps
-   integrate.c  */
-
-extern int rtx_equal_function_value_matters;
-
 /* The FUNCTION_DECL for an inline function currently being expanded.  */
 tree inline_function_decl;
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 5d7afa2..c5fc12a 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -818,6 +818,12 @@ extern const char * const note_insn_name[];
 /* For a NOTE_INSN_LIVE note, the original basic block number.  */
 #define RANGE_LIVE_ORIG_BLOCK(INSN) (XINT (INSN, 1))
 
+/* Nonzero if we need to distinguish between the return value of this function
+   and the return value of a function called by this function.  This helps
+   integrate.c.
+   This is 1 until after the rtl generation pass.  */
+extern int rtx_equal_function_value_matters;
+
 /* Generally useful functions.  */
 
 /* The following functions accept a wide integer argument.  Rather than
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 4e1b1e1..e4943ca 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -137,8 +137,6 @@ You Lose!  You must define PREFERRED_DEBUGGING_TYPE!
 #define DIR_SEPARATOR '/'
 #endif
 
-extern int rtx_equal_function_value_matters;
-
 #if ! (defined (VMS) || defined (OS2))
 extern char **environ;
 #endif
diff --git a/gcc/tree.h b/gcc/tree.h
index 3777d0e..82d3cf6 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1940,14 +1940,6 @@ extern int immediate_size_expand;
 
 extern tree current_function_decl;
 
-/* Nonzero if function being compiled can call setjmp.  */
-
-extern int current_function_calls_setjmp;
-
-/* Nonzero if function being compiled can call longjmp.  */
-
-extern int current_function_calls_longjmp;
-
 /* Nonzero means all ..._TYPE nodes should be allocated permanently.  */
 
 extern int all_types_permanent;