From: Eric Botcazou <ebotcazou@act-europe.fr>
Date: Wed, 26 May 2004 05:56:16 +0000 (+0200)
Subject: varasm.c (output_constant): Pass the minimum of the two sizes to assemble_integer.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=42048866021815214ed1ffb41d27a0e5090a3f4b;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31be26702ab..ee84a899ff1 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 beace4ed8d4..72a51a40c80 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;