diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 903f727c5c..d1297dabb0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb  1 12:21:00 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffread.c (read_one_sym): bfd_coff_swap_aux_in now takes
+	additional arguments.
+	* xcoffread.c (read_xcoff_symtab, read_symbol_lineno): Likewise.
+
 Mon Jan 31 16:10:41 1994  Stu Grossman  (grossman at cygnus.com)
 
 	* sparc-stub.c:  Remove unnecessary #include of memory.h.
diff --git a/gdb/coffread.c b/gdb/coffread.c
index 74e1ce81e9..0797a931a9 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -1118,7 +1118,7 @@ read_one_sym (cs, sym, aux)
     {
     fread (temp_aux, local_auxesz, 1, nlist_stream_global);
     bfd_coff_swap_aux_in (symfile_bfd, temp_aux, sym->n_type, sym->n_sclass,
-			  (char *)aux);
+			  0, cs->c_naux, (char *)aux);
     /* If more than one aux entry, read past it (only the first aux
        is important). */
     for (i = 1; i < cs->c_naux; i++)
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index aac55247ac..e024636f98 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -1128,7 +1128,7 @@ read_xcoff_symtab (objfile, nsyms)
     /* if explicitly specified as a function, treat is as one. */
     if (ISFCN(cs->c_type) && cs->c_sclass != C_TPDEF) {
       bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
-			    &main_aux);
+			    0, cs->c_naux, &main_aux);
       goto function_entry_point;
     }
 
@@ -1144,7 +1144,7 @@ read_xcoff_symtab (objfile, nsyms)
 
 	/* Convert the auxent to something we can access.  */
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
-			      &main_aux);
+			      0, cs->c_naux, &main_aux);
 
 	switch (CSECT_SMTYP (&main_aux)) {
 
@@ -1410,7 +1410,7 @@ function_entry_point:
       if (STREQ (cs->c_name, ".bf")) {
 
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
-			      &main_aux);
+			      0, cs->c_naux, &main_aux);
 
 	within_function = 1;
 
@@ -1426,7 +1426,7 @@ function_entry_point:
       else if (STREQ (cs->c_name, ".ef")) {
 
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
-			      &main_aux);
+			      0, cs->c_naux, &main_aux);
 
 	/* the value of .ef is the address of epilogue code;
 	   not useful for gdb */
@@ -1784,7 +1784,8 @@ gotit:
   /* take aux entry and return its lineno */
   symno++;
   bfd_coff_swap_aux_in (symfile_bfd, symtbl+(symno*local_symesz),
-			symbol->n_type, symbol->n_sclass, main_aux);
+			symbol->n_type, symbol->n_sclass,
+			0, symbol->n_numaux, main_aux);
 
   return main_aux->x_sym.x_misc.x_lnsz.x_lnno;
 }