Convert static_kind into loc_kind enum.

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

diff --git a/gas/frags.c b/gas/frags.c
index cfd183fb3d41ec63d70add20111b0a97161e7430..052e76f076e0ce9ad25c92024cd2df3694c39b94 100644 (file)
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -1,13 +1,13 @@
 /* frags.c - manage frags -
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2003, 2004, 2005, 2006
+   1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
    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
-   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,
@@ -389,9 +389,9 @@ frag_append_1_char (int datum)
    not already accounted for in the frag FR_ADDRESS.  */
 
 bfd_boolean
-frag_offset_fixed_p (fragS *frag1, fragS *frag2, bfd_vma *offset)
+frag_offset_fixed_p (const fragS *frag1, const fragS *frag2, bfd_vma *offset)
 {
-  fragS *frag;
+  const fragS *frag;
   bfd_vma off;
 
   /* Start with offset initialised to difference between the two frags.
@@ -419,6 +419,7 @@ frag_offset_fixed_p (fragS *frag1, fragS *frag2, bfd_vma *offset)
     }
 
   /* Maybe frag1 is after frag2.  */
+  off = frag1->fr_address - frag2->fr_address;
   frag = frag2;
   while (frag->fr_type == rs_fill)
     {