* frags.h (frag_offset_fixed_p): Update prototype.

* frags.c (frag_offset_fixed_p): Change type of "offset" to offsetT.
	* expr.c (expr, resolve_expression): Likewise for frag_off var.
This commit is contained in:
Alan Modra 2012-06-30 00:27:31 +00:00
parent 4bec9bf157
commit 08ea70204d
4 changed files with 16 additions and 9 deletions

View file

@ -1,3 +1,9 @@
2012-06-30 Johan Olmutz Nielsen <jnielsen@ddci.com>
* frags.h (frag_offset_fixed_p): Update prototype.
* frags.c (frag_offset_fixed_p): Change type of "offset" to offsetT.
* expr.c (expr, resolve_expression): Likewise for frag_off var.
2012-06-29 Nick Clifton <nickc@redhat.com>
PR gas/14263

View file

@ -1,7 +1,7 @@
/* expr.c -operands, expressions-
Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
Free Software Foundation, Inc.
1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011,
2012 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@ -1746,7 +1746,7 @@ expr (int rankarg, /* Larger # is higher rank. */
while (op_left != O_illegal && op_rank[(int) op_left] > rank)
{
segT rightseg;
bfd_vma frag_off;
offsetT frag_off;
input_line_pointer += op_chars; /* -> after operator. */
@ -2030,7 +2030,7 @@ resolve_expression (expressionS *expressionP)
valueT left, right;
segT seg_left, seg_right;
fragS *frag_left, *frag_right;
bfd_vma frag_off;
offsetT frag_off;
switch (op)
{

View file

@ -1,6 +1,6 @@
/* frags.c - manage frags -
Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@ -394,10 +394,10 @@ frag_append_1_char (int datum)
not already accounted for in the frag FR_ADDRESS. */
bfd_boolean
frag_offset_fixed_p (const fragS *frag1, const fragS *frag2, bfd_vma *offset)
frag_offset_fixed_p (const fragS *frag1, const fragS *frag2, offsetT *offset)
{
const fragS *frag;
bfd_vma off;
offsetT off;
/* Start with offset initialised to difference between the two frags.
Prior to assigning frag addresses this will be zero. */

View file

@ -1,6 +1,7 @@
/* frags.h - Header file for the frag concept.
Copyright 1987, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
2002, 2003, 2004, 2005, 2006, 2007, 2010, 2011, 2012
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@ -154,6 +155,6 @@ char *frag_var (relax_stateT type,
offsetT offset,
char *opcode);
bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, bfd_vma *);
bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, offsetT *);
#endif /* FRAGS_H */