* coffcode.h (bfd_coff_backend_data): Added new arguments to

	_bfd_coff_swap_aux_in and _bfd_coff_swap_aux_out: aux index number
	and number of aux entries.
	(bfd_coff_swap_aux_in, bfd_coff_swap_aux_out): Changed
	accordingly.
	* libcoff.h: Rebuilt.
	* coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Accept new
	arguments.  If RS6000COFF_C, only treat C_EXT and C_HIDEXT
	specially if this is the last aux entry.
	* coffgen.c (coff_write_symbol, coff_get_normalized_symtab): Pass
	new arguments to swap_aux functions.

1 files changed, 37 insertions, 12 deletions

diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index fd80f71..8955181 100644
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -92,7 +92,10 @@ extern unsigned int coff_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
 extern asymbol *coff_make_empty_symbol PARAMS ((bfd *));
 extern void coff_print_symbol PARAMS ((bfd *, PTR filep, asymbol *,
 				       bfd_print_symbol_type how));
-extern asymbol *coff_make_debug_symbol PARAMS ((bfd *, PTR, unsigned long));
+extern void coff_get_symbol_info PARAMS ((bfd *, asymbol *,
+					  symbol_info *ret));
+extern asymbol *coff_bfd_make_debug_symbol PARAMS ((bfd *, PTR,
+						    unsigned long));
 extern boolean coff_find_nearest_line PARAMS ((bfd *,
 					       asection *,
 					       asymbol **,
@@ -103,11 +106,17 @@ extern boolean coff_find_nearest_line PARAMS ((bfd *,
 extern int coff_sizeof_headers PARAMS ((bfd *, boolean reloc));
 extern boolean bfd_coff_reloc16_relax_section PARAMS ((bfd *,
 						       asection *,
+						       struct bfd_link_info *,
 						       asymbol **));
 extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_seclet *, bfd_byte *, boolean relocateable));
+  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
+	   bfd_byte *, boolean relocateable, asymbol **));
 extern bfd_vma bfd_coff_reloc16_get_value PARAMS ((arelent *,
-						   struct bfd_seclet *));
+						   struct bfd_link_info *,
+						   asection *));
+extern void bfd_perform_slip PARAMS ((asymbol **s, unsigned int slip,
+				      asection *input_section,
+				      bfd_vma value));
 
 /* And more taken from the source .. */
 
@@ -155,10 +164,12 @@ boolean done_lineno;
 typedef struct 
 {
   void (*_bfd_coff_swap_aux_in) PARAMS ((
-       bfd            *abfd ,
+       bfd            *abfd,
        PTR             ext,
        int             type,
-       int             class ,
+       int             class,
+       int             indaux,
+       int             numaux,
        PTR             in));
 
   void (*_bfd_coff_swap_sym_in) PARAMS ((
@@ -176,6 +187,8 @@ typedef struct
        PTR	in,
        int    	type,
        int    	class,
+       int     indaux,
+       int     numaux,
        PTR    	ext));
 
  unsigned int (*_bfd_coff_swap_sym_out) PARAMS ((
@@ -254,17 +267,25 @@ typedef struct
        struct internal_syment *sym));
  void (*_bfd_coff_reloc16_extra_cases) PARAMS ((
        bfd     *abfd,
-       struct bfd_seclet *seclet,
+       struct bfd_link_info *link_info,
+       struct bfd_link_order *link_order,
        arelent *reloc,
        bfd_byte *data,
        unsigned int *src_ptr,
        unsigned int *dst_ptr));
+ int (*_bfd_coff_reloc16_estimate) PARAMS ((
+       asection *input_section,
+       asymbol **symbols,
+       arelent *r,
+       unsigned int shrink,
+       struct bfd_link_info *link_info));
+
 } bfd_coff_backend_data;
 
 #define coff_backend_info(abfd) ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
 
-#define bfd_coff_swap_aux_in(a,e,t,c,i) \
-        ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,i))
+#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
+        ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
 
 #define bfd_coff_swap_sym_in(a,e,i) \
         ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
@@ -278,8 +299,8 @@ typedef struct
 #define bfd_coff_swap_lineno_out(abfd, i, o) \
         ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
 
-#define bfd_coff_swap_aux_out(abfd, i, t,c,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_aux_out) (abfd, i,t,c, o))
+#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
+        ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
 
 #define bfd_coff_swap_sym_out(abfd, i,o) \
         ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
@@ -332,7 +353,11 @@ typedef struct
 #define bfd_coff_symname_in_debug(abfd, sym)\
         ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
 
-#define bfd_coff_reloc16_extra_cases(abfd, seclet, reloc, data, src_ptr, dst_ptr)\
+#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)\
         ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
-         (abfd, seclet, reloc, data, src_ptr, dst_ptr))
+         (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
+
+#define bfd_coff_reloc16_estimate(abfd, section, symbols, reloc, shrink, link_info)\
+        ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
+         (section, symbols, reloc, shrink, link_info))