* subsegs.c (abs_seg_info, und_seg_info): Define if BFD_ASSEMBLER.

	(subseg_change): Store seg_info for bfd_abs_section_ptr in
	abs_seg_info, and store seg_info for bfd_und_section_ptr in
	und_seg_info.
	(subseg_get): Likewise.  Also, don't set output_section if it is
	already set.
	(seg_info): Define as function.
	* subsegs.h (seg_info): Declare as function rather than defining
	as macro.
	* write.c (relax_and_size_seg): Call seg_info rather than
	bfd_get_section_userdata.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5058caeb90c1940df50c5a47cdd2c91889ead3bd..646f57416314731ac75468ef2e50df5aa1fe775c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jun 21 11:32:18 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+       * subsegs.c (abs_seg_info, und_seg_info): Define if BFD_ASSEMBLER.
+       (subseg_change): Store seg_info for bfd_abs_section_ptr in
+       abs_seg_info, and store seg_info for bfd_und_section_ptr in
+       und_seg_info.
+       (subseg_get): Likewise.  Also, don't set output_section if it is
+       already set.
+       (seg_info): Define as function.
+       * subsegs.h (seg_info): Declare as function rather than defining
+       as macro.
+       * write.c (relax_and_size_seg): Call seg_info rather than
+       bfd_get_section_userdata.
+
 Mon Jun 20 16:30:54 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
        * configure.in (ppc-*-elf*): New target, like -sysv4*.

diff --git a/gas/subsegs.c b/gas/subsegs.c
index 3b4581c4bcf535fdac49ccbe8b1fa778b9cb5f6d..55e111e9819a6b5ca6e00241064d6fde201167dc 100644 (file)
--- a/gas/subsegs.c
+++ b/gas/subsegs.c
@@ -57,6 +57,13 @@ char *const seg_name[] =
   "register",
   "",
 };                             /* Used by error reporters, dumpers etc. */
+#else /* BFD_ASSEMBLER */
+
+/* Gas segment information for bfd_abs_section_ptr and
+   bfd_und_section_ptr.  */
+static segment_info_type *abs_seg_info;
+static segment_info_type *und_seg_info;
+
 #endif /* BFD_ASSEMBLER */
 
 static void subseg_set_rest PARAMS ((segT, subsegT));
@@ -140,10 +147,16 @@ subseg_change (seg, subseg)
        seginfo = (segment_info_type *) xmalloc (sizeof (*seginfo));
        if (! seginfo)
          abort ();
-       seginfo->fix_root = 0;
+       seginfo->fix_root = NULL;
+       seginfo->fix_tail = NULL;
        seginfo->bfd_section = seg;
        seginfo->sym = 0;
-       bfd_set_section_userdata (stdoutput, seg, (char *) seginfo);
+       if (seg == bfd_abs_section_ptr)
+         abs_seg_info = seginfo;
+       else if (seg == bfd_und_section_ptr)
+         und_seg_info = seginfo;
+       else
+         bfd_set_section_userdata (stdoutput, seg, (PTR) seginfo);
       }
   }
 #else
@@ -402,12 +415,21 @@ subseg_get (segname, force_new)
   seginfo = seg_info (secptr);
   if (! seginfo)
     {
-      secptr->output_section = secptr;
+      /* Check whether output_section is set first because secptr may
+         be bfd_abs_section_ptr.  */
+      if (secptr->output_section != secptr)
+       secptr->output_section = secptr;
       seginfo = (segment_info_type *) xmalloc (sizeof (*seginfo));
       memset ((char *) seginfo, 0, sizeof(seginfo));
       seginfo->fix_root = NULL;
+      seginfo->fix_tail = NULL;
       seginfo->bfd_section = secptr;
-      bfd_set_section_userdata (stdoutput, secptr, (char *) seginfo);
+      if (secptr == bfd_abs_section_ptr)
+       abs_seg_info = seginfo;
+      else if (secptr == bfd_und_section_ptr)
+       und_seg_info = seginfo;
+      else
+       bfd_set_section_userdata (stdoutput, secptr, (PTR) seginfo);
       seginfo->frchainP = NULL;
       seginfo->lineno_list_head = seginfo->lineno_list_tail = NULL;
       seginfo->sym = NULL;
@@ -463,6 +485,20 @@ subseg_set (secptr, subseg)
 #define obj_sec_sym_ok_for_reloc(SEC)  0
 #endif
 
+/* Get the gas information we are storing for a section.  */
+
+segment_info_type *
+seg_info (sec)
+     segT sec;
+{
+  if (sec == bfd_abs_section_ptr)
+    return abs_seg_info;
+  else if (sec == bfd_und_section_ptr)
+    return und_seg_info;
+  else
+    return (segment_info_type *) bfd_get_section_userdata (stdoutput, sec);
+}
+
 symbolS *
 section_symbol (sec)
      segT sec;