X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fxcofflink.c;h=b1cac27b2dc53357c386e00acc1563a919c9a5a1;hb=0bf60745767d2465c81ee57ae7705a62d6d8fafe;hp=127ac3d67d525a4793bcedd41811f8e862d34ad1;hpb=5daa8fe797a3f310f9e53282e097b52583ab5109;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
index 127ac3d67d..b1cac27b2d 100644
--- a/bfd/xcofflink.c
+++ b/bfd/xcofflink.c
@@ -17,7 +17,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.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -5380,7 +5380,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
     {
       o->reloc_count = 0;
       o->lineno_count = 0;
-      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)
 	    {
@@ -5436,19 +5436,18 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
 	{
 	  bfd_boolean saw_contents;
 	  int indx;
-	  asection **op;
 	  file_ptr sofar;
 
 	  /* Insert .pad sections before every section which has
 	     contents and is loaded, if it is preceded by some other
 	     section which has contents and is loaded.  */
 	  saw_contents = TRUE;
-	  for (op = &abfd->sections; *op != NULL; op = &(*op)->next)
+	  for (o = abfd->sections; o != NULL; o = o->next)
 	    {
-	      if (strcmp ((*op)->name, ".pad") == 0)
+	      if (strcmp (o->name, ".pad") == 0)
 		saw_contents = FALSE;
-	      else if (((*op)->flags & SEC_HAS_CONTENTS) != 0
-		       && ((*op)->flags & SEC_LOAD) != 0)
+	      else if ((o->flags & SEC_HAS_CONTENTS) != 0
+		       && (o->flags & SEC_LOAD) != 0)
 		{
 		  if (! saw_contents)
 		    saw_contents = TRUE;
@@ -5465,9 +5464,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
 		      n->alignment_power = 0;
 
 		      bfd_section_list_remove (abfd, n);
-		      bfd_section_list_insert_before (abfd, *op, n);
-
-		      op = &n->next;
+		      bfd_section_list_insert_before (abfd, o, n);
 		      saw_contents = FALSE;
 		    }
 		}
@@ -5672,7 +5669,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
      for a single input file at once.  */
   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->owner->xvec == abfd->xvec)