Added sanitization for my latest changelog entry.

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

diff --git a/gas/literal.c b/gas/literal.c
index d39aa8b96b061f59727de40994f20ffe3760a893..ada59e73630cabc38e34cb99d6c815475d3a00f4 100644 (file)
--- a/gas/literal.c
+++ b/gas/literal.c
@@ -26,12 +26,15 @@
    ever a .lit4?)  On the MIPS, it could be used for .lit4 as well.
 
    The expressions passed here should contain either constants or symbols,
-   *not* a combination of both.  Typically, the constant pool is accessed
+   not a combination of both.  Typically, the constant pool is accessed
    with some sort of GP register, so the size of the pool must be kept down
    if possible.  The exception is section offsets -- if you're storing a
    pointer to the start of .data, for example, and your machine provides
    for 16-bit signed addends, you might want to store .data+32K, so that
-   you can access all of the first 64K of .data with the one pointer...  */
+   you can access all of the first 64K of .data with the one pointer.
+
+   This isn't a requirement, just a guideline that can help keep .o file
+   size down.  */
 
 #include "as.h"
 #include "subsegs.h"
@@ -56,7 +59,10 @@ add_to_literal_pool (sym, addend, sec, size)
   offset = 0;
   /* @@ This assumes all entries in a given section will be of the same
      size...  Probably correct, but unwise to rely on.  */
-  for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next, offset += size)
+  /* This must always be called with the same subsegment.  */
+  for (fixp = frchain_now->fix_root;
+       fixp != (fixS *) NULL;
+       fixp = fixp->fx_next, offset += size)
     {
       if (fixp->fx_addsy == sym && fixp->fx_offset == addend)
        return offset;