Fix output.h #ifdef RTX_CODE, TREE_CODE (was: Re: Patch: fix problemswith default_assemble_visibility)

[Hans-Peter Nilsson <hp at bitrange dot com>]

On Sat, 14 Sep 2002, Kaveh R. Ghazi wrote:

> More fallout from the recent default_assemble_visibility stuff.

> 	* avr.c, dsp16xx.c, i960.c, ip2k.c, m88k.c, mmix.c, ns32k.c,
> 	pdp11.c: Move tree.h above output.h.


IMHO the patch below is preferrable to target tweaking.  Passes
point-of-failure for mmix-knuth-mmixware.  See also
<URL:http://gcc.gnu.org/ml/gcc-patches/2002-09/msg00783.html>.

	* output.h: Remove #ifdef RTX_CODE and #ifdef TREE_CODE.

Index: output.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/output.h,v
retrieving revision 1.111
diff -p -c -r1.111 output.h
*** output.h	8 Sep 2002 09:30:20 -0000	1.111
--- output.h	14 Sep 2002 20:44:59 -0000
*************** extern int dbr_sequence_length	PARAMS ((
*** 46,52 ****
  /* Indicate that branch shortening hasn't yet been done.  */
  extern void init_insn_lengths	PARAMS ((void));

- #ifdef RTX_CODE
  /* Obtain the current length of an insn.  If branch shortening has been done,
     get its actual length.  Otherwise, get its maximum length.  */
  extern int get_attr_length	PARAMS ((rtx));
--- 46,51 ----
*************** extern void find_basic_blocks		PARAMS ((
*** 147,153 ****
  extern bool cleanup_cfg			PARAMS ((int));
  extern bool delete_unreachable_blocks	PARAMS ((void));
  extern void check_function_return_warnings PARAMS ((void));
- #endif

  /* Functions in varasm.c.  */

--- 146,151 ----
*************** extern void sdata_section PARAMS ((void)
*** 211,217 ****
  extern void rdata_section PARAMS ((void));
  #endif

- #ifdef TREE_CODE
  /* Tell assembler to change to section NAME for DECL.
     If DECL is NULL, just switch to section NAME.
     If NAME is NULL, get the name from DECL.
--- 209,214 ----
*************** extern void mergeable_constant_section	P
*** 234,240 ****
  extern void declare_weak		PARAMS ((tree));
  /* Merge weak status.  */
  extern void merge_weak			PARAMS ((tree, tree));
- #endif /* TREE_CODE */

  /* Emit any pending weak declarations.  */
  extern void weak_finish			PARAMS ((void));
--- 231,236 ----
*************** extern void weak_finish			PARAMS ((void)
*** 248,254 ****
     Prefixes such as % are optional.  */
  extern int decode_reg_name		PARAMS ((const char *));

- #ifdef TREE_CODE
  /* Make the rtl for variable VAR be volatile.
     Use this only for static variables.  */
  extern void make_var_volatile		PARAMS ((tree));
--- 244,249 ----
*************** extern void assemble_variable		PARAMS ((
*** 289,295 ****
     (Most assemblers don't need this, so we normally output nothing.)
     Do nothing if DECL is not external.  */
  extern void assemble_external		PARAMS ((tree));
- #endif /* TREE_CODE */

  /* Assemble code to leave SIZE bytes of zeros.  */
  extern void assemble_zeros		PARAMS ((int));
--- 284,289 ----
*************** extern void assemble_eh_align		PARAMS ((
*** 301,310 ****
  /* Assemble a string constant with the specified C string as contents.  */
  extern void assemble_string		PARAMS ((const char *, int));

- #ifdef RTX_CODE
  /* Similar, for calling a library function FUN.  */
  extern void assemble_external_libcall	PARAMS ((rtx));
- #endif

  /* Assemble a label named NAME.  */
  extern void assemble_label		PARAMS ((const char *));
--- 295,302 ----
*************** extern void assemble_name		PARAMS ((FILE
*** 326,332 ****
     be followed immediately by the object's initial value.  */
  extern const char *integer_asm_op	PARAMS ((int, int));

- #ifdef RTX_CODE
  /* Use directive OP to assemble an integer object X.  Print OP at the
     start of the line, followed immediately by the value of X.  */
  extern void assemble_integer_with_op	PARAMS ((const char *, rtx));
--- 318,323 ----
*************** extern void assemble_real		PARAMS ((REAL
*** 352,358 ****
  					         enum machine_mode,
  						 unsigned));
  #endif
- #endif

  /* Start deferring output of subconstants.  */
  extern void defer_addressed_constants	PARAMS ((void));
--- 343,348 ----
*************** extern int get_pool_size		PARAMS ((void)
*** 368,374 ****
  extern rtx peephole			PARAMS ((rtx));
  #endif

- #ifdef TREE_CODE
  /* Write all the constants in the constant pool.  */
  extern void output_constant_pool	PARAMS ((const char *, tree));

--- 358,363 ----
*************** extern tree initializer_constant_valid_p
*** 393,401 ****
     ALIGN is the alignment in bits that may be assumed for the data.  */
  extern void output_constant		PARAMS ((tree, HOST_WIDE_INT,
  						 unsigned int));
- #endif

- #ifdef RTX_CODE
  /* When outputting delayed branch sequences, this rtx holds the
     sequence being output.  It is null when no delayed branch
     sequence is being output, so it can be used as a test in the
--- 382,388 ----
*************** extern void output_constant		PARAMS ((tr
*** 403,409 ****

     This variable is defined  in final.c.  */
  extern rtx final_sequence;
- #endif

  /* The line number of the beginning of the current function.  Various
     md code needs this so that it can output relative linenumbers.  */
--- 390,395 ----

brgds, H-P