diff options
| author | Eric Botcazou <ebotcazou@act-europe.fr> | 2004-05-26 07:56:16 +0200 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2004-05-26 05:56:16 +0000 |
| commit | 42048866021815214ed1ffb41d27a0e5090a3f4b (patch) | |
| tree | c8ede37c74dd6682634b4524093896126cd3d120 | |
| parent | a2f29587957bf9f1853b9eeba2b05492c9b7150a (diff) | |
| download | gcc-42048866021815214ed1ffb41d27a0e5090a3f4b.zip gcc-42048866021815214ed1ffb41d27a0e5090a3f4b.tar.gz gcc-42048866021815214ed1ffb41d27a0e5090a3f4b.tar.bz2 | |
varasm.c (output_constant): Pass the minimum of the two sizes to assemble_integer.
* varasm.c (output_constant) <INTEGER_TYPE>: Pass the minimum
of the two sizes to assemble_integer.
From-SVN: r82278
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/varasm.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 31be267..ee84a89 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-05-26 Eric Botcazou <ebotcazou@act-europe.fr> + + * varasm.c (output_constant) <INTEGER_TYPE>: Pass the minimum + of the two sizes to assemble_integer. + 2004-05-25 Paul Brook <paul@codesourcery.com> * config/arm/arm.c (thumb_exit, thumb_unexpanded_epilogue): Remove diff --git a/gcc/varasm.c b/gcc/varasm.c index beace4e..72a51a4 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -3564,7 +3564,7 @@ output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align) } /* Now output the underlying data. If we've handling the padding, return. - Otherwise, break and ensure THISSIZE is the size written. */ + Otherwise, break and ensure SIZE is the size written. */ switch (code) { case CHAR_TYPE: @@ -3576,7 +3576,7 @@ output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align) case OFFSET_TYPE: if (! assemble_integer (expand_expr (exp, NULL_RTX, VOIDmode, EXPAND_INITIALIZER), - size, align, 0)) + MIN (size, thissize), align, 0)) error ("initializer for integer value is too complicated"); break; |