Fix more problems from GC diffs

From-SVN: r28820

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1537c9e6a59fb993f648cdbef4b015ee53101725..89cbb2bbc39d19477b91c35b1942ce51582d5198 100644 (file)
--- 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 69f40c7fe5fd489a2b2d92f2801c10d724e31132..30e72b494827520ce49c9a3c9fe858540c04a40e 100644 (file)
--- 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 b8818531b84c90fb002556905eab80b9140833fd..5526beb6b4f2f4686ec4816dc62ad76b03b86296 100644 (file)
--- 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 7a81a7d0ef8de3e8b8824885c96ea241139e063e..ed60e494bf17059f06d55f6173815f6938c86242 100644 (file)
--- 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 5fb4a628c468733767e33d9c507df620bf30a135..4fac366f71de31066855181ff88d4d8fe0ffd47a 100644 (file)
--- 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 8287c92e09fccb80ce068af899c3ff0f9779672e..5c0e5760f4009d6f24ef25fc696eb72ca73edf7d 100644 (file)
--- 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 6dc5ff43c6a5b0be6e2618d3fa18b34b7c00b5aa..685de3346294afc597328b3f78894c69e0b92615 100644 (file)
--- 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 6e91b8e6418ac8c7549fed9a6f236067c764baef..26205afeedb5a967643a9ab09b92913edff04d12 100644 (file)
--- 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 cf84e4810a12268e5d1133d4da34a3f29651a96f..8703bf03134071a9ede814d8c28ff521cc41821b 100644 (file)
--- 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 a0011f103aba4e3f1ce442623f6dd122aa7ed6a3..cfc7cd2a12dbfe3e6b359f9be8cd6fbe116fbd16 100644 (file)
--- 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 83e37b8aeef53c932613114063db37a9a3022728..2e3fe385727e436f31a4ca8b94f49d4a73aab7cc 100644 (file)
--- 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 7222bbb3193a4a2d4ceb1dbdc3c0005cb39d0b9c..8ccbcd87210f606f284d5f2b4e8f3d74ba095559 100644 (file)
--- 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 b6b80350139951d2ef2ffc96f0715d50efc31a49..29a8e9f711c8027c0d72e316efbe9333b74f58ec 100644 (file)
--- 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;
 \f
 /* 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 cee784d580bdaf2772f44abebe7254d1ceabe3db..b028556cb162f8e0613ed9da2ec2667efa028494 100644 (file)
--- 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 6c5792a81a5ed421830c7b17c0865ee185858ad3..cae26e5cb8076730d4976a58e2847e858e42a3d0 100644 (file)
--- 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 5d7afa2f82636c69fe11734f22eb21a00e2af9d0..c5fc12afb65e65c2e9adc7b4da71ff720a240995 100644 (file)
--- 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))
 \f
+/* 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 4e1b1e1c0f5d80e6b7d5cf65d5a40d72aa535a5c..e4943ca528848f51ec4868b056081cee232ce89d 100644 (file)
--- 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 3777d0e82457169cdce0839d51ad82cc3157f9b1..82d3cf640d1d6642a38edac20991575c03e6b72f 100644 (file)
--- 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;