2003-08-05 Jason Eckhardt <jle@rice.edu>

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

diff --git a/gas/frags.c b/gas/frags.c
index f2f8cfefff53d4b365b08c65af841fed434aa428..47f828a02ba3aa8f79335482fe2202b5c8222313 100644 (file)
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -1,5 +1,6 @@
 /* frags.c - manage frags -
-   Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2003
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -35,6 +36,26 @@ frag_init ()
   bss_address_frag.fr_type = rs_fill;
 }
 \f
+/* Check that we're not trying to assemble into a section that can't
+   allocate frags (currently, this is only possible in the absolute
+   section), or into an mri common.  */
+
+static void
+frag_alloc_check (const struct obstack *ob)
+{
+  if (ob->chunk_size == 0)
+    {
+      as_bad (_("attempt to allocate data in absolute section"));
+      subseg_set (text_section, 0);
+    }
+
+  if (mri_common_symbol != NULL)
+    {
+      as_bad (_("attempt to allocate data in common section"));
+      mri_common_symbol = NULL;
+    }
+}
+
 /* Allocate a frag on the specified obstack.
    Call this routine from everywhere else, so that all the weird alignment
    hackery can be done in just one place.  */
@@ -83,7 +104,7 @@ frag_grow (nchars)
       frchain_now->frch_obstack.chunk_size = oldc;
     }
   if (obstack_room (&frchain_now->frch_obstack) < nchars)
-    as_fatal (_("Can't extend frag %d. chars"), nchars);
+    as_fatal (_("can't extend frag %u chars"), nchars);
 }
 \f
 /* Call this to close off a completed frag, and start up a new (empty)
@@ -162,18 +183,7 @@ frag_more (nchars)
 {
   register char *retval;
 
-  if (now_seg == absolute_section)
-    {
-      as_bad (_("attempt to allocate data in absolute section"));
-      subseg_set (text_section, 0);
-    }
-
-  if (mri_common_symbol != NULL)
-    {
-      as_bad (_("attempt to allocate data in common section"));
-      mri_common_symbol = NULL;
-    }
-
+  frag_alloc_check (&frchain_now->frch_obstack);
   frag_grow (nchars);
   retval = obstack_next_free (&frchain_now->frch_obstack);
   obstack_blank_fast (&frchain_now->frch_obstack, nchars);
@@ -375,6 +385,7 @@ void
 frag_append_1_char (datum)
      int datum;
 {
+  frag_alloc_check (&frchain_now->frch_obstack);
   if (obstack_room (&frchain_now->frch_obstack) <= 1)
     {
       frag_wane (frag_now);