X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Faoutx.h;h=4079147d30ec5566db745867cc90db92cb11dfeb;hb=3c9b82baee30a1d3cfeb419643c6363dc9267208;hp=f08171c9b3a277bef996808cbd44102920c17141;hpb=116c20d240af833e0a1f1f959951f57b6e465782;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index f08171c9b3..4079147d30 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /*
 SECTION
@@ -730,11 +730,6 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
 	arch_flags = M_386;
       break;
 
-    case bfd_arch_a29k:
-      if (machine == 0)
-	arch_flags = M_29K;
-      break;
-
     case bfd_arch_arm:
       if (machine == 0)
 	arch_flags = M_ARM;
@@ -848,7 +843,6 @@ NAME (aout, set_arch_mach) (bfd *abfd,
   switch (arch)
     {
     case bfd_arch_sparc:
-    case bfd_arch_a29k:
     case bfd_arch_mips:
       obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
       break;
@@ -5318,11 +5312,11 @@ NAME (aout, final_link) (bfd *abfd,
     {
       if (obj_textsec (abfd) != NULL)
 	trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
-						 ->link_order_head)
+						 ->map_head.link_order)
 		   * obj_reloc_entry_size (abfd));
       if (obj_datasec (abfd) != NULL)
 	drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
-						 ->link_order_head)
+						 ->map_head.link_order)
 		   * obj_reloc_entry_size (abfd));
     }
 
@@ -5414,7 +5408,7 @@ NAME (aout, final_link) (bfd *abfd,
      include.  */
   for (o = abfd->sections; o != NULL; o = o->next)
     {
-      for (p = o->link_order_head; p != NULL; p = p->next)
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
 	if (p->type == bfd_indirect_link_order)
 	  p->u.indirect.section->linker_mark = TRUE;
     }
@@ -5422,7 +5416,7 @@ NAME (aout, final_link) (bfd *abfd,
   have_link_order_relocs = FALSE;
   for (o = abfd->sections; o != NULL; o = o->next)
     {
-      for (p = o->link_order_head;
+      for (p = o->map_head.link_order;
 	   p != NULL;
 	   p = p->next)
 	{
@@ -5467,7 +5461,7 @@ NAME (aout, final_link) (bfd *abfd,
     {
       for (o = abfd->sections; o != NULL; o = o->next)
 	{
-	  for (p = o->link_order_head;
+	  for (p = o->map_head.link_order;
 	       p != NULL;
 	       p = p->next)
 	    {