From 3098ca6d164fe88826fc2b24fc0b7dadc69f1851 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 3 May 2006 23:52:15 +0000 Subject: * subsegs.h (struct frchain): Delete frch_seg. (frchain_root): Delete. (seg_info): Define as macro. * subsegs.c (frchain_root): Delete. (abs_seg_info, und_seg_info, absolute_frchain): Delete. (subsegs_begin, subseg_change): Adjust for above. (subseg_set_rest): Likewise. Add new frchain structs to seginfo rather than to one big list. (subseg_get): Don't special case abs, und sections. (subseg_new, subseg_force_new): Don't set frchainP here. (seg_info): Delete. (subsegs_print_statistics): Adjust frag chain control list traversal. * debug.c (dmp_frags): Likewise. * dwarf2dbg.c (first_frag_for_seg): Don't start looking for frag at frchain_root. Make use of known frchain ordering. (last_frag_for_seg): Likewise. (get_frag_fix): Likewise. Add seg param. (process_entries, out_debug_aranges): Adjust get_frag_fix calls. * write.c (chain_frchains_together_1): Adjust for struct frchain. (SUB_SEGMENT_ALIGN): Likewise. (subsegs_finish): Adjust frchain list traversal. * config/tc-xtensa.c (xtensa_cleanup_align_frags): Likewise. (xtensa_fix_target_frags, xtensa_mark_narrow_branches): Likewise. (xtensa_mark_zcl_first_insns, xtensa_fix_a0_b_retw_frags): Likewise. (xtensa_fix_b_j_loop_end_frags): Likewise. (xtensa_fix_close_loop_end_frags): Likewise. (xtensa_fix_short_loop_frags, xtensa_sanity_check): Likewise. (retrieve_segment_info): Delete frch_seg initialisation. --- gas/subsegs.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gas/subsegs.h') diff --git a/gas/subsegs.h b/gas/subsegs.h index 23ab4f9cf4..f95028509b 100644 --- a/gas/subsegs.h +++ b/gas/subsegs.h @@ -1,6 +1,6 @@ /* subsegs.h -> subsegs.c - Copyright 1987, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2003, 2005 - Free Software Foundation, Inc. + Copyright 1987, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2003, 2005, + 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -45,7 +45,6 @@ struct frchain /* control building of a frag chain */ struct frag *frch_root; /* 1st struct frag in chain, or NULL */ struct frag *frch_last; /* last struct frag in chain, or NULL */ struct frchain *frch_next; /* next in chain of struct frchain-s */ - segT frch_seg; /* SEG_TEXT or SEG_DATA. */ subsegT frch_subseg; /* subsegment number of this chain */ fixS *fix_root; /* Root of fixups for this subsegment. */ fixS *fix_tail; /* Last fixup for this subsegment. */ @@ -55,9 +54,6 @@ struct frchain /* control building of a frag chain */ typedef struct frchain frchainS; -/* All subsegments' chains hang off here. NULL means no frchains yet. */ -extern frchainS *frchain_root; - /* Frchain we are assembling into now. That is, the current segment's frag chain, even if it contains no (complete) frags. */ extern frchainS *frchain_now; @@ -109,7 +105,10 @@ typedef struct segment_info_struct { #endif } segment_info_type; -extern segment_info_type *seg_info (segT); + +#define seg_info(sec) \ + ((segment_info_type *) bfd_get_section_userdata (stdoutput, sec)) + extern symbolS *section_symbol (segT); extern void subsegs_print_statistics (FILE *); -- cgit v1.2.1