Fix gas/ChangeLog

[deliverable/binutils-gdb.git] / gas / subsegs.c

diff --git a/gas/subsegs.c b/gas/subsegs.c
index 00947649d68e5f5632e205bad6c9122e73db74fd..e9c575cdd94f785ecc44e80ee9689b556e89a9f5 100644 (file)
--- a/gas/subsegs.c
+++ b/gas/subsegs.c
@@ -1,13 +1,11 @@
 /* subsegs.c - subsegments -
 /* subsegs.c - subsegments -

-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2016 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -57,7 +55,7 @@ subsegs_begin (void)
  * segment context correct.
  */
 void
  * segment context correct.
  */
 void

-subseg_change (register segT seg, register int subseg)
+subseg_change (segT seg, int subseg)

 {
   segment_info_type *seginfo = seg_info (seg);
   now_seg = seg;
 {
   segment_info_type *seginfo = seg_info (seg);
   now_seg = seg;


@@ -65,7 +63,7 @@ subseg_change (register segT seg, register int subseg)
 
   if (! seginfo)
     {
 
   if (! seginfo)
     {

-      seginfo = xcalloc (1, sizeof (*seginfo));
+      seginfo = (segment_info_type *) xcalloc (1, sizeof (*seginfo));

       seginfo->bfd_section = seg;
       bfd_set_section_userdata (stdoutput, seg, seginfo);
     }
       seginfo->bfd_section = seg;
       bfd_set_section_userdata (stdoutput, seg, seginfo);
     }


@@ -84,7 +82,7 @@ subseg_set_rest (segT seg, subsegT subseg)
   if (frag_now && frchain_now)
     frchain_now->frch_frag_now = frag_now;
 
   if (frag_now && frchain_now)
     frchain_now->frch_frag_now = frag_now;
 

-  assert (frchain_now == 0
+  gas_assert (frchain_now == 0

          || frchain_now->frch_last == frag_now);
 
   subseg_change (seg, (int) subseg);
          || frchain_now->frch_last == frag_now);
 
   subseg_change (seg, (int) subseg);


@@ -103,7 +101,7 @@ subseg_set_rest (segT seg, subsegT subseg)
     {
       /* This should be the only code that creates a frchainS.  */
 
     {
       /* This should be the only code that creates a frchainS.  */
 

-      newP = obstack_alloc (&frchains, sizeof (frchainS));
+      newP = (frchainS *) obstack_alloc (&frchains, sizeof (frchainS));

       newP->frch_subseg = subseg;
       newP->fix_root = NULL;
       newP->fix_tail = NULL;
       newP->frch_subseg = subseg;
       newP->fix_root = NULL;
       newP->fix_tail = NULL;


@@ -125,7 +123,7 @@ subseg_set_rest (segT seg, subsegT subseg)
   frchain_now = frcP;
   frag_now = frcP->frch_frag_now;
 
   frchain_now = frcP;
   frag_now = frcP->frch_frag_now;
 

-  assert (frchain_now->frch_last == frag_now);
+  gas_assert (frchain_now->frch_last == frag_now);

 }
 
 /*
 }
 
 /*


@@ -167,7 +165,7 @@ subseg_get (const char *segname, int force_new)
   if (! seginfo)
     {
       secptr->output_section = secptr;
   if (! seginfo)
     {
       secptr->output_section = secptr;

-      seginfo = xcalloc (1, sizeof (*seginfo));
+      seginfo = (segment_info_type *) xcalloc (1, sizeof (*seginfo));

       seginfo->bfd_section = secptr;
       bfd_set_section_userdata (stdoutput, secptr, seginfo);
     }
       seginfo->bfd_section = secptr;
       bfd_set_section_userdata (stdoutput, secptr, seginfo);
     }


@@ -280,7 +278,7 @@ seg_not_empty_p (segT sec ATTRIBUTE_UNUSED)
 
   if (!seginfo)
     return 0;
 
   if (!seginfo)
     return 0;

-  
+

   for (chain = seginfo->frchainP; chain; chain = chain->frch_next)
     {
       for (frag = chain->frch_root; frag; frag = frag->fr_next)
   for (chain = seginfo->frchainP; chain; chain = chain->frch_next)
     {
       for (frag = chain->frch_root; frag; frag = frag->fr_next)